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

1 files changed, 5 insertions, 13 deletions

diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
index 8a6d21e72a14..406c04bc0fed 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java
@@ -157,9 +157,9 @@ public class DrawController_OutlineView extends TestCase {
         try {
             log.println( "creating two impress documents" );
             xSecondDrawDoc = SOF.createImpressDoc(null);
-            shortWait();
+            util.utils.pause(1000);
             xDrawDoc = SOF.createImpressDoc(null);
-            shortWait();
+            util.utils.pause(1000);
         } catch (com.sun.star.uno.Exception e) {
             e.printStackTrace( log );
             throw new StatusException("Couldn't create document", e);
@@ -198,7 +198,7 @@ public class DrawController_OutlineView extends TestCase {
         oShapes.add(shape1);
         oShapes.add(shape2);
         oShapes.add(shape3);
-        shortWait();
+        util.utils.pause(1000);
 
         log.println("switch to HandoutView...");
         try{
@@ -208,7 +208,7 @@ public class DrawController_OutlineView extends TestCase {
             throw new StatusException(e, Status.failed(e.getMessage()));
         }
 
-        utils.shortWait(500);
+        utils.pause(500);
 
         XModel aModel = UnoRuntime.queryInterface(XModel.class, xDrawDoc);
 
@@ -245,7 +245,7 @@ public class DrawController_OutlineView extends TestCase {
         xShapes1.add(shape2);
         xShapes1.add(shape3);
         xShapes2.add(shape1);
-        shortWait();
+        util.utils.pause(1000);
 
         tEnv.addObjRelation("Selections", new Object[] {
             oDrawPage, oShapeCol1, oShapeCol2});
@@ -298,14 +298,6 @@ public class DrawController_OutlineView extends TestCase {
 
     } // finish method getTestEnvironment
 
-    private void shortWait() {
-        try {
-            Thread.sleep(1000) ;
-        } catch (InterruptedException e) {
-            System.out.println("While waiting :" + e) ;
-        }
-    }
-
 
 }