speed up Java unit tests by removing sleeps

and replacing them with a call to XToolkitExperimental::
processEventsToIdle

Change-Id: I9fd6cb8af43d902587186310aebe78b5a5ee6932
Reviewed-on: https://gerrit.libreoffice.org/16201
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

18 files changed, 38 insertions, 45 deletions

diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index 924595a2ad2b..37e0e2762b49 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -93,7 +93,7 @@ public class AccessibleButton extends lib.TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(Param.getInt("ShortWait"));
+        util.utils.waitForEventIdle(Param.getMSF());
 
         DiagThread psDiag = new DiagThread(xTextDoc, msf);
         psDiag.start();
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index b955e3db0303..6b52387b0a7f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -97,7 +97,7 @@ public class AccessibleCheckBox extends TestCase {
             xTextDoc = SOF.createTextDoc(null);
         }
 
-        util.utils.pause(Param.getInt("ShortWait"));
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XInterface oObj = null;
 
@@ -108,7 +108,7 @@ public class AccessibleCheckBox extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(Param.getInt("ShortWait"));
+        util.utils.waitForEventIdle(Param.getMSF());
 
         log.println("Opening Dialog in second thread");
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index 855fff011783..09452072b1b5 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -117,7 +117,7 @@ public class AccessibleComboBox extends TestCase {
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             e.printStackTrace(log);
         }
-        util.utils.pause(Param.getInt("ShortWait"));
+        util.utils.waitForEventIdle(Param.getMSF());
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "",
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
index 284f7a554494..3daf7f9f2151 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
@@ -73,7 +73,7 @@ public class AccessibleDropDownListBox extends TestCase {
                                                     PrintWriter log) {
         XInterface oObj = null;
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow(
                                   xTextDoc);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
index 1372f1dc6e25..935df4482fa7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
@@ -123,7 +123,7 @@ public class AccessibleEdit extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
index 5ca277cf63aa..fc2aca6a36df 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
@@ -129,7 +129,7 @@ public class AccessibleFixedText extends TestCase {
         oObj = (XInterface) Param.getMSF().createInstance(
                        "com.sun.star.awt.Toolkit");
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWinDlg);
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
index c390dd00255d..2d800168fb31 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
@@ -69,7 +69,7 @@ public class AccessibleList extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -99,8 +99,6 @@ public class AccessibleList extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(1000);
-
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
 
@@ -121,7 +119,7 @@ public class AccessibleList extends TestCase {
                                                XAccessibleSelection.class,
                                                oObj);
         xAccSel.selectAccessibleChild(3);
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         log.println("# Getting the ListBox");
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
index 3316a7968275..b829eee9ee62 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
@@ -92,7 +92,7 @@ public class AccessibleListBox extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -122,7 +122,7 @@ public class AccessibleListBox extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
@@ -145,7 +145,7 @@ public class AccessibleListBox extends TestCase {
                                                XAccessibleSelection.class,
                                                oObj);
         xAccSel.selectAccessibleChild(3);
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "",
                                              "com.sun.star.comp.toolkit.AccessibleListBox");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
