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, 2 insertions, 4 deletions

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 6cc00d199f24..6a6d15bf4e7f 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -196,16 +196,14 @@ public final class OfficeConnection {
         return description;
     }
 
-    private static Integer waitForProcess(Process process, final long millis)
+    private static Integer waitForProcess(Process process, final int millis)
         throws InterruptedException
     {
         final Thread t1 = Thread.currentThread();
         Thread t2 = new Thread("waitForProcess") {
                 @Override
                 public void run() {
-                    try {
-                        Thread.sleep(millis);
-                    } catch (InterruptedException e) {}
+                    util.utils.pause(millis);
                     t1.interrupt();
                 }
             };