diff options
Diffstat (limited to 'qadevOOo/runner/convwatch/ConvWatchStarter.java')
| -rw-r--r-- | qadevOOo/runner/convwatch/ConvWatchStarter.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/runner/convwatch/ConvWatchStarter.java index c81ba3dfca85..1d7bbdee0681 100644 --- a/qadevOOo/runner/convwatch/ConvWatchStarter.java +++ b/qadevOOo/runner/convwatch/ConvWatchStarter.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 @@ -155,7 +155,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase /** - * + * * @return a List of software which must accessable as an external executable */ protected Object[] mustInstalledSoftware() @@ -178,11 +178,11 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // Ghostscript aList.add( "gswin32c.exe -version" ); } - + return aList.toArray(); } - + /** * The test method itself. * Don't try to call it from outside, it is started only from qadevOOo runner @@ -205,7 +205,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase { return; } - + initMember(); aGTA.allowStore(); @@ -220,7 +220,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // } String fs = System.getProperty("file.separator"); - + String sHTMLName = "index.html"; File aInputPathTest = new File(m_sInputPath); if (!aInputPathTest.isDirectory()) @@ -295,13 +295,13 @@ public class ConvWatchStarter extends EnhancedComplexTestCase runGDCWithStatus(HTMLoutput, LISToutput, m_sInputPath, m_sOutputPath, m_sReferencePath, m_sDiffPath, ""); } } - + LISToutput.close(); HTMLoutput.close(); log.println("The file '" + HTMLoutput.getFilename() + "' shows a html based status."); DB.writeHTMLFile(HTMLoutput.getFilename()); } - + // ----------------------------------------------------------------------------- void runGDCWithStatus(HTMLOutputter _aHTMLoutput, LISTOutputter _aLISToutput, String _sInputFile, String _sOutputPath, String _sReferencePath, String _sDiffPath, String _sNewSubDir ) @@ -317,7 +317,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase // { // aSemaphore.P(aSemaphore.getSemaphoreFile()); // } - + aGTA.getPerformance().startTime(PerformanceContainer.OfficeStart); aProvider = new OfficeProvider(); XMultiServiceFactory xMSF = (XMultiServiceFactory) aProvider.getManager(param); @@ -328,7 +328,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase aGTA = getGraphicalTestArguments(); // get new TestArguments aGTA.getPerformance().setTime(PerformanceContainer.OfficeStart, nStartTime); } - + // Watcher Object is need in log object to give a simple way to say if a running office is alive. // As long as a log comes, it pings the Watcher and says the office is alive, if not an // internal counter increase and at a given point (300 seconds) the office is killed. @@ -371,7 +371,7 @@ public class ConvWatchStarter extends EnhancedComplexTestCase sStatusRunThrough = "FAILED, FAILED"; DB.destination_failed(sStatusRunThrough, sStatusMessage); } - + GlobalLogWriter.get().println("Watcher count is: " + aWatcher.getPing()); // Office shutdown @@ -441,5 +441,5 @@ public class ConvWatchStarter extends EnhancedComplexTestCase } - + } |