index 63e1cab1e66b..b14b56468404 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
@@ -90,7 +90,7 @@ public class AccessibleListItem extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -120,7 +120,7 @@ public class AccessibleListItem extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
@@ -142,7 +142,7 @@ public class AccessibleListItem extends TestCase {
                                                XAccessibleSelection.class,
                                                oObj);
         xAccSel.selectAccessibleChild(3);
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LIST_ITEM,"Spr");
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
index e5ff3fb8e69b..e452adf0e732 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
@@ -79,14 +79,14 @@ public class AccessibleMenu extends TestCase {
      * walking through the accessible component tree of a document.
      */
     @Override
-    protected TestEnvironment createTestEnvironment(TestParameters Param,
+    protected TestEnvironment createTestEnvironment(final TestParameters Param,
                                                     PrintWriter log) throws Exception {
         XMultiServiceFactory msf = Param.getMSF();
 
         SOfficeFactory SOF = SOfficeFactory.getFactory(msf);
         xTextDoc = SOF.createTextDoc(null);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
             getCurrentController().getFrame().getContainerWindow();
@@ -120,7 +120,7 @@ public class AccessibleMenu extends TestCase {
                 try {
                     act2.doAccessibleAction(0);
 
-                    util.utils.pause(500);
+                    util.utils.waitForEventIdle(Param.getMSF());
 
                     act1.doAccessibleAction(0);
                 } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
index 5b91847a95cf..ab730c631d55 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
@@ -71,7 +71,7 @@ public class AccessibleMenuBar extends TestCase {
     @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
             getCurrentController().getFrame().getContainerWindow();
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
index ef64304715d6..9f36d0f90a97 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
@@ -86,7 +86,7 @@ public class AccessibleMenuItem extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         Object atw = tk.getActiveTopWindow();
 
@@ -105,10 +105,9 @@ public class AccessibleMenuItem extends TestCase {
             XAccessibleAction act = UnoRuntime.queryInterface(
                                             XAccessibleAction.class, Menu);
             act.doAccessibleAction(0);
-            util.utils.pause(500);
+            util.utils.waitForEventIdle(Param.getMSF());
 
-
-            //get a menue-item
+            //get a menu-item
             oObj = Menu.getAccessibleContext().getAccessibleChild(11);
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
         }
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
index f78335981175..3000e38dbe6d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
@@ -73,7 +73,7 @@ public class AccessibleMenuSeparator extends TestCase {
     @Override
     protected TestEnvironment createTestEnvironment(TestParameters Param,
                                                     PrintWriter log) {
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(Param.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
             getCurrentController().getFrame().getContainerWindow();
@@ -93,10 +93,9 @@ public class AccessibleMenuSeparator extends TestCase {
                           XAccessibleAction.class, Menu);
             act.doAccessibleAction(0);
 
-            util.utils.pause(500);
+            util.utils.waitForEventIdle(Param.getMSF());
 
-
-            //get a menue-separator
+            //get a menu-separator
             oObj = Menu.getAccessibleContext().getAccessibleChild(3);
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
index b6a7f71d98c7..ed7d506c23bb 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
@@ -123,8 +123,6 @@ public class AccessiblePopupMenu extends TestCase {
         toolkit = (XInterface) tParam.getMSF().createInstance(
                 "com.sun.star.awt.Toolkit");
 
-        util.utils.shortWait();
-
         XModel aModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
 
         XInterface oObj = null;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
index f74d3eb1c3e1..56ba232676a0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
@@ -160,7 +160,7 @@ public class AccessibleRadioButton extends TestCase {
         log.println("creating a text document");
         xTextDoc = SOF.createTextDoc(null);
 
-        util.utils.pause(2000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -190,7 +190,7 @@ public class AccessibleRadioButton extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(2000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XInterface oObj = (XInterface) tParam.getMSF().createInstance(
                        "com.sun.star.awt.Toolkit");
@@ -198,7 +198,7 @@ public class AccessibleRadioButton extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(2000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
index ca68609f2561..a96933bd3134 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
@@ -152,7 +152,7 @@ public class AccessibleTabControl extends TestCase {
         log.println("creating a text document");
         xTextDoc = SOF.createTextDoc(null);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -182,7 +182,7 @@ public class AccessibleTabControl extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XInterface oObj = (XInterface) tParam.getMSF().createInstance(
                        "com.sun.star.awt.Toolkit");
@@ -190,7 +190,7 @@ public class AccessibleTabControl extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(500);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
index c7ebc5e0ffb5..1069383ccdd8 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
@@ -94,7 +94,7 @@ public class AccessibleTabPage extends TestCase {
             if (accCloseButton != null) {
                 log.println("closing InsertFields Dialog");
                 accCloseButton.doAccessibleAction(0);
-                util.utils.pause(1000);
+                util.utils.waitForEventIdle(Param.getMSF());
             }
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             e.printStackTrace(log);
@@ -137,7 +137,7 @@ public class AccessibleTabPage extends TestCase {
             if (accCloseButton != null) {
                 log.println("closing InsertFields Dialog");
                 accCloseButton.doAccessibleAction(0);
-                util.utils.pause(1000);
+                util.utils.waitForEventIdle(tParam.getMSF());
             }
         } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
             e.printStackTrace(log);
@@ -158,7 +158,7 @@ public class AccessibleTabPage extends TestCase {
         log.println("creating a text document");
         xTextDoc = SOF.createTextDoc(null);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
                                                             xTextDoc);
@@ -188,7 +188,7 @@ public class AccessibleTabPage extends TestCase {
         PropertyValue[] noArgs = new PropertyValue[0];
         getting.dispatch(url[0], noArgs);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XInterface oObj = null;
 
@@ -198,7 +198,7 @@ public class AccessibleTabPage extends TestCase {
         XExtendedToolkit tk = UnoRuntime.queryInterface(
                                       XExtendedToolkit.class, oObj);
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
                                                               tk.getActiveTopWindow());
@@ -226,7 +226,7 @@ public class AccessibleTabPage extends TestCase {
                                                oObj);
         accComp.getLocationOnScreen();
 
-        util.utils.pause(1000);
+        util.utils.waitForEventIdle(tParam.getMSF());
 
         XInterface xEventInt = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Variables");
         final XAccessibleComponent eventAccComp = UnoRuntime.queryInterface(
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
index 128d9998ee73..1dd4c9be253e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
@@ -49,7 +49,6 @@ import util.utils;
 public class UnoControlContainer extends TestCase {
     private static XTextDocument xTextDoc;
     private static XTextDocument xTD2;
-    private static XControl xCtrl;
     private static XControl xCtrl1;
     private static XControl xCtrl2;
 
@@ -104,7 +103,7 @@ public class UnoControlContainer extends TestCase {
         access = UnoRuntime.queryInterface(
                          XControlAccess.class, xTextDoc.getCurrentController());
 
-        xCtrl = access.getControl(model);
+        access.getControl(model);
 
 
         // create second XControl