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

2 files changed, 2 insertions, 8 deletions

diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
index 0149effc9bde..d155c4c66525 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 8816fe136ea6..7d518d924cbc 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);