summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/convwatch/ConvWatchStarter.java
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 09:54:58 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:50 +0200
commit0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 (patch)
tree3d441110176e37c1a6ba2d15a3653d5023863075 /qadevOOo/runner/convwatch/ConvWatchStarter.java
parentd26540bb05b0443e7988da34372c86f88cbf1f6c (diff)
java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
Diffstat (limited to 'qadevOOo/runner/convwatch/ConvWatchStarter.java')
-rw-r--r--qadevOOo/runner/convwatch/ConvWatchStarter.java43
1 files changed, 0 insertions, 43 deletions
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java
index d0cc8197e3a0..2a76f6c53358 100644
--- a/qadevOOo/runner/convwatch/ConvWatchStarter.java
+++ b/qadevOOo/runner/convwatch/ConvWatchStarter.java
@@ -49,14 +49,6 @@ import convwatch.PerformanceContainer;
public class ConvWatchStarter extends EnhancedComplexTestCase
{
// The first of the mandatory functions:
- /**
- * Return the name of the test.
- * In this case it is the actual name of the service.
- * @return The tested service.
- */
- // public String getTestObjectName() {
- // return "ConvWatch runner";
- // }
// The second of the mandatory functions: return all test methods as an
// array. There is only one test function in this example.
@@ -94,7 +86,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
String sREF = (String)param.get( PropertyName.DOC_COMPARATOR_REFERENCE_PATH );
if (sREF == null || sREF.length() == 0)
{
- // log.println("Please set reference file (path to good documents) REFERENCEFILE=path.");
log.println("Assumtion, reference directory and input directory are the same.");
m_sReferencePath = m_sInputPath;
}
@@ -119,7 +110,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
if (bQuit == true)
{
- // log.println("must quit.");
assure("Must quit", false);
}
@@ -204,12 +194,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
String sBuildID = aGTA.getBuildID();
log.println("Current Office has buildid: " + sBuildID);
- // LLA: sample code, how to access all parameters
- // for (Enumeration e = param.keys() ; e.hasMoreElements() ;)
- // {
- // System.out.println(e.nextElement());
- // }
-
String fs = System.getProperty("file.separator");
String sHTMLName = "index.html";
@@ -256,17 +240,12 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
{
if (sNewReferencePath != null)
sNewReferencePath = sNewReferencePath + fs + sNewSubDir;
- // String sNameNoSuffix = FileHelper.getNameNoSuffix(FileHelper.getBasename(sEntry));
- // sNewReferenceFile = sNewReferencePath + fs + sNameNoSuffix + ".prn";
sNewOutputPath = sNewOutputPath + fs + sNewSubDir;
if (sNewDiffPath != null)
sNewDiffPath = sNewDiffPath + fs + sNewSubDir;
}
- // NameHelper aNameContainer = new NameHelper(m_sOutputPath, sNewSubDir, FileHelper.getBasename(sEntry));
- // aNameContainer.print();
-
if (aGTA.checkIfUsableDocumentType(sEntry))
{
runGDCWithStatus(HTMLoutput, LISToutput, sEntry, sNewOutputPath, sNewReferencePath, sNewDiffPath, sNewSubDir);
@@ -301,14 +280,8 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
GraphicalTestArguments aGTA = getGraphicalTestArguments();
OfficeProvider aProvider = null;
- // SimpleFileSemaphore aSemaphore = new SimpleFileSemaphore();
if (aGTA.shouldOfficeStart())
{
- // if (OSHelper.isWindows())
- // {
- // aSemaphore.P(aSemaphore.getSemaphoreFile());
- // }
-
aGTA.getPerformance().startTime(PerformanceContainer.OfficeStart);
aProvider = new OfficeProvider();
XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param);
@@ -369,13 +342,6 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
if (aProvider != null)
{
aProvider.closeExistingOffice(param, true);
- // if (OSHelper.isWindows())
- // {
- // aSemaphore.V(aSemaphore.getSemaphoreFile());
- // aSemaphore.sleep(2);
- // // wait some time maybe an other process will take the semaphore
- // // I know, this is absolutely dirty, but the whole convwatch is dirty and need a big cleanup.
- // }
}
// -------------------- Status --------------------
@@ -407,17 +373,8 @@ public class ConvWatchStarter extends EnhancedComplexTestCase
GlobalLogWriter.get().println(" NewPath: " + _sNewSubDir);
GlobalLogWriter.get().println("----------------------------------------------------------------------");
-// if (_sNewSubDir.length() > 0)
-// {
-// sLink = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + _sNewSubDir + fs + sFilenameNoSuffix + ".ini";
-// sLinkDD = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + _sNewSubDir + fs + "DiffDiff_" + sFilenameNoSuffix + ".ini";
-// }
-// else
-// {
sLink = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + sFilenameNoSuffix + ".ini";
- // sLinkDD = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + _sNewSubDir + fs + "DiffDiff_" + sFilenameNoSuffix + ".ini";
sLinkDD = sHTMLPrefix /* + "/cw.php?inifile=" */ + _sOutputPath + fs + "DiffDiff_" + sFilenameNoSuffix + ".ini";
-// }
sLinkName = sFilenameNoSuffix;
sLinkDDName = sFilenameNoSuffix + " (DiffDiff)";