[Libreoffice-commits] core.git: 5 commits - dbaccess/qa framework/qa qadevOOo/runner qadevOOo/tests sc/qa sfx2/qa sw/qa toolkit/qa ucb/qa unotest/source vcl/qa
Noel Grandin
noel at peralex.com
Sun Jan 11 22:37:35 PST 2015
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 8 -
framework/qa/complex/XUserInputInterception/EventTest.java | 4
framework/qa/complex/api_internal/CheckAPI.java | 5 -
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 5 -
framework/qa/complex/desktop/DesktopTerminate.java | 16 ---
framework/qa/complex/framework/recovery/RecoveryTest.java | 16 +--
framework/qa/complex/framework/recovery/RecoveryTools.java | 36 +------
framework/qa/complex/imageManager/_XComponent.java | 4
qadevOOo/runner/base/java_fat.java | 4
qadevOOo/runner/helper/ClParser.java | 49 ++++------
qadevOOo/runner/helper/LoggingThread.java | 13 +-
qadevOOo/runner/helper/OfficeProvider.java | 36 -------
qadevOOo/runner/helper/OfficeWatcher.java | 24 ----
qadevOOo/runner/helper/ProcessHandler.java | 17 ---
qadevOOo/runner/helper/UnoProvider.java | 5 -
qadevOOo/runner/lib/TestParameters.java | 1
qadevOOo/runner/util/AccessibilityTools.java | 2
qadevOOo/runner/util/DesktopTools.java | 2
qadevOOo/runner/util/PropertyName.java | 9 -
qadevOOo/runner/util/utils.java | 13 +-
qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java | 12 --
qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java | 15 ---
qadevOOo/tests/java/ifc/awt/_XImageProducer.java | 4
qadevOOo/tests/java/ifc/awt/_XItemListener.java | 4
qadevOOo/tests/java/ifc/awt/_XRadioButton.java | 4
qadevOOo/tests/java/ifc/awt/_XScrollBar.java | 17 ---
qadevOOo/tests/java/ifc/awt/_XSpinField.java | 20 ----
qadevOOo/tests/java/ifc/awt/_XSpinValue.java | 17 ---
qadevOOo/tests/java/ifc/awt/_XTextComponent.java | 6 -
qadevOOo/tests/java/ifc/awt/_XTextListener.java | 4
qadevOOo/tests/java/ifc/awt/_XTopWindow.java | 10 --
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 7 +
qadevOOo/tests/java/ifc/awt/_XWindow.java | 28 +----
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java | 27 +----
qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java | 5 -
qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java | 5 -
qadevOOo/tests/java/ifc/connection/_XAcceptor.java | 5 -
qadevOOo/tests/java/ifc/connection/_XConnector.java | 5 -
qadevOOo/tests/java/ifc/container/_XContainer.java | 16 ---
qadevOOo/tests/java/ifc/container/_XIndexAccess.java | 5 -
qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java | 6 -
qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java | 18 ---
qadevOOo/tests/java/ifc/form/_XFormController.java | 20 ----
qadevOOo/tests/java/ifc/form/_XLoadable.java | 15 ---
qadevOOo/tests/java/ifc/form/_XReset.java | 18 ---
qadevOOo/tests/java/ifc/form/_XSubmit.java | 14 --
qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java | 29 ++---
qadevOOo/tests/java/ifc/form/submission/_XSubmission.java | 6 -
qadevOOo/tests/java/ifc/frame/_XComponentLoader.java | 12 --
qadevOOo/tests/java/ifc/frame/_XDispatch.java | 15 ---
qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java | 8 -
qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java | 4
qadevOOo/tests/java/ifc/frame/_XFrame.java | 4
qadevOOo/tests/java/ifc/frame/_XFrameLoader.java | 15 ---
qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java | 5 -
qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java | 4
qadevOOo/tests/java/ifc/io/_XActiveDataControl.java | 1
qadevOOo/tests/java/ifc/lang/_XComponent.java | 4
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 11 --
qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java | 20 ++--
qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java | 14 --
qadevOOo/tests/java/ifc/task/_XJobExecutor.java | 4
qadevOOo/tests/java/ifc/text/_XDocumentIndex.java | 6 -
qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java | 16 ---
qadevOOo/tests/java/ifc/text/_XPagePrintable.java | 2
qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java | 10 --
qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java | 14 --
qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java | 7 -
qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java | 14 --
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java | 16 ---
qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java | 4
qadevOOo/tests/java/mod/_basctl/AccessibleShape.java | 6 -
qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java | 22 ----
qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java | 16 ---
qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java | 16 ---
qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java | 14 --
qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java | 17 ---
qadevOOo/tests/java/mod/_forms/OTimeControl.java | 14 --
qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java | 6 -
qadevOOo/tests/java/mod/_fwk/JobExecutor.java | 4
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 11 --
qadevOOo/tests/java/mod/_remotebridge/various.java | 11 --
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java | 6 -
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 16 ---
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 16 ---
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 16 ---
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java | 16 ---
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 10 --
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 6 -
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java | 2
qadevOOo/tests/java/mod/_sc/ScTabViewObj.java | 4
qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 6 -
qadevOOo/tests/java/mod/_sch/AccArea.java | 2
qadevOOo/tests/java/mod/_sch/AccAxis.java | 2
qadevOOo/tests/java/mod/_sch/AccDataPoint.java | 2
qadevOOo/tests/java/mod/_sch/AccDataSeries.java | 2
qadevOOo/tests/java/mod/_sch/AccDiagram.java | 2
qadevOOo/tests/java/mod/_sch/AccFloor.java | 2
qadevOOo/tests/java/mod/_sch/AccGrid.java | 2
qadevOOo/tests/java/mod/_sch/AccLegend.java | 2
qadevOOo/tests/java/mod/_sch/AccLegendEntry.java | 2
qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 2
qadevOOo/tests/java/mod/_sch/AccTitle.java | 2
qadevOOo/tests/java/mod/_sch/AccWall.java | 2
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java | 2
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java | 2
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java | 14 --
qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java | 18 ---
qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java | 16 ---
qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java | 18 +--
qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java | 18 +--
qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java | 18 +--
qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java | 18 +--
qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java | 14 --
qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java | 12 --
qadevOOo/tests/java/mod/_sd/SdUnoPresView.java | 10 --
qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java | 12 --
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 18 ---
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 20 ----
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 22 ----
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 20 ----
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java | 20 ----
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java | 20 ----
qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java | 18 ---
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java | 20 ----
qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java | 3
qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java | 16 ---
qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java | 2
qadevOOo/tests/java/mod/_svx/AccessibleShape.java | 2
qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java | 4
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java | 19 ---
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 18 ---
qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java | 2
qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 10 --
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java | 16 ---
qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 16 ---
qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java | 16 ---
qadevOOo/tests/java/mod/_toolkit/AccessibleList.java | 20 ----
qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java | 20 ----
qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java | 20 ----
qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java | 21 ----
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java | 16 ---
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 18 ---
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java | 18 ---
qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java | 10 --
qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java | 20 ----
qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java | 26 +----
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java | 2
qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java | 2
sc/qa/complex/calcPreview/ViewForwarder.java | 44 +-------
sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java | 34 ++----
sfx2/qa/complex/sfx2/tools/WriterHelper.java | 15 ---
sw/qa/complex/accessibility/AccessibleRelationSet.java | 2
sw/qa/complex/indeterminateState/CheckIndeterminateState.java | 1
toolkit/qa/complex/toolkit/AccessibleStatusBar.java | 20 ----
toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java | 19 ---
toolkit/qa/complex/toolkit/accessibility/_XAccessibleEventBroadcaster.java | 12 --
ucb/qa/complex/tdoc/_XCommandProcessor.java | 10 --
ucb/qa/complex/tdoc/_XComponent.java | 4
unotest/source/java/org/openoffice/test/OfficeConnection.java | 6 -
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 25 +----
vcl/qa/complex/persistent_window_states/DocumentHandle.java | 10 --
191 files changed, 394 insertions(+), 1707 deletions(-)
New commits:
commit 673c59936c037999ffef2dc45854f795a3b63216
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:16:29 2014 +0200
java: simplify command-line parameter parsing in ClParser
Change-Id: I37790675619b2dde3fe303ba3adc527fc1dfdcf5
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index 8e4c0ab..22c3e9c 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -18,7 +18,7 @@
package helper;
import java.io.File;
-import java.util.Properties;
+import java.util.HashMap;
import lib.TestParameters;
import util.PropertyName;
@@ -36,11 +36,9 @@ public class ClParser
public void getCommandLineParameter(TestParameters param, String[] args)
{
- Properties mapping = getMapping();
-
for (int i = 0; i < args.length;)
{
- String pName = getParameterFor(mapping, args[i]).trim();
+ String pName = getParameterFor(args[i]).trim();
String pValue = "";
if (pName.equals("TestJob"))
{
@@ -145,33 +143,30 @@ public class ClParser
return iniFile;
}
- /*
- * This method maps commandline Parameters to TestParameters
+ /**
+ * Map command-line Parameters to TestParameters
*/
- private Properties getMapping()
- {
- Properties map = new Properties();
- map.setProperty("-cs", "ConnectionString");
- map.setProperty("-tb", "TestBase");
- map.setProperty("-tdoc", "TestDocumentPath");
- map.setProperty("-objdsc", "DescriptionPath");
- map.setProperty("-cmd", "AppExecutionCommand");
- map.setProperty("-o", "TestJob");
- map.setProperty("-sce", "TestJob");
- map.setProperty("-p", "TestJob");
- map.setProperty("-aca", "AdditionalConnectionArguments");
- map.setProperty("-xcl", "ExclusionList");
- map.setProperty("-debug", "DebugIsActive");
- map.setProperty("-log", "LoggingIsActive");
- map.setProperty("-dbout", "DataBaseOut");
- map.setProperty("-nca", "NoCwsAttach");
-
- return map;
+ private static final java.util.Map<String,String> COMMAND_LINE_OPTION_TO_TEST_PARAMETER = new HashMap<String,String>();
+ static {
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-cs", "ConnectionString");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-tb", "TestBase");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-tdoc", "TestDocumentPath");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-objdsc", "DescriptionPath");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-cmd", "AppExecutionCommand");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-o", "TestJob");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-sce", "TestJob");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-p", "TestJob");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-aca", "AdditionalConnectionArguments");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-xcl", "ExclusionList");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-debug", "DebugIsActive");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-log", "LoggingIsActive");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-dbout", "DataBaseOut");
+ COMMAND_LINE_OPTION_TO_TEST_PARAMETER.put("-nca", "NoCwsAttach");
}
- private String getParameterFor(Properties map, String name)
+ private String getParameterFor(String name)
{
- String ret = map.getProperty(name);
+ String ret = COMMAND_LINE_OPTION_TO_TEST_PARAMETER.get(name);
if (ret == null)
{
commit 37d36d6c76786ee5c8be36002b0dcb1ec3126b6f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:09:01 2014 +0200
java: APP_KILL_COMMAND is unused
Change-Id: I4bc4208a80a41a43f9a1145a2e674f37d1333424
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 19890e9..a1d3910 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -497,23 +497,6 @@ public class OfficeProvider implements AppProvider
}
}
- final String AppKillCommand = (String) param.get(util.PropertyName.APP_KILL_COMMAND);
- if (AppKillCommand != null)
- {
- String sAppKillCommand = StringHelper.removeSurroundQuoteIfExists(AppKillCommand);
- final StringTokenizer aKillCommandToken = new StringTokenizer(sAppKillCommand, ";");
- while (aKillCommandToken.hasMoreTokens())
- {
- final String sKillCommand = aKillCommandToken.nextToken();
- dbg("User defined an application to destroy the started process. Trying to execute: " + sKillCommand);
-
- final ProcessHandler pHdl = new ProcessHandler(sKillCommand, 1000); // 3000 seems to be too long
- pHdl.runCommand();
-
- pHdl.kill();
- }
- }
-
final ProcessHandler ph = (ProcessHandler) param.get("AppProvider");
if (ph != null)
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index 241115e..ac35513 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -78,19 +78,6 @@ public class OfficeWatcher extends Thread implements share.Watcher {
if (ph != null) {
dbg("the Office is idle for " + timeOut / 1000 +
" seconds, it probably hangs and is killed NOW.");
- final String AppKillCommand = (String) params.get(util.PropertyName.APP_KILL_COMMAND);
- if (AppKillCommand != null) {
- final StringTokenizer aKillCommandToken = new StringTokenizer(AppKillCommand, ";");
- while (aKillCommandToken.hasMoreTokens()) {
- final String sKillCommand = aKillCommandToken.nextToken();
-
- dbg("User defined an application to destroy the started process.");
- dbg("Trying to execute: " + sKillCommand);
-
- final ProcessHandler pHdl = new ProcessHandler(sKillCommand);
- pHdl.executeSynchronously();
- }
- }
ph.kill();
} else {
dbg("reaeched timeout but ProcessHandler is NULL");
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 4207d4f..1932a74 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -29,10 +29,6 @@ public interface PropertyName {
*/
String APP_EXECUTION_COMMAND = "AppExecutionCommand";
/**
- * parameter name: "AppKillCommand"
- */
- String APP_KILL_COMMAND = "AppKillCommand";
- /**
* parameter name: "ConnectionString"
*/
String CONNECTION_STRING = "ConnectionString";
commit 09330056a01a4b5c3d16e3ffb6c1bff36099eb83
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 22 10:02:49 2014 +0200
java: simplify sleeping and waiting in tests
- remove the SHORT_WAIT test parameter, no-one is using it
- inline the various independent shortWait() methods
- use the util.utils.shortWait() utility method everywhere
Change-Id: I93cd4a2580172a1441d2ff3d390f52b9505e2721
diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 3a0f013..03727fe 100644
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -202,13 +202,7 @@ public class CopyTableWizard extends CRMBasedTestCase
private void sleep()
{
- try
- {
- Thread.sleep(500);
- }
- catch (InterruptedException e)
- {
- }
+ util.utils.shortWait();
}
}
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index e8462b4..f337495 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -267,7 +267,7 @@ public class EventTest {
et.run();
- util.utils.shortWait(m_threadWait);
+ util.utils.pause(m_threadWait);
System.out.println("key listener thread should be finished.");
assertTrue("key event does not work!", m_keyPressed && m_keyReleased);
@@ -300,7 +300,7 @@ public class EventTest {
et.run();
- util.utils.shortWait(m_threadWait);
+ util.utils.pause(m_threadWait);
System.out.println("mouse listener thread should be finished.");
assertTrue("mouse event does not work!", m_mousePressed && m_mouseReleased);
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index dfc7754..0480191 100644
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -145,10 +145,7 @@ public class CheckAPI {
xMSF = null;
ProcessHandler handler = (ProcessHandler)param.get("AppProvider");
handler.kill();
- try {
- Thread.sleep(10000);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(10000);
OfficeProvider op = new OfficeProvider();
xMSF = (XMultiServiceFactory)op.getManager(param);
param.put("ServiceFactory",xMSF);
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 189a1e8..532dc9d 100644
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -316,7 +316,7 @@ public class CheckContextMenuInterceptor
System.out.println("couldn't press mouse button");
}
- utils.shortWait(3000);
+ utils.pause(3000);
}
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index e7bd042..ee862bd 100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -89,13 +89,7 @@ public class DesktopTerminate
try
{
xMSF = getMSF();
- try
- {
- Thread.sleep(10000);
- }
- catch (InterruptedException e)
- {
- }
+ util.utils.pause(10000);
}
catch (java.lang.Exception e)
{
@@ -115,13 +109,7 @@ public class DesktopTerminate
desk = UnoRuntime.queryInterface(XDesktop.class, xMSF.createInstance("com.sun.star.frame.Desktop"));
desk.terminate();
System.out.println("Waiting " + iOfficeCloseTime + " milliseconds for the Office to close down");
- try
- {
- Thread.sleep(iOfficeCloseTime);
- }
- catch (InterruptedException e)
- {
- }
+ util.utils.pause(iOfficeCloseTime);
xMSF = null;
}
catch (java.lang.Exception e)
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 187b336..42f61c3 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -204,8 +204,8 @@ public class RecoveryTest extends ComplexTestCase {
CrashThread crash = new CrashThread(xDoc, xMSF);
crash.start();
- rt.pause();
- rt.pause();
+ util.utils.shortWait();
+ util.utils.shortWait();
}
/**
@@ -221,13 +221,13 @@ public class RecoveryTest extends ComplexTestCase {
log.println("wating for recovery dialog...");
int counter = 0;
- int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT);
+ int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / PropertyName.DEFAULT_SHORT_WAIT_MS;
XDialog oDialog = rt.getActiveDialog(xMSF);
while ( oDialog == null && (counter < maximum))
{
- rt.pause();
+ util.utils.shortWait();
oDialog = rt.getActiveDialog(xMSF);
counter ++;
}
@@ -349,10 +349,10 @@ public class RecoveryTest extends ComplexTestCase {
log.println("clicking 'Start Recovery' button...");
oUITools.clickButton("Start Recovery >");
- rt.pause();
+ util.utils.shortWait();
int counter = 0;
- int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT);
+ int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / PropertyName.DEFAULT_SHORT_WAIT_MS;
XAccessibleContext oButton = null;
while ((oButton == null) && (counter < maximum)){
@@ -364,7 +364,7 @@ public class RecoveryTest extends ComplexTestCase {
// no fault: The title "Start Recovery" switches to "Next"
// while all documents are recoverd
}
- rt.pause();
+ util.utils.shortWait();
counter++;
}
@@ -379,7 +379,7 @@ public class RecoveryTest extends ComplexTestCase {
oUITools.clickButton("Next >");
}
- rt.pause();
+ util.utils.shortWait();
} else {
log.println("do not recover: clicking 'Cancel' button...");
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 36f3c01..7037451 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -93,15 +93,15 @@ public class RecoveryTools {
// This could consumes more time then the TimeOut allow.
int counter = 0;
int multi = 5;
- int pause = param.getInt(PropertyName.SHORT_WAIT)*10;
+ int pause = PropertyName.DEFAULT_SHORT_WAIT_MS * 10;
int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5;
int maximum = (timeOut / pause) * multi;
XDialog oDialog = getActiveDialog(xMSF);
while (oDialog == null && (counter < maximum)){
- log.println("waiting until the office has recoverd... remaining " + (timeOut * multi - pause * counter)/1000 + " seconds");
- pause(pause);
+ log.println("waiting until the office has recovered... remaining " + (timeOut * multi - pause * counter)/1000 + " seconds");
+ util.utils.pause(pause);
oDialog = getActiveDialog(xMSF);
counter ++;
}
@@ -109,26 +109,6 @@ public class RecoveryTools {
}
/**
- * halt the thread for some time
- */
- public void pause(){
- pause(param.getInt(PropertyName.SHORT_WAIT));
- }
-
- /**
- * halt the thread for some time
- */
- private void pause(int sleepTime){
- sleep(sleepTime);
- }
-
- private void sleep(long millis){
- try{
- Thread.sleep(millis);
- }catch (InterruptedException e){}
- }
-
- /**
* remove the content of the user backup folder and removes the Recovery.xcu. This
* was done from the Office via XSimpleFileAccess
* @throws com.sun.star.io.IOException the exception was thrown if something goes wrong.
@@ -204,11 +184,11 @@ public class RecoveryTools {
helper.ProcessHandler ph = (helper.ProcessHandler) param.get("AppProvider");
int timeOut = param.getInt(PropertyName.THREAD_TIME_OUT)*5;
- int pause = param.getInt(PropertyName.SHORT_WAIT)*20;
+ int pause = PropertyName.DEFAULT_SHORT_WAIT_MS * 20;
int multi = 0;
while ((ph != null) && (ph.getExitCode()<0) && (pause*multi < timeOut)) {
log.println("waiting until the office is closed... remaining " + (timeOut - pause * multi)/1000 + " seconds");
- pause(pause);
+ util.utils.pause(pause);
multi ++;
}
@@ -254,7 +234,7 @@ public class RecoveryTools {
log.println("try to get modal Dialog...");
- pause();
+ util.utils.shortWait();
XWindow oDialog = getActiveWindow(xMSF);
@@ -270,14 +250,14 @@ public class RecoveryTools {
} catch ( java.lang.Exception e){
throw new com.sun.star.accessibility.IllegalAccessibleComponentStateException("Could not click '"+buttonName +"' at modal dialog", e);
}
- pause();
+ util.utils.shortWait();
}
public void clickThreadButton(XWindow xWindow, String buttonName)
{
KlickButtonThread kbt = new KlickButtonThread(xWindow, buttonName);
kbt.start();
- pause(param.getInt(PropertyName.SHORT_WAIT) * 10);
+ util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 10);
}
public void copyRecoveryData(boolean backup)
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index e5a3ea9..c8c94d7 100644
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -147,9 +147,7 @@ public class _XComponent {
}
}
- try {
- Thread.sleep(500) ;
- } catch (InterruptedException e) {}
+ util.utils.shortWait();
if (Loutput[0]!=null){
System.out.println(Loutput[0]);
}
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java
index 78bcc38..bc63f40 100644
--- a/qadevOOo/runner/base/java_fat.java
+++ b/qadevOOo/runner/base/java_fat.java
@@ -133,7 +133,7 @@ public class java_fat implements TestBase
continue;
}
- util.utils.shortWait(2000);
+ util.utils.pause(2000);
System.out.println("Creating: " + entry.entryName);
@@ -430,7 +430,7 @@ public class java_fat implements TestBase
if (ph != null)
{
m_aOffice.closeExistingOffice(m_aParams, true);
- util.utils.shortWait(5000);
+ util.utils.pause(5000);
}
}
diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/runner/helper/LoggingThread.java
index 590a467..6878fbc 100644
--- a/qadevOOo/runner/helper/LoggingThread.java
+++ b/qadevOOo/runner/helper/LoggingThread.java
@@ -70,14 +70,11 @@ public class LoggingThread extends Thread {
* finished the LoggingThread
*/
public void finish() {
- try {
- finished = true;
- synchronized (this) {
- notify();
- }
- if (debug) log.println("TimeOutLogger: " + utils.getDateTime() + " try to finish ");
- sleep(1000);
- } catch (InterruptedException ex) {
+ finished = true;
+ synchronized (this) {
+ notify();
}
+ if (debug) log.println("TimeOutLogger: " + utils.getDateTime() + " try to finish ");
+ util.utils.pause(1000);
}
}
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 4496fec..19890e9 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -262,13 +262,7 @@ public class OfficeProvider implements AppProvider
}
if (msf == null)
{
- try
- {
- Thread.sleep(500L * k);
- }
- catch (InterruptedException ex)
- {
- }
+ util.utils.pause(500 * k);
}
k++;
}
@@ -762,15 +756,8 @@ public class OfficeProvider implements AppProvider
{
System.out.println(utils.getDateTime() + "OfficeProvider:Owp: ping ");
ow.ping();
- try
- {
- System.out.println(utils.getDateTime() + "OfficeProvider:Owp: sleep ");
- OfficeWatcherPing.sleep(1000); // 5000
- }
- catch (InterruptedException ex)
- {
- ex.printStackTrace();
- }
+ System.out.println(utils.getDateTime() + "OfficeProvider:Owp: sleep ");
+ util.utils.pause(1000);
}
}
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/runner/helper/OfficeWatcher.java
index 60900c0..241115e 100644
--- a/qadevOOo/runner/helper/OfficeWatcher.java
+++ b/qadevOOo/runner/helper/OfficeWatcher.java
@@ -65,7 +65,7 @@ public class OfficeWatcher extends Thread implements share.Watcher {
while (!isDone) {
timeOut = params.getInt("TimeOut");
final int previous = StoredPing;
- shortWait(timeOut == 0 ? 30000 : timeOut);
+ util.utils.pause(timeOut == 0 ? 30000 : timeOut);
// a timeout with value 0 lets watcher not react.
if ((StoredPing == previous) && timeOut != 0) {
isDone = true;
@@ -95,17 +95,10 @@ public class OfficeWatcher extends Thread implements share.Watcher {
} else {
dbg("reaeched timeout but ProcessHandler is NULL");
}
- shortWait(timeOut == 0 ? 30000 : timeOut);
+ util.utils.pause(timeOut == 0 ? 30000 : timeOut);
dbg("finished");
}
- private void shortWait(int timeOut) {
- try {
- OfficeWatcher.sleep(timeOut);
- } catch (InterruptedException ie) {
- }
- }
-
private void dbg(String message) {
if (debug) {
System.out.println(utils.getDateTime() + "OfficeWatcher: " + message);
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 1be600d..10241a3 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -329,13 +329,7 @@ public class ProcessHandler
{
m_aProcess.destroy();
- try
- {
- Thread.sleep(1000L * counter); // 5000
- }
- catch (InterruptedException e)
- {
- }
+ util.utils.pause(1000 * counter);
try
{
final int exit_Value = m_aProcess.exitValue();
@@ -664,14 +658,7 @@ public class ProcessHandler
while (m_nTimeoutInSec > 0)
{
m_nTimeoutInSec--;
- try
- {
- sleep(1000);
- }
- catch(InterruptedException e)
- {
- // interrupt flag is set back to 'not interrupted' :-(
- }
+ util.utils.pause(1000);
if (isInHoldOn())
{
break;
diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java
index 78430d1..d5d18c3 100644
--- a/qadevOOo/runner/helper/UnoProvider.java
+++ b/qadevOOo/runner/helper/UnoProvider.java
@@ -70,10 +70,7 @@ public class UnoProvider implements AppProvider {
public boolean disposeManager(TestParameters param) {
param.remove("ServiceManager");
System.gc();
- try {
- Thread.sleep(1000);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(1000);
return true;
}
diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java
index 57501c1..33fbd30 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -151,7 +151,6 @@ public class TestParameters extends HashMap<String,Object> {
put(PropertyName.LOGGING_IS_ACTIVE, Boolean.TRUE);
put(PropertyName.DEBUG_IS_ACTIVE, Boolean.valueOf(DebugIsActive));
put(PropertyName.OUT_PRODUCER, "stats.SimpleOutProducer");
- put(PropertyName.SHORT_WAIT, Integer.valueOf(500));
put(PropertyName.OFFICE_PROVIDER, "helper.OfficeProvider");
put(PropertyName.LOG_WRITER, "stats.SimpleLogWriter");
put(PropertyName.APP_EXECUTION_COMMAND, "");
diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java
index d61ba4b..1f6f6cf 100644
--- a/qadevOOo/runner/util/DesktopTools.java
+++ b/qadevOOo/runner/util/DesktopTools.java
@@ -402,7 +402,7 @@ public class DesktopTools
oViewProp.setPropertyValue("ZoomType",
Short.valueOf(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE));
- utils.shortWait(5000);
+ utils.pause(5000);
}
catch (Exception e)
{
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 141fee9..4207d4f 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -67,10 +67,9 @@ public interface PropertyName {
*/
String OUT_PRODUCER = "OutProducer";
/**
- * parameter name: "ShortWait"
- * Short wait time for the Office: default is 500 milliseconds
+ * Default short wait time for the Office
*/
- String SHORT_WAIT= "ShortWait";
+ int DEFAULT_SHORT_WAIT_MS = 500;
/**
* internal only, no parameter
* The OfficeProvider contains the full qualified
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 76d1666..4557cb5 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -645,10 +645,15 @@ public class utils {
}
/** Causes the thread to sleep some time.
- * It can be used f.e. like:
- * util.utils.shortWait(tParam.getInt("ShortWait"));
+ * This is the default call, which waits for 500ms.
*/
- public static void shortWait(int milliseconds) {
+ public static void shortWait() {
+ pause(PropertyName.DEFAULT_SHORT_WAIT_MS);
+ }
+
+ /** Causes the thread to sleep some time.
+ */
+ public static void pause(int milliseconds) {
try {
Thread.sleep(milliseconds);
} catch (InterruptedException e) {
@@ -827,7 +832,7 @@ public class utils {
XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", 0);
xDispatcher.dispatch(aURL, null);
- utils.shortWait(3000);
+ utils.pause(3000);
} catch (Exception e) {
throw new Exception("ERROR: could not dispatch URL '" + URL + "'", e);
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
index 98a0309..3002dbe 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
@@ -114,11 +114,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
log.println("fire event");
prod.fireEvent() ;
- try {
- Thread.sleep(3000);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.pause(3000);
boolean works = true;
@@ -163,11 +159,7 @@ public class _XAccessibleEventBroadcaster extends MultiMethodTest {
log.println("fire event");
prod.fireEvent() ;
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.shortWait();
if (list.notifiedEvent == null) {
log.println("listener wasn't called -- OK");
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
index de87878..fdb7d2f 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
@@ -212,7 +212,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
if (isSelectable(tEnv.getTestObject(), k)) {
oObj.selectAccessibleChild(k);
- shortWait();
+ util.utils.shortWait();
isSelected = oObj.isAccessibleChildSelected(k);
log.println("isAccessibleChildSelected - " +
isSelected);
@@ -247,7 +247,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
// clearAccessibleSelection() call is oneway so we need
// some waiting
- shortWait();
+ util.utils.shortWait();
if ((childCount > 0) && !OneAlwaysSelected) {
try {
@@ -284,7 +284,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
// selectAllAccessibleChildren() call is oneway so we need
// some waiting
- shortWait();
+ util.utils.shortWait();
boolean res = true;
boolean isSelected = true;
@@ -435,7 +435,7 @@ public class _XAccessibleSelection extends MultiMethodTest {
if (isSelectable(tEnv.getTestObject(), k)) {
oObj.selectAccessibleChild(k);
- shortWait();
+ util.utils.shortWait();
log.println("selected child count: " +
oObj.getSelectedAccessibleChildCount());
XAccessible selChild = oObj.getSelectedAccessibleChild(0);
@@ -583,11 +583,4 @@ public class _XAccessibleSelection extends MultiMethodTest {
return res;
}
-
- private void shortWait() {
- try {
- Thread.sleep(500);
- } catch (InterruptedException ex) {
- }
- }
}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
index 70b4d93..b61bb04 100644
--- a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
+++ b/qadevOOo/tests/java/ifc/awt/_XImageProducer.java
@@ -144,9 +144,7 @@ public class _XImageProducer extends MultiMethodTest {
oObj.startProduction() ;
- try {
- Thread.sleep(500) ;
- } catch (InterruptedException e) {}
+ util.utils.shortWait();
tRes.tested("startProduction()", consumer.initCalled) ;
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XItemListener.java b/qadevOOo/tests/java/ifc/awt/_XItemListener.java
index 8bd31ed..9e0527b 100644
--- a/qadevOOo/tests/java/ifc/awt/_XItemListener.java
+++ b/qadevOOo/tests/java/ifc/awt/_XItemListener.java
@@ -95,9 +95,7 @@ public class _XItemListener extends MultiMethodTest {
event.Highlighted = 2 ;
oObj.itemStateChanged(event) ;
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {}
+ util.utils.pause(200);
result = itemListener.itemStateChangedCalled &&
itemListener.event.Selected == 1 &&
diff --git a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
index 306fed4..b190046 100644
--- a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
+++ b/qadevOOo/tests/java/ifc/awt/_XRadioButton.java
@@ -117,9 +117,7 @@ public class _XRadioButton extends MultiMethodTest {
boolean result = true ;
oObj.setState(!state) ;
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {}
+ util.utils.pause(200);
result = oObj.getState() == !state ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
index f385db2..9c78eec 100644
--- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
+++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
@@ -39,7 +39,7 @@ public class _XScrollBar extends MultiMethodTest {
public void _addAdjustmentListener() {
util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document"));
- shortWait();
+ util.utils.shortWait();
oObj.addAdjustmentListener(listener);
adjustScrollBar();
@@ -167,7 +167,7 @@ public class _XScrollBar extends MultiMethodTest {
sc.setValue(500);
- shortWait();
+ util.utils.shortWait();
XAccessible acc = UnoRuntime.queryInterface(
XAccessible.class, tEnv.getTestObject());
@@ -186,18 +186,7 @@ public class _XScrollBar extends MultiMethodTest {
System.out.println("couldn't adjust scrollbar");
}
- shortWait();
- }
-
- /**
- * Sleeps for 0.5 sec. to allow Office to react
- */
- private void shortWait() {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- log.println("While waiting :" + e);
- }
+ util.utils.shortWait();
}
public class AdjustmentListener
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinField.java b/qadevOOo/tests/java/ifc/awt/_XSpinField.java
index c1f2e0e..d6a9b3a 100644
--- a/qadevOOo/tests/java/ifc/awt/_XSpinField.java
+++ b/qadevOOo/tests/java/ifc/awt/_XSpinField.java
@@ -94,7 +94,7 @@ public class _XSpinField extends MultiMethodTest {
requiredMethod("addSpinListener()") ;
oObj.up() ;
- shortWait();
+ util.utils.shortWait();
tRes.tested("up()", listener.upFl) ;
}
@@ -112,7 +112,7 @@ public class _XSpinField extends MultiMethodTest {
requiredMethod("addSpinListener()") ;
oObj.down() ;
- shortWait();
+ util.utils.shortWait();
tRes.tested("down()", listener.downFl) ;
}
@@ -130,7 +130,7 @@ public class _XSpinField extends MultiMethodTest {
requiredMethod("addSpinListener()") ;
oObj.first() ;
- shortWait();
+ util.utils.shortWait();
tRes.tested("first()", listener.firstFl) ;
}
@@ -148,7 +148,7 @@ public class _XSpinField extends MultiMethodTest {
requiredMethod("addSpinListener()") ;
oObj.last() ;
- shortWait();
+ util.utils.shortWait();
tRes.tested("last()", listener.lastFl) ;
}
@@ -192,16 +192,4 @@ public class _XSpinField extends MultiMethodTest {
tRes.tested("enableRepeat()", true) ;
}
-
- /**
- * Waits for 0.5 sec to allow listener to be called.
- */
- private void shortWait() {
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException ex) {
- }
-
- }
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
index b8a2765..ebf5aa7 100644
--- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
+++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
@@ -38,7 +38,7 @@ public class _XSpinValue extends MultiMethodTest {
public void _addAdjustmentListener() {
util.FormTools.switchDesignOf(tParam.getMSF(),
(XTextDocument) tEnv.getObjRelation("Document"));
- shortWait();
+ util.utils.shortWait();
oObj.addAdjustmentListener(listener);
adjustScrollBar();
@@ -158,7 +158,7 @@ public class _XSpinValue extends MultiMethodTest {
sv.setValue(500);
- shortWait();
+ util.utils.shortWait();
XAccessible acc = UnoRuntime.queryInterface(
XAccessible.class, tEnv.getTestObject());
@@ -177,18 +177,7 @@ public class _XSpinValue extends MultiMethodTest {
System.out.println("couldn't adjust scrollbar");
}
- shortWait();
- }
-
- /**
- * Sleeps for 0.5 sec. to allow Office to react
- */
- private void shortWait() {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- log.println("While waiting :" + e);
- }
+ util.utils.shortWait();
}
public class AdjustmentListener
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
index 33f8fdf..c1a73b6 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
@@ -90,11 +90,7 @@ public class _XTextComponent extends MultiMethodTest {
public void _addTextListener(){
oObj.addTextListener(listener);
oObj.setText("Listen");
- try {
- Thread.sleep(500);
- } catch(InterruptedException e) {
- e.printStackTrace(log);
- }
+ util.utils.shortWait();
if (!textChanged) {
log.println("Listener wasn't called after changing Text");
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextListener.java b/qadevOOo/tests/java/ifc/awt/_XTextListener.java
index ded6547..3a31208 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextListener.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextListener.java
@@ -98,9 +98,7 @@ public class _XTextListener extends MultiMethodTest {
event.dummy1 = 2;
oObj.textChanged(event);
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {}
+ util.utils.pause(200);
result = textListener.textChangedCalled &&
textListener.event.dummy1 == 2;
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
index d82baf2..22da48a 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
@@ -140,7 +140,7 @@ public class _XTopWindow extends MultiMethodTest {
requiredMethod("addTopWindowListener()");
listener.initListener();
oObj.toFront();
- shortWait();
+ util.utils.pause(1000);
tRes.tested("toFront()", listener.activated && !listener.deactivated);
}
@@ -186,13 +186,5 @@ public class _XTopWindow extends MultiMethodTest {
protected void after() {
aTextDoc.dispose();
}
-
- private void shortWait() {
- try {
- Thread.sleep(1000) ;
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e) ;
- }
- }
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 557abd5..56dbf53 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -33,10 +33,13 @@ import com.sun.star.awt.XWindow;
import com.sun.star.frame.XModel;
import com.sun.star.lang.EventObject;
import com.sun.star.uno.UnoRuntime;
+
import java.awt.Robot;
import java.awt.event.InputEvent;
+
import lib.MultiMethodTest;
import util.AccessibilityTools;
+import util.PropertyName;
/**
* Testing <code>com.sun.star.awt.XUserInputInterception</code>
@@ -148,7 +151,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT) * 2);
+ util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
log.println("key listener thread should be finished.");
@@ -211,7 +214,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT) * 2);
+ util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
log.println("mouse listener thread should be finished.");
boolean bOK = m_mousePressed1 & m_mouseReleased1 &
diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java b/qadevOOo/tests/java/ifc/awt/_XWindow.java
index 44d3f36..0b7a406 100644
--- a/qadevOOo/tests/java/ifc/awt/_XWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XWindow.java
@@ -242,7 +242,7 @@ public class _XWindow extends MultiMethodTest {
oObj.setPosSize(0, 0, 100, 100, PosSize.WIDTH);
}
- shortWait();
+ util.utils.pause(200);
boolean res = wListener.resized && wListener.moved &&
!wListener.hidden && !wListener.shown;
result &= res;
@@ -257,10 +257,10 @@ public class _XWindow extends MultiMethodTest {
// testing wListener.windowHidden()
wListener.init();
- shortWait();
+ util.utils.pause(200);
log.println("set object invisible...");
oObj.setVisible(false);
- shortWait();
+ util.utils.pause(200);
res = wListener.hidden && !wListener.resized
&& !wListener.moved && !wListener.shown;
result &= res;
@@ -275,10 +275,10 @@ public class _XWindow extends MultiMethodTest {
// testing wListener.windowShown()
wListener.init() ;
- shortWait();
+ util.utils.pause(200);
log.println("set object visible...");
oObj.setVisible(true) ;
- shortWait();
+ util.utils.pause(200);
res = wListener.shown && !wListener.resized &&
!wListener.hidden && !wListener.moved;
result &= res;
@@ -361,9 +361,9 @@ public class _XWindow extends MultiMethodTest {
// testing fListener.lost()
oObj.setFocus();
- shortWait();
+ util.utils.pause(200);
win.setFocus();
- shortWait();
+ util.utils.pause(200);
result &= fListener.lost;
if (!fListener.lost) {
log.println("Lost focus was not notified about") ;
@@ -371,7 +371,7 @@ public class _XWindow extends MultiMethodTest {
// testing fListener.gained()
oObj.setFocus() ;
- shortWait();
+ util.utils.pause(200);
result &= fListener.gained;
if (!fListener.gained) {
log.println("Gained focus was not notified about") ;
@@ -599,17 +599,5 @@ public class _XWindow extends MultiMethodTest {
tRes.tested("removePaintListener()", true);
}
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
}
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index 92df9c3..50508ce 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -197,7 +197,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
e.printStackTrace(log);
} // end of try-catch
}
- waitAMoment();
+ util.utils.pause(200);
tRes.tested("addPropertiesChangeListener()", propertiesChanged);
}
@@ -216,7 +216,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
propertiesChanged = false ;
oObj.firePropertiesChangeEvent(testPropsNames, PClistener);
- waitAMoment() ;
+ util.utils.pause(200);
tRes.tested("firePropertiesChangeEvent()", propertiesChanged);
}
@@ -336,17 +336,6 @@ public class _XMultiPropertySet extends MultiMethodTest {
testPropsAmount = nr;
}
- /**
- * Waits some time for listener to be called.
- */
- private void waitAMoment() {
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {
- log.println("!!! Exception while waiting !!!") ;
- }
- }
-
/*
* Does nothing.
*/
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
index d942b6d..9272f96 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
@@ -162,10 +162,7 @@ public class _XBridgeFactory extends MultiMethodTest {
acceptorThread = new AcceptorThread(xAccptr) ;
acceptorThread.start();
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
+ util.utils.shortWait();
conn = xCntr.connect(connectString) ;
} catch (com.sun.star.uno.Exception e) {
diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
index 0cb01dd..db2cd8c 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
@@ -165,10 +165,7 @@ public class _XUnoUrlResolver extends MultiMethodTest {
xInstProv, connectStr);
brThread.start();
- try {
- Thread.sleep(500);
- }
- catch(InterruptedException e) {}
+ util.utils.shortWait();
// get an instance from the remote
Object obj = oObj.resolve(
"uno:" + connectStr + ";urp;com.sun.star.lang.ServiceManager");
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index f939eb2..f0b5dc8 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -146,10 +146,7 @@ public class _XAcceptor extends MultiMethodTest {
acception = new AcceptorThread(oObj) ;
acception.start() ;
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
+ util.utils.shortWait();
XConnection con = xConnector.connect(connectString) ;
diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java
index adc8a04..5d63faf 100644
--- a/qadevOOo/tests/java/ifc/connection/_XConnector.java
+++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java
@@ -127,10 +127,7 @@ public class _XConnector extends MultiMethodTest {
acceptorThread = new AcceptorThread(xAcceptor) ;
acceptorThread.start() ;
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
+ util.utils.shortWait();
// connect to acceptor
try {
diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/tests/java/ifc/container/_XContainer.java
index f3277e9..78b8d79 100644
--- a/qadevOOo/tests/java/ifc/container/_XContainer.java
+++ b/qadevOOo/tests/java/ifc/container/_XContainer.java
@@ -254,10 +254,10 @@ public class _XContainer extends MultiMethodTest {
protected boolean performChanges2() {
int precount = CC.getControls().length;
CC.addControl("NewControl",(XControl) inst);
- shortWait();
+ util.utils.pause(1000);
int count = CC.getControls().length;
CC.removeControl(CC.getControl("NewControl"));
- shortWait();
+ util.utils.pause(1000);
return count>precount;
}
@@ -337,18 +337,6 @@ public class _XContainer extends MultiMethodTest {
return res;
}
-
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
}
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
index 5b5e8f8..99e3d60 100644
--- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
@@ -75,10 +75,7 @@ public class _XIndexAccess extends MultiMethodTest {
requiredMethod("getCount()");
// get count from holder
- try {
- Thread.sleep(200);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(200);
boolean result = true;
log.println("Testing getByIndex()");
diff --git a/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java b/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java
index b2b3ff3..12e54b6 100644
--- a/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java
@@ -48,7 +48,7 @@ public class _XEventBroadcaster extends MultiMethodTest {
XModel docModel = UnoRuntime.queryInterface(
XModel.class,tEnv.getTestObject());
docModel.getCurrentController().getFrame().getContainerWindow().setFocus();
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
XController xc = UnoRuntime.queryInterface(XController.class,tEnv.getObjRelation("CONT2"));
xc.getFrame().getContainerWindow().setFocus();
}
@@ -58,7 +58,7 @@ public class _XEventBroadcaster extends MultiMethodTest {
listenerCalled = false;
oObj.addEventListener(listener);
switchFocus();
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
tRes.tested("addEventListener()",listenerCalled);
}
@@ -67,7 +67,7 @@ public class _XEventBroadcaster extends MultiMethodTest {
listenerCalled = false;
oObj.removeEventListener(listener);
switchFocus();
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
tRes.tested("removeEventListener()",!listenerCalled);
}
diff --git a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
index 70eccdc..5f93420 100644
--- a/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java
@@ -124,13 +124,13 @@ public class _XChangeBroadcaster extends MultiMethodTest {
win1.setFocus();
changeContent() ;
- shortWait();
+ util.utils.pause(2000);
win2.setFocus();
XTextComponent TC = UnoRuntime.queryInterface
(XTextComponent.class,tEnv.getObjRelation("CONTROL"));
TC.setText("NOXChangeBroadcaster");
- shortWait();
+ util.utils.pause(2000);
tRes.tested("addChangeListener()", changed);
}
@@ -156,23 +156,11 @@ public class _XChangeBroadcaster extends MultiMethodTest {
changeContent() ;
win2.setFocus();
- shortWait();
+ util.utils.pause(2000);
tRes.tested("removeChangeListener()", !changed);
}
/**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
- /**
* Changes the content of the component depending on whether
* <code>XTextComponent</code> is supported or not. If yes
* then the text is chahged, if not the relation <code>change()</code>
diff --git a/qadevOOo/tests/java/ifc/form/_XFormController.java b/qadevOOo/tests/java/ifc/form/_XFormController.java
index 241df1c..f8024d1 100644
--- a/qadevOOo/tests/java/ifc/form/_XFormController.java
+++ b/qadevOOo/tests/java/ifc/form/_XFormController.java
@@ -87,10 +87,10 @@ public class _XFormController extends MultiMethodTest {
XWindow wind = UnoRuntime.queryInterface(XWindow.class, cntrl);
wind.setFocus();
- shortWait();
+ util.utils.pause(1000);
XWindow otherWind = (XWindow)tEnv.getObjRelation("otherWindow");
otherWind.setFocus();
- shortWait();
+ util.utils.pause(1000);
log.println("activated = " + listener.activated +
", deactivated = " + listener.deactivated) ;
@@ -112,10 +112,10 @@ public class _XFormController extends MultiMethodTest {
XWindow wind = UnoRuntime.queryInterface(XWindow.class, cntrl);
wind.setFocus();
- shortWait();
+ util.utils.pause(1000);
XWindow otherWind = (XWindow)tEnv.getObjRelation("otherWindow");
otherWind.setFocus();
- shortWait();
+ util.utils.pause(1000);
log.println("activated = " + listener.activated +
", deactivated = " + listener.deactivated) ;
@@ -148,17 +148,5 @@ public class _XFormController extends MultiMethodTest {
tRes.tested("getCurrentControl()", res) ;
}
-
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1000) ;
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e) ;
- }
- }
}
diff --git a/qadevOOo/tests/java/ifc/form/_XLoadable.java b/qadevOOo/tests/java/ifc/form/_XLoadable.java
index 27729c2..da8f57b 100644
--- a/qadevOOo/tests/java/ifc/form/_XLoadable.java
+++ b/qadevOOo/tests/java/ifc/form/_XLoadable.java
@@ -99,15 +99,6 @@ public class _XLoadable extends MultiMethodTest {
}
/**
- * Waits for 0.1 second. Used to get time for load completion.
- */
- private void shortWait() {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {}
- }
-
- /**
* Loads the form. <p>
* Has <b> OK </b> status if <code>isLoaded()</code> returns
* <code>true</code> and listener method <code>loaded()</code>
@@ -126,7 +117,7 @@ public class _XLoadable extends MultiMethodTest {
boolean result = true ;
oObj.load() ;
- shortWait() ;
+ util.utils.pause(100);
result = oObj.isLoaded() && loadListener.loadedCalled ;
tRes.tested("load()", result) ;
@@ -151,7 +142,7 @@ public class _XLoadable extends MultiMethodTest {
boolean result = true ;
oObj.unload() ;
- shortWait() ;
+ util.utils.pause(100);
result = !oObj.isLoaded() && loadListener.unloadedCalled ;
tRes.tested("unload()", result) ;
@@ -176,7 +167,7 @@ public class _XLoadable extends MultiMethodTest {
boolean result = true ;
oObj.reload() ;
- shortWait() ;
+ util.utils.pause(100);
result = oObj.isLoaded() && loadListener.reloadedCalled;
tRes.tested("reload()", result) ;
diff --git a/qadevOOo/tests/java/ifc/form/_XReset.java b/qadevOOo/tests/java/ifc/form/_XReset.java
index f61c114..033b9a3 100644
--- a/qadevOOo/tests/java/ifc/form/_XReset.java
+++ b/qadevOOo/tests/java/ifc/form/_XReset.java
@@ -134,11 +134,11 @@ public class _XReset extends MultiMethodTest {
log.println("Testing reset() ...");
approve = false;
oObj.reset();
- shortWait();
+ util.utils.shortWait();
tRes.tested("reset()", (approveReset[0] && (! resetted[0])));
approve = true;
oObj.reset();
- shortWait();
+ util.utils.shortWait();
tRes.tested("addResetListener()", (approveReset[1] && resetted[1]));
} // finished _reset
@@ -159,23 +159,11 @@ public class _XReset extends MultiMethodTest {
approveReset[0] = resetted[0] = false;
oObj.removeResetListener(listener1);
oObj.reset();
- shortWait();
+ util.utils.shortWait();
tRes.tested("removeResetListener()", !approveReset[0] && !resetted[0]);
//removing the second listener here may avoid crashing the office
} // finished _removeResetListener()
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(500) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
} // finished class _XRefresh
diff --git a/qadevOOo/tests/java/ifc/form/_XSubmit.java b/qadevOOo/tests/java/ifc/form/_XSubmit.java
index 7cec878..bfe3c2b 100644
--- a/qadevOOo/tests/java/ifc/form/_XSubmit.java
+++ b/qadevOOo/tests/java/ifc/form/_XSubmit.java
@@ -134,7 +134,7 @@ public class _XSubmit extends MultiMethodTest {
}
oObj.submit(cntrl, new MouseEvent());
- shortWait();
+ util.utils.pause(200);
log.println("Listener1 called " + listener1.called + " times");
log.println("Listener2 called " + listener2.called + " times");
@@ -160,18 +160,6 @@ public class _XSubmit extends MultiMethodTest {
}
/**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
- /**
* Forces environment recreation.
*/
@Override
diff --git a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
index fbd9def..34ca218 100644
--- a/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java
@@ -136,12 +136,12 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
try {
checker.update() ;
- shortWait() ;
+ util.utils.pause(200);
checker.commit() ;
- shortWait() ;
+ util.utils.pause(200);
boolean committed = checker.wasCommited() ;
- shortWait() ;
+ util.utils.pause(200);
bResult = listener.approveCalled &&
! listener.updateCalled &&
@@ -152,18 +152,18 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
(listener.updateCalled ? "":"NOT")+" called, the value was " +
(committed ? "" : "NOT") + " committed.") ;
- shortWait() ;
+ util.utils.pause(200);
listener.init() ;
listener.approve = true ;
- shortWait() ;
+ util.utils.pause(200);
checker.update() ;
- shortWait() ;
+ util.utils.pause(200);
checker.commit() ;
- shortWait() ;
+ util.utils.pause(200);
committed = checker.wasCommited() ;
- shortWait() ;
+ util.utils.pause(200);
log.println("Calling with approving : approveUpdate() was " +
(listener.approveCalled ? "":"NOT")+" called, updated() was "+
@@ -202,10 +202,10 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
try {
checker.update() ;
- shortWait() ;
+ util.utils.pause(200);
checker.commit() ;
- shortWait() ;
+ util.utils.pause(200);
bResult = ! listener.approveCalled &&
! listener.updateCalled ;
@@ -219,15 +219,6 @@ public class _XUpdateBroadcaster extends MultiMethodTest {
tRes.tested("removeUpdateListener()", bResult);
}
- private void shortWait() {
- try {
- Thread.sleep(200);
- }
- catch (InterruptedException ex) {
- }
-
- }
-
/**
* Forces environment recreation.
*/
diff --git a/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java b/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java
index c93424d..1943195 100644
--- a/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java
+++ b/qadevOOo/tests/java/ifc/form/submission/_XSubmission.java
@@ -110,11 +110,7 @@ public class _XSubmission extends MultiMethodTest {
log.println("Sleeping 2s");
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // sleeping didn't work
- }
+ util.utils.pause(2000);
log.println("... done");
diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
index 8422b86..fdcb31f 100644
--- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java
@@ -65,11 +65,7 @@ public class _XComponentLoader extends MultiMethodTest {
oDoc = oObj.loadComponentFromURL(
url, frameName, 0, szArgs);
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.shortWait();
oDoc.dispose();
@@ -78,11 +74,7 @@ public class _XComponentLoader extends MultiMethodTest {
oDoc = oObj.loadComponentFromURL(
url, frameName, 0, szArgs);
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.shortWait();
oDoc.dispose();
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatch.java b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
index f686150..59dfe64 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatch.java
@@ -130,10 +130,7 @@ public class _XDispatch extends MultiMethodTest {
notificationListener = new TestNotificationListener(log) ;
xND.dispatchWithNotification(url, arguments, notificationListener);
- try {
- Thread.sleep(200);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(200);
log.println(" Listener called: "+ notificationListener.finishedDispatch);
@@ -174,10 +171,7 @@ public class _XDispatch extends MultiMethodTest {
oObj.dispatch(url, new PropertyValue[0]) ;
- try {
- Thread.sleep(200);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(200);
log.println("Listener called: "+ listener.statusChangedCalled);
@@ -219,10 +213,7 @@ public class _XDispatch extends MultiMethodTest {
oObj.dispatch(url, new PropertyValue[0]) ;
- try {
- Thread.sleep(200);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(200);
System.out.println("Listener called: "+ listener.statusChangedCalled);
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
index 03225e4..f9b9bbe 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
@@ -86,7 +86,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
XDispatch xDisp = xDispProv.queryDispatch(dispURL, "", 0);
xDisp.dispatch(dispURL, dispArgs);
- shortWait();
+ util.utils.shortWait();
log.println("Getting macro ... :");
String macro = oObj.getRecordedMacro();
@@ -195,12 +195,6 @@ public class _XDispatchRecorder extends MultiMethodTest {
}
- private void shortWait() {
- try {
- Thread.sleep(500);
- } catch (InterruptedException ex) {}
- }
-
private void clearBuffer() {
oObj.startRecording(xFrame);
oObj.endRecording();
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
index f92f366..938c298 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
@@ -173,9 +173,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
}
}
- try {
- Thread.sleep(500);
- } catch (InterruptedException ex) {}
+ util.utils.shortWait();
XModel model = UnoRuntime.queryInterface(XModel.class, xTextDoc);
XFrame fr = model.getCurrentController().getFrame();
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java
index 1771e3d..c24c4fa 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrame.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java
@@ -189,9 +189,7 @@ public class _XFrame extends MultiMethodTest {
return;
}
- try {
- Thread.sleep(500);
- }catch (InterruptedException ex) {}
+ util.utils.shortWait();
if (!listenerCalled[0]) {
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index a71491e..0fb7b9a 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -104,7 +104,7 @@ public class _XFrameLoader extends MultiMethodTest {
.createInstance("com.sun.star.frame.Desktop") ;
XDesktop dsk = UnoRuntime.queryInterface(XDesktop.class, oDsk) ;
- shortWait() ;
+ util.utils.shortWait();
frame = dsk.getCurrentFrame() ;
} catch ( com.sun.star.uno.Exception e ) {
// Some exception occurs.FAILED
@@ -146,7 +146,7 @@ public class _XFrameLoader extends MultiMethodTest {
if (!loaded) {
oObj.load(frame, url, args, listener) ;
- shortWait();
+ util.utils.shortWait();
loaded = listener.finished ;
}
@@ -166,7 +166,7 @@ public class _XFrameLoader extends MultiMethodTest {
oObj.load(frame, url, args, listener) ;
oObj.cancel() ;
- shortWait();
+ util.utils.shortWait();
if (listener.cancelled) {
log.println("Loading was canceled.") ;
@@ -188,14 +188,5 @@ public class _XFrameLoader extends MultiMethodTest {
if (frameSup != null) frameSup.dispose() ;
frame.dispose();
}
-
- private void shortWait() {
- try {
- Thread.sleep(5000);
- }
- catch (InterruptedException ex) {
- }
-
- }
}
diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
index a4a9405..eaf3b55 100644
--- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
+++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java
@@ -106,10 +106,7 @@ public class _XNotifyingDispatch extends MultiMethodTest {
oObj.dispatchWithNotification(url, arguments, notificationListener);
- try {
- Thread.sleep(200);
- }
- catch(InterruptedException e) {}
+ util.utils.pause(200);
log.println("Listener called: "+ notificationListener.finishedDispatch);
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index 109dfa5..6b3ed19 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -151,9 +151,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
oObj.cancel() ;
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {}
+ util.utils.pause(1000);
tRes.tested("cancel()", !result[0]) ;
diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
index 52952cf..ffcd3d6 100644
--- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
+++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java
@@ -135,6 +135,7 @@ public class _XActiveDataControl extends MultiMethodTest {
oObj.start();
// waiting a little bit for data transferred
+ util.utils.pause(200);
try {
Thread.sleep(200);
} catch (InterruptedException e) {
diff --git a/qadevOOo/tests/java/ifc/lang/_XComponent.java b/qadevOOo/tests/java/ifc/lang/_XComponent.java
index c05b7c5..b1c8399 100644
--- a/qadevOOo/tests/java/ifc/lang/_XComponent.java
+++ b/qadevOOo/tests/java/ifc/lang/_XComponent.java
@@ -142,9 +142,7 @@ public class _XComponent extends MultiMethodTest {
altDispose.dispose();
}
- try {
- Thread.sleep(500) ;
- } catch (InterruptedException e) {}
+ util.utils.shortWait();
if (Loutput[0]!=null) log.println(Loutput[0]);
if (Loutput[1]!=null) log.println(Loutput[1]);
log.println( "end dispose" + Thread.currentThread());
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index a9a5b85..55da8c1 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -100,7 +100,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest {
rob.mouseRelease(InputEvent.BUTTON3_MASK);
System.out.println("done");
System.out.println("warte");
- shortWait();
+ util.utils.pause(200);
System.out.println("Press Button");
rob.mousePress(InputEvent.BUTTON1_MASK);
System.out.println("Release Button");
@@ -114,14 +114,6 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest {
return true;
}
- private void shortWait() {
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e);
- }
- }
-
protected class MyListener implements XEnhancedMouseClickHandler {
public void disposing(
com.sun.star.lang.EventObject eventObject) {
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
index 053e0df..a8767cc 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -62,7 +62,7 @@ public class _XRangeSelection extends MultiMethodTest {
XWindow xWindow = xModel.getCurrentController().getFrame().getContainerWindow();
XTopWindow xTopWindow = UnoRuntime.queryInterface(XTopWindow.class, xWindow);
xTopWindow.toFront();
- util.utils.shortWait(500);
+ util.utils.pause(500);
}
@@ -114,7 +114,7 @@ public class _XRangeSelection extends MultiMethodTest {
props[2].Value = Boolean.FALSE;
oObj.startRangeSelection(props);
// wait for listeners
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
// get closer button: move if window cobvers the sheet center
Point closer = getCloser(center);
@@ -123,22 +123,22 @@ public class _XRangeSelection extends MultiMethodTest {
// do something to trigger the listeners
clickOnSheet(center);
- util.utils.shortWait(5000);
+ util.utils.pause(5000);
// click on closer
clickOnSheet(closer);
- util.utils.shortWait(5000);
+ util.utils.pause(5000);
// open a new range selection
props[0].Value = "C4:E6";
oObj.startRangeSelection(props);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
props[0].Value = "C2:E3";
oObj.startRangeSelection(props);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
oObj.startRangeSelection(props);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
oObj.abortRangeSelection();
aListener.reset();
System.out.println("Listener called: " + aListener.bAbortCalled);
@@ -295,9 +295,9 @@ public class _XRangeSelection extends MultiMethodTest {
Robot rob = new Robot();
rob.mouseMove(point.X, point.Y);
rob.mousePress(InputEvent.BUTTON1_MASK);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
rob.mouseRelease(InputEvent.BUTTON1_MASK);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
} catch (java.awt.AWTException e) {
log.println("couldn't press mouse button");
}
diff --git a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
index 362ca90..35fc2f1 100644
--- a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
+++ b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
@@ -90,7 +90,7 @@ public class _XSystemShellExecute extends MultiMethodTest {
} catch(com.sun.star.uno.Exception e) {
log.println("Exception:" + e);
}
- shortWait();
+ util.utils.pause(1000);
i++;
}
@@ -103,18 +103,6 @@ public class _XSystemShellExecute extends MultiMethodTest {
tRes.tested("execute()", bExist);
}
-
- /**
- * Sleeps to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
} // finish class _XSystemShellExecute
diff --git a/qadevOOo/tests/java/ifc/task/_XJobExecutor.java b/qadevOOo/tests/java/ifc/task/_XJobExecutor.java
index 0c8ec52..d13cf0e 100644
--- a/qadevOOo/tests/java/ifc/task/_XJobExecutor.java
+++ b/qadevOOo/tests/java/ifc/task/_XJobExecutor.java
@@ -57,9 +57,7 @@ public class _XJobExecutor extends MultiMethodTest {
oObj.trigger("TestEvent");
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {}
+ util.utils.pause(1000);
int after = Integer.parseInt(counter.getName());
diff --git a/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java b/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java
index bef2f39..bb843ee 100644
--- a/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java
+++ b/qadevOOo/tests/java/ifc/text/_XDocumentIndex.java
@@ -96,11 +96,7 @@ public class _XDocumentIndex extends MultiMethodTest {
oObj.update();
- try {
- Thread.sleep(1000);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.pause(1000);
String contentAfter = oObj.getAnchor().getString();
diff --git a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
index 13bd492..003d732 100644
--- a/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java
@@ -103,7 +103,7 @@ public class _XMailMergeBroadcaster extends MultiMethodTest {
("'could not fire event: " + e)) ;
}
- shortWait();
+ util.utils.pause(200);
tRes.tested("addMailMergeEventListener()", changed);
}
@@ -132,23 +132,11 @@ public class _XMailMergeBroadcaster extends MultiMethodTest {
("'could not fire event: " + e)) ;
}
- shortWait();
+ util.utils.pause(200);
tRes.tested("removeMailMergeEventListener()", !changed);
}
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * execute</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(200) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
} // finished class _XMailMergeBroadcaster
diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
index 55bf4fa..452fe6a 100644
--- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
+++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
@@ -132,7 +132,7 @@ public class _XPagePrintable extends MultiMethodTest {
oObj.printPages(PrintOptions);
- util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT));
+ util.utils.shortWait();
if (! util.utils.fileExists(xMSF, printFile)){
log.println("ERROR: could not find '" + printFile + "'");
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
index 751c22e..d270850 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
@@ -200,20 +200,14 @@ public class _XCommandProcessor extends MultiMethodTest {
for (int i = 0; i < 10; i++) {
log.println("try to abort command");
oObj.abort(cmdId);
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- }
+ util.utils.pause(10);
}
}
};
aborter.start();
- try {
- Thread.sleep(15);
- } catch (InterruptedException e) {
- }
+ util.utils.pause(15);
log.println("executing command");
try {
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
index 00c6103..6e1acd5 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
@@ -47,7 +47,7 @@ public class _XSimpleFileAccess2 extends MultiMethodTest {
String filename = dirname+"XSimpleFileAccess.txt";
XInputStream iStream = oObj.openFileRead(filename);
oObj.writeFile(fileURL,iStream);
- shortWait();
+ util.utils.pause(1000);
result = oObj.exists(fileURL);
oObj.kill(fileURL);
tRes.tested("writeFile()",result);
@@ -66,17 +66,5 @@ public class _XSimpleFileAccess2 extends MultiMethodTest {
} //EOF writeFile()
- /**
- * Sleeps for 1 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
} // finish class _XSimpleFileAccess
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index 06c6101..243fdc0 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -68,7 +68,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
log.println("ensure that the first model is focused");
DesktopTools.bringWindowToFront(docModel);
- utils.shortWait(3000);
+ utils.pause(3000);
}
@Override
@@ -182,7 +182,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
log.println("couldn't press mouse button");
}
- utils.shortWait(1000);
+ utils.pause(1000);
}
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
index 6cfcc92..bb10c5a 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java
@@ -73,7 +73,7 @@ public class _XExecutableDialog extends MultiMethodTest {
eThread.start();
XCancellable canc = UnoRuntime.queryInterface
(XCancellable.class, tEnv.getTestObject());
- shortWait();
+ util.utils.pause(2000);
if (canc != null) {
closeDialog();
short res = eThread.execRes;
@@ -115,18 +115,6 @@ public class _XExecutableDialog extends MultiMethodTest {
}
}
- /**
- * Sleeps for 5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
@Override
public void after() {
if (eThread.isAlive()) {
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
index f34dd3e..603e628 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
@@ -134,7 +134,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
e.printStackTrace(log) ;
}
- shortWait();
+ util.utils.pause(2000);
if (!listener.called) {
log.println("Listener wasn't called :-(");
@@ -169,7 +169,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
e.printStackTrace(log) ;
}
- shortWait();
+ util.utils.pause(2000);
closeDialog();
@@ -200,18 +200,6 @@ public class _XFilePickerNotifier extends MultiMethodTest {
}
}
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
private void closeDialog() {
XCancellable canc = UnoRuntime.queryInterface(
XCancellable.class, tEnv.getTestObject());
diff --git a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
index 4eceb4a..221cb7c 100644
--- a/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java
@@ -53,7 +53,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest {
public void _addPrintJobListener() {
oObj.addPrintJobListener(listenerImpl);
listenerImpl.fireEvent();
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
tRes.tested("addPrintJobListener()", listenerImpl.actionTriggered());
}
@@ -64,7 +64,7 @@ public class _XPrintJobBroadcaster extends MultiMethodTest {
requiredMethod("addPrintJobListener");
oObj.removePrintJobListener(listenerImpl);
- util.utils.shortWait(5000);
+ util.utils.pause(5000);
listenerImpl.reset();
listenerImpl.fireEvent();
diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
index 5f2d45f..daac55c 100644
--- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
+++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
@@ -95,7 +95,7 @@ public class AccessibleShape extends TestCase {
throw new StatusException("Couldn't open Basic Dialog",e);
}
- utils.shortWait(3000);
+ utils.pause(3000);
try {
oObj = (XInterface) tParam.getMSF().createInstance
@@ -132,7 +132,7 @@ public class AccessibleShape extends TestCase {
newPosSize.Y = oldPosSize.Y + 20;
basicIDE.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width,
newPosSize.Height, PosSize.POSSIZE);
- utils.shortWait(1000);
+ utils.pause(1000);
basicIDE.setPosSize(oldPosSize.X, oldPosSize.Y, oldPosSize.Width,
oldPosSize.Height, PosSize.POSSIZE);
}
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
index 1b81aa1..bfffdfd 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
@@ -217,7 +217,7 @@ public class ConnectionLineAccessibility extends TestCase
{
try
{
- shortWait();
+ util.utils.pause(1500);
connection = isolConnection.getIsolatedConnection(user,
password);
statement = connection.createStatement();
@@ -318,7 +318,7 @@ public class ConnectionLineAccessibility extends TestCase
QueryComponent = DesktopTools.loadDoc(Param.getMSF(),".component:DB/QueryDesign",loadProps);
- util.utils.shortWait(1000);
+ util.utils.pause(1000);
xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent).
getCurrentController().getFrame().getContainerWindow();
@@ -335,7 +335,7 @@ public class ConnectionLineAccessibility extends TestCase
TestEnvironment tEnv = new TestEnvironment(oObj);
- shortWait();
+ util.utils.pause(1500);
final XWindow queryWin = xWindow;
@@ -376,20 +376,4 @@ public class ConnectionLineAccessibility extends TestCase
e.printStackTrace();
}
}
-
- /**
- * Sleeps for 1.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait()
- {
- try
- {
- Thread.sleep(1500);
- }
- catch (InterruptedException e)
- {
- log.println("While waiting :" + e);
- }
- }
}
diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
index 46a5551..4d94423 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
@@ -204,7 +204,7 @@ public class JoinViewAccessibility extends TestCase {
{
try
{
- shortWait ();
+ util.utils.pause(1500);
connection = isolConnection.getIsolatedConnection (user,
password);
statement = connection.createStatement ();
@@ -306,7 +306,7 @@ public class JoinViewAccessibility extends TestCase {
TestEnvironment tEnv = new TestEnvironment(oObj);
- shortWait();
+ util.utils.pause(1500);
final XWindow queryWin = xWindow;
@@ -343,16 +343,4 @@ public class JoinViewAccessibility extends TestCase {
e.printStackTrace ();
}
}
-
- /**
- * Sleeps for 1.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1500);
- } catch (InterruptedException e) {
- log.println("While waiting :" + e);
- }
- }
}
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
index 1289950..3fb3287 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
@@ -204,7 +204,7 @@ public class ODatasourceBrowser extends TestCase {
throw new StatusException("Couldn't create document", e);
}
- shortWait();
+ util.utils.pause(5000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -263,7 +263,7 @@ public class ODatasourceBrowser extends TestCase {
throw new StatusException("Couldn't initialize document", e);
}
- shortWait();
+ util.utils.pause(5000);
XControlShape aShape = FormTools.createControlShape(xTextDoc, 3000,
4500, 15000, 10000,
@@ -309,16 +309,4 @@ public class ODatasourceBrowser extends TestCase {
return tEnv;
} // finish method getTestEnvironment
-
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e);
- }
- }
} // finish class oDatasourceBrowser
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
index d3cfde8..255b7f9 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
@@ -136,7 +136,7 @@ public class OQueryDesign extends TestCase {
Args[1] = param2;
getting.dispatch(the_url,Args);
- shortWait();
+ util.utils.pause(5000);
Object oDBC = null;
@@ -289,17 +289,5 @@ public class OQueryDesign extends TestCase {
}
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(5000) ;
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e) ;
- }
- }
-
} // finish class oDatasourceBrowser
diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
index aaa4303..b7c5513 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
@@ -190,7 +190,7 @@ public class TableWindowAccessibility extends TestCase {
col_name2 + " int)");
} catch (com.sun.star.sdbc.SQLException e) {
try {
- shortWait();
+ util.utils.pause(1500);
connection = isolConnection.getIsolatedConnection(user,
password);
statement = connection.createStatement();
@@ -281,7 +281,7 @@ public class TableWindowAccessibility extends TestCase {
TestEnvironment tEnv = new TestEnvironment(oObj);
- shortWait();
+ util.utils.pause(1500);
XAccessibleComponent accComp = UnoRuntime.queryInterface(
XAccessibleComponent.class,
@@ -330,17 +330,4 @@ public class TableWindowAccessibility extends TestCase {
e.printStackTrace ();
}
}
-
-
- /**
- * Sleeps for 1.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(1500);
- } catch (InterruptedException e) {
- log.println("While waiting :" + e);
- }
- }
}
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index 67703e5..f2748b3 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -231,20 +231,8 @@ public class OTimeControl extends TestCase {
tEnv.addObjRelation("TestTextListener", listener);
FormTools.switchDesignOf((Param.getMSF()), xTextDoc);
- shortWait();
+ util.utils.pause(200);
return tEnv;
} // finish method getTestEnvironment
-
- /**
- * Sleeps for 0.2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(200);
- } catch (InterruptedException e) {
- System.out.println("While waiting :" + e);
- }
- }
} // finish class OTimeControl
diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
index 0149eff..d155c4c 100644
--- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
+++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
@@ -76,11 +76,7 @@ public class DispatchRecorder extends TestCase {
try {
SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
oDoc = SOF.createTextDoc(null);
- try {
- Thread.sleep(1000);
- }
- catch (InterruptedException ex) {
- }
+ util.utils.pause(1000);
XModel model = UnoRuntime.queryInterface(XModel.class, oDoc);
xFrame = model.getCurrentController().getFrame();
diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
index 8816fe1..7d518d9 100644
--- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
+++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java
@@ -180,9 +180,7 @@ public class JobExecutor extends TestCase {
XChangesBatch xCB = UnoRuntime.queryInterface(XChangesBatch.class, oRootCfg);
xCB.commitChanges();
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {}
+ util.utils.pause(1000);
} catch (com.sun.star.uno.Exception e) {
e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index 378a89d..c62bf1e 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
@@ -214,10 +214,7 @@ public class various extends TestCase {
accThread = new AcceptorThread(xAcctr, xInstProv, xBrdgFctr);
accThread.start();
// let the thread sleep
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
+ util.utils.pause(500);
// establish the connection
XConnection xConnection = xCntr.connect(connectString);
@@ -279,11 +276,7 @@ public class various extends TestCase {
bridgeDisposed[0] = true;
xComp.dispose();
// wait for dispose
- try {
- Thread.sleep(5000);
- }
- catch(InterruptedException e) {
- }
+ util.utils.pause(5000);
}
}
}
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 0cd56a5..be245fe 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -203,10 +203,7 @@ public class various extends TestCase {
accThread = new AcceptorThread(xAcctr);
accThread.start();
// let the thread sleep
- try {
- Thread.sleep(500);
- }
- catch (InterruptedException e) {}
+ util.utils.pause(500);
// establish the connection
XConnection xConnection = xCntr.connect(connectString);
@@ -268,11 +265,7 @@ public class various extends TestCase {
bridgeDisposed[0] = true;
xComp.dispose();
// wait for dispose
- try {
- Thread.sleep(5000);
- }
- catch(InterruptedException e) {
- }
+ util.utils.pause(5000);
}
}
}
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
index 01a80ea..111b20c 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java
@@ -68,12 +68,12 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, toolkit);
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
DiagThread psDiag = new DiagThread(xCalcDoc, msf);
psDiag.start();
- util.utils.shortWait(Param.getInt("ShortWait")*5);
+ util.utils.pause(Param.getInt("ShortWait")*5);
Object atw = tk.getActiveTopWindow();
@@ -82,7 +82,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase {
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
XAccessibleContext ok_button = AccessibilityTools.getAccessibleObjectForRole(xRoot,
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index a7e8de2..02608fc 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -59,7 +59,7 @@ public class ScAccessibleCsvCell extends TestCase {
protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
XInterface oObj = null;
- shortWait();
+ util.utils.pause(2000);
try {
oObj = (XInterface) tParam.getMSF().createInstance
@@ -152,19 +152,7 @@ public class ScAccessibleCsvCell extends TestCase {
lThread = new loadThread(SOF, args);
lThread.start();
- shortWait();
- }
-
- /**
- * Sleeps for 2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
+ util.utils.pause(2000);
}
private class loadThread extends Thread {
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index bc440dc..8fa3f4c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -59,7 +59,7 @@ public class ScAccessibleCsvGrid extends TestCase {
XInterface oObj = null;
- shortWait();
+ util.utils.pause(2000);
try {
oObj = (XInterface) Param.getMSF().createInstance
@@ -137,22 +137,10 @@ public class ScAccessibleCsvGrid extends TestCase {
lThread = new loadThread(SOF, args);
lThread.start();
- shortWait();
+ util.utils.pause(2000);
}
- /**
- * Sleeps for 2 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- private void shortWait() {
- try {
- Thread.sleep(2000) ;
- } catch (InterruptedException e) {
- log.println("While waiting :" + e) ;
- }
- }
-
private class loadThread extends Thread {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list