diff options
Diffstat (limited to 'testgraphical')
20 files changed, 173 insertions, 173 deletions
diff --git a/testgraphical/prechecks/softwaretests.pl b/testgraphical/prechecks/softwaretests.pl index f591fa139879..32f24117353b 100644 --- a/testgraphical/prechecks/softwaretests.pl +++ b/testgraphical/prechecks/softwaretests.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ sub prepare() $sPath .= "/" . $sEnv; chdir ($sPath); cwd(); - $sPath = getcwd(); + $sPath = getcwd(); my $sInpath = $ENV{INPATH}; $sPath .= "/" . $sInpath . "/misc"; $sGlobalIniFile = "$sPath/pathes.ini"; @@ -128,7 +128,7 @@ sub searchForFileInPath($$) $sep = ';'; } my @path = split($sep, $sPathList); - + my $sPath; my $startdir; my $bFound = 0; @@ -139,7 +139,7 @@ sub searchForFileInPath($$) foreach $startdir (@path) { my $nCount = 0; - # + # # IMPORTANT: leave out windir path. # if ($OSNAME eq "MSWin32" || $OSNAME eq "cygwin") @@ -160,7 +160,7 @@ sub searchForFileInPath($$) cwd(); my $myfile; while ($myfile = readdir(DIR)) # get filename - { + { if (-f $myfile ) # is it a file? { $nCount ++; @@ -173,7 +173,7 @@ sub searchForFileInPath($$) } } closedir(DIR); - print " ($nCount)\n" if ($verbose); + print " ($nCount)\n" if ($verbose); } if ($bFound == 1) { @@ -403,7 +403,7 @@ sub checkForImageMagick() { # next try, search image magick in $PROGRAMFILES my $sPrograms = unixpath($ENV{PROGRAMFILES}); - + if (! $sPrograms) { print "There exist no \$PROGRAMFILES path, wrong Windows version?\n"; @@ -413,10 +413,10 @@ sub checkForImageMagick() { local *DIR; if (opendir (DIR, $sPrograms)) # open program directory - { + { my $myfile; while ($myfile = readdir(DIR)) # get a filename - { + { if ($myfile =~ /ImageMagick/) { $sImageMagickPath = $sPrograms . "/" . $myfile; @@ -436,7 +436,7 @@ sub checkForImageMagick() } } } - + } if ( -e "$sImageMagickPath/$sImageMagickExe" ) { @@ -457,7 +457,7 @@ sub checkForJava6() { $javaexe = $ENV{JAVA6}; } - + if ($OSNAME eq "linux" || $OSNAME eq "cygwin") { # search for imagemagick @@ -498,8 +498,8 @@ sub checkForJava6() if ( $ENV{JAVA6} ) { $javaexe = $ENV{JAVA6}; - } - + } + if (! -e $javaexe) { print "Java not found.\n"; @@ -509,7 +509,7 @@ sub checkForJava6() { print "Found Java: '$javaexe'\n" if ($verbose); insertPath("java.exe", $javaexe); - } + } } else { @@ -520,7 +520,7 @@ sub checkForJava6() # different checks print "Environment '$OSNAME'\n" if ($verbose); -if ($printerdriver) +if ($printerdriver) { checkForPSDriver(); } @@ -548,7 +548,7 @@ sub print_usage(*) print(HANDLE <<END_OF_USAGE); -Usage: $tool_name [OPTIONS] +Usage: $tool_name [OPTIONS] -ghostscript Try to find ghostscript in your environment -imagemagick Try to find imagemagick diff --git a/testgraphical/qa/graphical/Test.java b/testgraphical/qa/graphical/Test.java index 8c633dede44c..cf7ae074f45b 100644 --- a/testgraphical/qa/graphical/Test.java +++ b/testgraphical/qa/graphical/Test.java @@ -35,7 +35,7 @@ import java.io.File; public final class Test { @org.junit.Before - public void setUp() throws Exception + public void setUp() throws Exception { connection.setUp(); } @@ -62,7 +62,7 @@ public final class Test { { sShow = "-show"; } - + final String sComparePath = FileHelper.appendPath(sPRJ, "source"); final String sCompareName = FileHelper.appendPath(sComparePath, "compare.pl"); @@ -72,7 +72,7 @@ public final class Test { System.out.println("Path to compare.pl is wrong: '" + aCompareFile.getAbsolutePath() + "'"); assertTrue(false); } - + final String sConnectionString = connection.getDescription(); String[] sCommandArray = @@ -101,7 +101,7 @@ public final class Test { { good = false; } - + assertTrue(good); // Runner.run( diff --git a/testgraphical/source/CallExternals.pm b/testgraphical/source/CallExternals.pm index a0a3b1ae716a..39db0c641318 100644 --- a/testgraphical/source/CallExternals.pm +++ b/testgraphical/source/CallExternals.pm @@ -3,7 +3,7 @@ package CallExternals; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -245,7 +245,7 @@ sub callperl($$$) my $sParams = shift; my $line; my $error; - + log_print("CALLPERL: $perlexe $perlprogram $sParams\n"); # if (open(IN_FILE, "$perlexe $sParams 2>&1 |")) if (open(IN_FILE, "$perlexe $perlprogram $sParams |")) @@ -277,7 +277,7 @@ sub setJavaExecutable($) # my $sJava14; # if ($OSNAME eq "MSWin32") # { -# if ($sJavaExecutable) +# if ($sJavaExecutable) # { # $sJava14 = $sJavaExecutable; # } @@ -311,7 +311,7 @@ sub setJavaExecutable($) sub getJava15() { my $sJava15; - if ($sJavaExecutable) + if ($sJavaExecutable) { $sJava15 = $sJavaExecutable; } @@ -363,7 +363,7 @@ sub getJava15() sub getJava16() { my $sJava16; - if ($sJavaExecutable) + if ($sJavaExecutable) { $sJava16 = $sJavaExecutable; } @@ -413,7 +413,7 @@ sub getJava16() } return $sJava16; } - + # ------------------------------------------------------------------------------ sub getJavaExecutable() { @@ -510,10 +510,10 @@ sub ExecSQL($) # my $line; # my $error; # my @result; -# +# # $exe = quoteIfNeed($exe); # $program = quoteIfNeed($program); -# +# # # print "Will send: $exe $sParams\n"; # # log_print("CALLEXE: $exe $program $sParams\n"); # if (open(IN_FILE, "$exe $program $sParams |")) diff --git a/testgraphical/source/ConvwatchHelper.pm b/testgraphical/source/ConvwatchHelper.pm index 8f157641b1f4..ccd166095cf3 100644 --- a/testgraphical/source/ConvwatchHelper.pm +++ b/testgraphical/source/ConvwatchHelper.pm @@ -61,11 +61,11 @@ our $tempprefix; # ------------------------------------------------------------------------------ # in filehelper # our $programprefix; -# +# # sub getProgramPrefix($) # { # my $sDBDistinct = shift; -# +# # my $sProgramPrefix; # if (! $programprefix) # { @@ -102,7 +102,7 @@ sub getQADEVToolsPath() # in filehelper # our $toolsprefix; -# +# # sub getToolsPrefix() # { # my $sToolsPrefix; @@ -202,13 +202,13 @@ our $dataprefix; # # sleep 1; # select(undef, undef, undef, 0.333); # } -# +# # sub _waitInSeconds($) # { # my $nLength = shift; # my $i; # my $j; -# +# # for ($j=0;$j<$nLength;$j++) # { # for ($i=0;$i<$j;$i++) @@ -222,7 +222,7 @@ our $dataprefix; # _shortsleep( 1 ); # print "\r"; # } -# +# # for ($j=0;$j<=$nLength;$j++) # { # for ($i=0;$i<$j;$i++) @@ -237,7 +237,7 @@ our $dataprefix; # print "\r"; # } # } -# +# # sub wait30seconds() # { # _waitInSeconds(20); @@ -319,7 +319,7 @@ sub readdirectory($$$) my $nFileCount = readdirectory($sNewStartDir, $sUserParameter, $hook); # workOnDir($sNewDir, $nFileCount); $nCountFiles += $nFileCount; - + chdir ($startdir); # zurueckwechseln. cwd(); } @@ -373,13 +373,13 @@ sub searchSofficeBin($$$) } # our $lcl_sUnoPkgPath; -# +# # sub searchUnoPkgBin($$$) # { # my $currentDir = shift; # my $currentFile = shift; # my $sUserParameter = shift; -# +# # if ($currentFile eq $sUserParameter) # { # my $sSourceFilename; @@ -398,7 +398,7 @@ sub searchSofficeBin($$$) # my $currentDir = shift; # my $currentFile = shift; # my $sUserParameter = shift; -# +# # if ($currentFile eq $sUserParameter) # { # my $sSourceFilename; @@ -415,36 +415,36 @@ sub searchSofficeBin($$$) # { # my $sPathToInstallOffice = shift; # my $sJARFileName = shift; -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sJARPath = ""; # readdirectory(${sPathToInstallOffice}, ${sJARFileName}, \&searchJARFile); -# +# # chdir $sCurrentPath; # cwd(); -# +# # return $lcl_sJARPath; # } # sub getUnoPkg($) # { # my $sPathToInstallOffice = shift; -# +# # my $sUnoPkgName = "unopkg.bin"; # if (isWindowsEnvironment()) # { # $sUnoPkgName = "unopkg.exe"; # } -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sUnoPkgPath = ""; # readdirectory(${sPathToInstallOffice}, ${sUnoPkgName}, \&searchUnoPkgBin); -# +# # chdir $sCurrentPath; # cwd(); -# +# # return ($lcl_sUnoPkgPath, $sUnoPkgName); # } @@ -473,9 +473,9 @@ sub getSofficeExe($) # sub checkOfficeAlreadyInstalled($) # { # my $sOfficePath = shift; -# +# # my $sCurrentPath = cwd(); -# +# # $lcl_sSofficeBinPath = ""; # my $sOldOfficePath = appendPath($sOfficePath, "program"); # if ( -d "$sOldOfficePath" ) @@ -494,7 +494,7 @@ sub getSofficeExe($) # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "StarOffice 9"); # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "program"); # $sThreeLayerOffice = appendPath($sThreeLayerOffice, "soffice.bin"); -# +# # if ( -e "$sThreeLayerOffice" ) # { # return 1; @@ -511,12 +511,12 @@ sub getSofficeExe($) # } # } # } -# +# # # soffice.bin not found in fast path # readdirectory($sOfficePath, "soffice.bin", \&searchSofficeBin); # chdir $sCurrentPath; # cwd(); -# +# # if ( $lcl_sSofficeBinPath ne "" ) # { # return 1; @@ -529,7 +529,7 @@ sub getSofficeExe($) # # { # # return 1; # # } -# # +# # # # # check path system of tree layer office # # if ( isWindowsEnvironment() ) # # { @@ -541,14 +541,14 @@ sub getSofficeExe($) # # } # # else # # { -# # +# # # # $sOfficePathCheck = appendPath($sOfficePathCheck, "StarOffice 9"); # # $sOfficePathCheck = appendPath($sOfficePathCheck, "program"); # # $sOfficePathCheck = appendPath($sOfficePathCheck, "soffice.bin"); # # if ( -e $sOfficePathCheck ) # # { # # return 1; -# # } +# # } # # print "Error: There exist no Office, maybe an unsupported version?\n"; # # } # # } diff --git a/testgraphical/source/compare.pl b/testgraphical/source/compare.pl index 4aef877dc2b7..cc01b3626b13 100644 --- a/testgraphical/source/compare.pl +++ b/testgraphical/source/compare.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -191,7 +191,7 @@ else print "Warning: the file '$myfile' will not compared.\n"; } } - closedir(DIR); + closedir(DIR); } # my $sPool = "eis-chart"; # $err += CompareFiles($sDocumentPool, "eis-chart"); @@ -250,7 +250,7 @@ sub CompareFiles($$) } closedir(DIR); } - + print "***** State for graphical compare of pool: '$sPool' ******\n"; my $nErrorCount = 0; my $file; @@ -280,7 +280,7 @@ sub checkForKnownIssue($$) { my $startdir = shift; my $myfile = shift; - + if ($force) { return 0,""; @@ -393,7 +393,7 @@ sub print_usage(*) print(HANDLE <<END_OF_USAGE); -Usage: $tool_name [OPTIONS] +Usage: $tool_name [OPTIONS] -pool Give pool name out of document-pool directory. But all documents list in knownissues.xcl will not check. diff --git a/testgraphical/source/cwstestresult.pl b/testgraphical/source/cwstestresult.pl index 63c68c827dbd..89445fd6f641 100644 --- a/testgraphical/source/cwstestresult.pl +++ b/testgraphical/source/cwstestresult.pl @@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -53,13 +53,13 @@ use Cws; #### global ##### ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; -my $is_debug = 1; # enable debug -my $opt_master; # option: master workspace -my $opt_child; # option: child workspace -my $opt_milestone; # option: milestone -my $opt_testrunName; # option: testrunName -my $opt_testrunPlatform; # option: testrunPlatfrom -my $opt_resultPage; # option: resultPage +my $is_debug = 1; # enable debug +my $opt_master; # option: master workspace +my $opt_child; # option: child workspace +my $opt_milestone; # option: milestone +my $opt_testrunName; # option: testrunName +my $opt_testrunPlatform; # option: testrunPlatfrom +my $opt_resultPage; # option: resultPage #### main ##### @@ -76,8 +76,8 @@ sub testresult # get master and child workspace my $masterws = $opt_master ? uc($opt_master) : $ENV{WORK_STAMP}; my $milestone = $opt_milestone ? $opt_milestone : $ENV{UPDMINOR}; - my $childws = $opt_milestone ? undef : ( $opt_child ? $opt_child : $ENV{CWS_WORK_STAMP} ); - + my $childws = $opt_milestone ? undef : ( $opt_child ? $opt_child : $ENV{CWS_WORK_STAMP} ); + if ( !defined($masterws) ) { print_error("Can't determine master workspace environment.\n" . "Please initialize environment with setsolar ...", 1); @@ -112,7 +112,7 @@ sub testresult $opt_resultPage=SOAP::Data->type(string => $opt_resultPage); $result=$eis->submitTestResultMWS($masterws,$milestone,$opt_testrunName,$opt_testrunPlatform, $opt_resultPage, $status); } - + exit(0) } @@ -120,7 +120,7 @@ sub testresult sub is_valid_cws { my $cws = shift; - + my $masterws = $cws->master(); my $childws = $cws->child(); # check if we got a valid child workspace @@ -165,7 +165,7 @@ sub parse_options # sub print_message # { # my $message = shift; -# +# # print STDERR "$script_name: "; # print STDERR "$message\n"; # return; @@ -186,7 +186,7 @@ sub print_error return; } -sub usage +sub usage { print STDERR "Usage: cwstestresult[-h] [-M masterws] [-m milestone|-c childws] <-n testrunName> <-p testrunPlatform> <-r resultPage> statusName\n"; print STDERR "\n"; diff --git a/testgraphical/source/cwstestresulthelper.pm b/testgraphical/source/cwstestresulthelper.pm index 37a5315445af..7796ff7d61b6 100644 --- a/testgraphical/source/cwstestresulthelper.pm +++ b/testgraphical/source/cwstestresulthelper.pm @@ -3,7 +3,7 @@ package cwstestresulthelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ sub cwstestresult($$$$$$) sleep(1); if (! -e $sSOLARENV) { - # fallback to old before ause103 (treeconfig) + # fallback to old before ause103 (treeconfig) $sSOLARENV="/so/ws/$MAJOR/src.$MINOR/solenv"; } } @@ -139,7 +139,7 @@ sub cwstestresult($$$$$$) log_print( "COMMON_ENV_TOOLS is: $ENV{COMMON_ENV_TOOLS} faked\n"); $nCOMMON_ENV_TOOLS_fake = 1; } - + # if ( !defined($ENV{WORK_STAMP}) ) # { # $ENV{WORK_STAMP} = $MAJOR; @@ -166,7 +166,7 @@ sub cwstestresult($$$$$$) log_print(" UPDMINOR is: $ENV{UPDMINOR} faked\n"); $nUPDMINOR_fake = 1; } - + # my $sStatus = "ok"; # if ($nFailure == 0) # { @@ -180,7 +180,7 @@ sub cwstestresult($$$$$$) # { # $sStatus = "incomplete"; # } - + # system("cwstestresult -c mycws -n Performance -p Windows ok"); my $sPerlProgram = appendPath($sSOLARENV, "bin/cwstestresult.pl"); # if ( -e "cwstestresult.pl" ) @@ -218,10 +218,10 @@ sub cwstestresult($$$$$$) } $sPerlParam .= " -p " . $sCWSEnv; $sPerlParam .= " -r http://so-gfxcmp-lin.germany.sun.com/gfxcmp_ui/status_new.php?distinct=$sDBdistinct"; - + $sPerlParam .= " "; $sPerlParam .= $sStatus; - + # my $sSetcwsAndPerl = "setcws $destinationversion; " . getPerlExecutable(); @@ -246,7 +246,7 @@ sub cwstestresult($$$$$$) undef( $ENV{COMMON_ENV_TOOLS} ); $nCOMMON_ENV_TOOLS_fake = 0; } - + if ( $nWORK_STAMP_fake == 1 ) { # undef($ENV{WORK_STAMP}); diff --git a/testgraphical/source/dbhelper.pm b/testgraphical/source/dbhelper.pm index 0f5c0d5bb5ea..baadb80ba630 100644 --- a/testgraphical/source/dbhelper.pm +++ b/testgraphical/source/dbhelper.pm @@ -1,13 +1,13 @@ -# +# # # ------------------------------------------------------------------------------ -# +# # sub DB_INSERT_INTO_TABLE_STATUS() # { # # my $sDocID = shift; # # my $sDBDistinct = shift; -# +# # my $sHostname = hostname; -# +# # my $sSQL = "INSERT INTO status (docid, dbdistinct2, hostname)"; # $sSQL .= " VALUES ($docid, '$dbdistinct', '$sHostname')"; # ExecSQL($sSQL); @@ -17,19 +17,19 @@ # # my $sDocID = shift; # # my $sDBDistinct = shift; # my $sInfo = shift; -# +# # # my $sHostname = hostname; -# +# # my $sInsertSQL = "UPDATE status SET info='$sInfo' WHERE docid=$docid AND dbdistinct2='$dbdistinct'"; # ExecSQL($sInsertSQL); # } -# +# # sub DB_UPDATE_TABLE_DOCUMENTS_SET_STATE_INFO($$) # { # # my $sDocID = shift; # my $sStatus = shift; # my $sError = shift; -# +# # my $sSQL = "UPDATE documents"; # $sSQL .= " SET state='" . $sStatus . "'"; # $sSQL .= ",info='" . $sError . "'"; @@ -40,13 +40,13 @@ # { # # my $sDocID = shift; # my $sStatus = shift; -# +# # my $sSQL = "UPDATE status"; # $sSQL .= " SET state='" . $sStatus . "'"; # $sSQL .= " WHERE docid=$docid"; # ExecSQL($sSQL); # } -# +# # # sub DB_UPDATE_TABLE_STATUS_SET_STATE_FAILED() # # { # # DB_UPDATE_TABLE_STATUS_SET_STATE("FAILED-FAILED"); @@ -61,7 +61,7 @@ # sub getSourceInfo($) # { # my $sDBStr = shift; -# +# # my $sSourceVersion; # if ( $sDBStr =~ / sourceversion='(.*?)',/ ) # { @@ -91,7 +91,7 @@ # sub getDestinationInfo($) # { # my $sDBStr = shift; -# +# # my $sDestinationVersion; # if ( $sDBStr =~ / destinationversion='(.*?)',/ ) # { @@ -129,11 +129,11 @@ # # } # # return $sMailAddress; # # } -# +# # # sub getDocumentInfo($) # # { # # my $sDBStr = shift; -# # +# # # # my $sDocumentPoolPath; # # if ( $sDBStr =~ / documentpoolpath='(.*?)',/ ) # # { @@ -164,7 +164,7 @@ # # } # # return $sDocumentPoolPath, $sDocumentPool, $sDocumentName; # # } -# +# # sub getDistinct($) # { # my $sDBStr = shift; @@ -176,12 +176,12 @@ # } # return $sDBDistinct; # } -# +# # sub getIDInfo($) # { # my $sDBStr = shift; # # my $dbdistinct; -# +# # my $sDBDistinct = getDistinct($sDBStr); # # if ( $sDBStr =~ / dbdistinct2='(\S*?)',/ ) # # { @@ -206,4 +206,4 @@ # } # return $sDBDistinct, $sDocID; # } -# +# diff --git a/testgraphical/source/filehelper.pm b/testgraphical/source/filehelper.pm index ed1be35cf124..fc39237d7b2a 100644 --- a/testgraphical/source/filehelper.pm +++ b/testgraphical/source/filehelper.pm @@ -3,7 +3,7 @@ package filehelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -105,10 +105,10 @@ sub unixpath($) # my $sSolarisLockFile = "/tmp/.ai.pkg.zone.lock-afdb66cf-1dd1-11b2-a049-000d560ddc3e"; # return $sSolarisLockFile; # } -# +# # sub checkForSolarisLock() # { -# if ($OSNAME eq "solaris") +# if ($OSNAME eq "solaris") # { # # wait until the internal installer lock is gone # while ( -e getSolarisLockFile() ) @@ -123,14 +123,14 @@ sub unixpath($) # log_print( "[ok], lock is gone.\n"); # } # } -# +# # sub deleteSolarisLock() # { -# if ($OSNAME eq "solaris") +# if ($OSNAME eq "solaris") # { # sleep 1; # unlink getSolarisLockFile(); -# +# # sleep 1; # if ( -e getSolarisLockFile() ) # { @@ -196,7 +196,7 @@ our $programprefix; # sub getProgramPrefix($) # { # my $sDBDistinct = shift; -# +# # my $sProgramPrefix; # if (! $programprefix) # { @@ -275,7 +275,7 @@ sub rmkdir($) { @dirs = split("\\\\", $tpath); } - + foreach $dir (@dirs) { $accum = "$accum$dir/"; diff --git a/testgraphical/source/fill_documents_loop.pl b/testgraphical/source/fill_documents_loop.pl index c1b8174fefe5..4948262240ca 100644 --- a/testgraphical/source/fill_documents_loop.pl +++ b/testgraphical/source/fill_documents_loop.pl @@ -8,8 +8,8 @@ eval 'exec perl -wS $0 ${1+\"$@\"}' # This program polls the database (documentcompare) every 60s for new jobs # it runs over the given directory from documentpoolpath and pool, and create for every file # a new database entry in documents. -# - +# + BEGIN { # Adding the path of this script file to the include path in the hope @@ -137,7 +137,7 @@ sub readdirectory($$$) my $nFileCount = readdirectory($sNewStartDir, $sValues, $hook); # workOnDir($sNewDir, $nFileCount); $nCountFiles += $nFileCount; - + chdir ($startdir); # zurueckwechseln. cwd(); } @@ -173,7 +173,7 @@ sub putDocumentInDB($$$) my $currentDir = shift; my $currentFile = shift; my $sValues = shift; - + my $sSourceFilename = $currentDir . $currentFile; # we cut down all the previous names like documentpoolpath and the documentpoolname $sSourceFilename = substr($sSourceFilename, length($sCurrentDocumentPool . $fs)); @@ -195,10 +195,10 @@ sub createDBEntriesForEveryDocument($) # we don't do anything if an error occured return; } - + # interpret the follows string # documentpoolpath='//so-gfxcmp-documents/doc-pool', documentpool='demo_lla', dbdistinct=62, - + # my $sDocumentPoolDir; if ( $sStr =~ /documentpoolpath='(.*?)',/ ) { @@ -280,10 +280,10 @@ sub createDBEntriesForEveryDocument($) # run over the whole given document pool and store every found document name in the database readdirectory($sCurrentDocumentPool, "", \&putDocumentInDB); - + chdir $cwd; cwd(); - + foreach $sSQL (@aEntries) { # print "# $sSQL\n"; @@ -354,9 +354,9 @@ sub sendMail($$$) $sParams .= " $dbdistinct"; $sParams .= " $mailaddress"; $sParams .= " starts"; # run through state of convwatch - + my $sMailProgram = appendPath(getQADEVToolsPath(), "mailsend.php"); - + my $err; my @lines; my $sLine; @@ -404,7 +404,7 @@ while (1) my @aResult; my $sSQL = "SELECT documentpoolpath,documentpool,dbdistinct2,sourceversion,destinationversion,mailfeedback,parentdistinct FROM documentcompare $sWhereClause"; @aResult = ExecSQL($sSQL); - + my $aValue; foreach $aValue (@aResult) { diff --git a/testgraphical/source/graphical_compare.pm b/testgraphical/source/graphical_compare.pm index 5cde8d64ea01..d3ea8e90360d 100644 --- a/testgraphical/source/graphical_compare.pm +++ b/testgraphical/source/graphical_compare.pm @@ -3,7 +3,7 @@ package graphical_compare; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ sub getOOoRunnerClasspath() if (! -d $sSourceRoot ) { - log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); + log_print( "SourceRoot not found, search it in '$sSourceRoot'\n"); return ""; } @@ -112,8 +112,8 @@ sub getOOoRunnerClasspath() my $sJurtPath = $sSourceRootBin; my $sJuhPath = $sSourceRootBin; my $sJavaUnoPath = $sSourceRootBin; - - my $sOOoRunnerClasspath = + + my $sOOoRunnerClasspath = appendPath( $sRidlPath, "ridl.jar") . getJavaPathSeparator() . appendPath( $sUnoilPath, "unoil.jar") . getJavaPathSeparator() . appendPath( $sJurtPath, "jurt.jar") . getJavaPathSeparator() . @@ -182,7 +182,7 @@ sub searchForReference($) { return 0; } - return 1; + return 1; } # ------------------------------------------------------------------------------ @@ -232,7 +232,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + my $sPathesIni = appendPath(getProjectOutput(), "pathes.ini"); my $gspath = getFromPathes($sPathesIni, "gs.path"); my $gsexe = getFromPathes($sPathesIni, "gs.exe"); @@ -247,7 +247,7 @@ sub SingleDocumentCompare($$$$$$) my $sInputPath = $sDocumentPoolPath; $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); - + if (! -f $sInputPath ) { $nConvwatchFailed = 1; @@ -302,13 +302,13 @@ sub SingleDocumentCompare($$$$$$) } $sParams .= " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -ini $sPropertyFile" . - " -o graphical.PostscriptCreator"; + " -o graphical.PostscriptCreator"; # $sParams .= " -cs pipe,name=$USER"; - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -351,12 +351,12 @@ sub SingleDocumentCompare($$$$$$) print("]\n"); return $nConvwatchFailed; } - + # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from second installed office # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM RUNNING OFFICE -----\n"); @@ -367,8 +367,8 @@ sub SingleDocumentCompare($$$$$$) my $sOutputPath = getProjectOutput(); my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -384,7 +384,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -401,7 +401,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # create jpeg from postscript or pdf from references # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- CREATE JPEG FROM POSTSCRIPT OR PDF FROM REFERENCE -----\n"); @@ -409,7 +409,7 @@ sub SingleDocumentCompare($$$$$$) # start OOoRunner my $sInputPath = appendPath(getProjectRoot(), "references"); $sInputPath = appendPath($sInputPath, getEnvironment()); - $sInputPath = appendPath($sInputPath, $sDocumentPool); + $sInputPath = appendPath($sInputPath, $sDocumentPool); $sInputPath = appendPath($sInputPath, $sDocumentName); my $err = searchForReference($sInputPath); @@ -420,7 +420,7 @@ sub SingleDocumentCompare($$$$$$) } else { - my $sOutputPath = getProjectOutputReference(); + my $sOutputPath = getProjectOutputReference(); rmkdir $sOutputPath; my $sIndexFile = appendPath($sOutputPath, "index.ini"); @@ -435,8 +435,8 @@ sub SingleDocumentCompare($$$$$$) } } my $sParams = "-cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . @@ -452,7 +452,7 @@ sub SingleDocumentCompare($$$$$$) { $sParams .= " -gs.exe $gsexe"; } - + # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); $sDebug = ""; @@ -468,7 +468,7 @@ sub SingleDocumentCompare($$$$$$) # ------------------------------------------------------------------------------ # compare JPEGs # ------------------------------------------------------------------------------ - + if ($nConvwatchFailed == 0) { log_print("----- COMPARE JPEGS -----\n"); @@ -478,19 +478,19 @@ sub SingleDocumentCompare($$$$$$) my $sParams = "-Xmx512m" . " -cp " . $sOOoRunnerClasspath . - " org.openoffice.Runner" . - " -TimeOut $nTimeOut" . + " org.openoffice.Runner" . + " -TimeOut $nTimeOut" . " -tb java_complex" . " -DOC_COMPARATOR_INPUT_PATH " . quoteIfNeed($sInputPath) . " -DOC_COMPARATOR_OUTPUT_PATH " . quoteIfNeed($sOutputPath) . - " -NoOffice" . + " -NoOffice" . " -NoSmallPictures" . " -o graphical.JPEGComparator"; if ($impath) { $sParams .= " -imagemagick.path " . quoteIfNeed($impath); } - + # start OOoRunner # $sDebug = "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9001,suspend=y"; my $err = calljava(getJavaExecutable(), $sParams, $sDebug); @@ -559,7 +559,7 @@ sub SingleDocumentCompare($$$$$$) my $sLogFile = appendPath(getProjectOutput(), $sDocumentName . ".txt"); showFile($sLogFile); } - # printTime(endTime($nSimpleCompareTime)); + # printTime(endTime($nSimpleCompareTime)); return $nConvwatchFailed; } diff --git a/testgraphical/source/loghelper.pm b/testgraphical/source/loghelper.pm index 6dad31c7761a..76c91fc93319 100644 --- a/testgraphical/source/loghelper.pm +++ b/testgraphical/source/loghelper.pm @@ -3,7 +3,7 @@ package loghelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/oshelper.pm b/testgraphical/source/oshelper.pm index 3f2ed1c44e38..d7b26fb9defb 100644 --- a/testgraphical/source/oshelper.pm +++ b/testgraphical/source/oshelper.pm @@ -3,7 +3,7 @@ package oshelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/solarenvhelper.pm b/testgraphical/source/solarenvhelper.pm index f8ec17ece12b..ae162da0d1bd 100644 --- a/testgraphical/source/solarenvhelper.pm +++ b/testgraphical/source/solarenvhelper.pm @@ -3,7 +3,7 @@ package solarenvhelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/stringhelper.pm b/testgraphical/source/stringhelper.pm index e7d19256bf1b..3ffdabd46211 100644 --- a/testgraphical/source/stringhelper.pm +++ b/testgraphical/source/stringhelper.pm @@ -3,7 +3,7 @@ package stringhelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/testgraphical/source/timehelper.pm b/testgraphical/source/timehelper.pm index 38bd56fc4b20..95f66e83a6bc 100644 --- a/testgraphical/source/timehelper.pm +++ b/testgraphical/source/timehelper.pm @@ -3,7 +3,7 @@ package timehelper; #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -94,6 +94,6 @@ sub printTime($) # # print getCurrentDateString() . "\n"; # sleep(60); # } -# +# 1; diff --git a/testgraphical/ui/java/ConvwatchGUIProject/build.xml b/testgraphical/ui/java/ConvwatchGUIProject/build.xml index e4d82212f35d..d397826c96e4 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/build.xml +++ b/testgraphical/ui/java/ConvwatchGUIProject/build.xml @@ -12,9 +12,9 @@ <import file="nbproject/build-impl.xml"/> <!-- - There exist several targets which are by default empty and which can be - used for execution of your tasks. These targets are usually executed - before and after some main targets. They are: + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: -pre-init: called before initialization of project properties -post-init: called after initialization of project properties @@ -40,12 +40,12 @@ </obfuscate> </target> - For list of available properties check the imported - nbproject/build-impl.xml file. + For list of available properties check the imported + nbproject/build-impl.xml file. Another way to customize the build is by overriding existing main targets. - The targets of interest are: + The targets of interest are: -init-macrodef-javac: defines macro for javac compilation -init-macrodef-junit: defines macro for junit execution @@ -53,7 +53,7 @@ -init-macrodef-java: defines macro for class execution -do-jar-with-manifest: JAR building (if you are using a manifest) -do-jar-without-manifest: JAR building (if you are not using a manifest) - run: execution of project + run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation @@ -65,10 +65,10 @@ </exec> </target> - Notice that the overridden target depends on the jar target and not only on - the compile target as the regular run target does. Again, for a list of available + Notice that the overridden target depends on the jar target and not only on + the compile target as the regular run target does. Again, for a list of available properties which you can use, check the target you are overriding in the - nbproject/build-impl.xml file. + nbproject/build-impl.xml file. --> </project> diff --git a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml index e493afec4fc3..229d0c658dab 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml +++ b/testgraphical/ui/java/ConvwatchGUIProject/nbproject/build-impl.xml @@ -28,9 +28,9 @@ is divided into following sections: </condition> </fail> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> - <!-- + <!-- ====================== - INITIALIZATION SECTION + INITIALIZATION SECTION ====================== --> <target name="-pre-init"> diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java index 625e7b80c6e0..05b79cb9ab05 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java @@ -10,7 +10,7 @@ import javax.swing.SwingWorker; ************************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -167,7 +167,7 @@ public class ConvwatchGUI extends javax.swing.JFrame } // private int m_nOldWidth; - + /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is @@ -479,7 +479,7 @@ public class ConvwatchGUI extends javax.swing.JFrame Image aImage = m_aImageIcon.getImage().getScaledInstance(w, h, Image.SCALE_AREA_AVERAGING); // SCALE_SMOOTH final ImageIcon aIcon = new ImageIcon(aImage); // m_jLabel.setIcon(aIcon); - return aIcon; + return aIcon; } @Override @@ -492,7 +492,7 @@ public class ConvwatchGUI extends javax.swing.JFrame catch (Exception e) {} } - + } /** @@ -502,7 +502,7 @@ public class ConvwatchGUI extends javax.swing.JFrame { // Start GUI - + java.awt.EventQueue.invokeLater(new Runnable() { diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java index 20cede5b1c33..903e370fa622 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -587,7 +587,7 @@ public class IniFile implements Enumeration // } // sLocalValue = replaceEvaluatedKey(_sSection, sLocalValue); // sLocalValue = replaceEvaluatedKey("global", sLocalValue); - // + // // return sLocalValue; // } public void removeSection(String _sSectionToRemove) |