summaryrefslogtreecommitdiff
path: root/qadevOOo/tests/java/mod/_toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-22 10:02:49 +0200
committerNoel Grandin <noel@peralex.com>2015-01-12 08:36:17 +0200
commit09330056a01a4b5c3d16e3ffb6c1bff36099eb83 (patch)
treeefa793bee83eed4081edd52737e73216a3048b89 /qadevOOo/tests/java/mod/_toolkit
parent4bf4e3d40778051f1f886c47dd2b2bef82acf1e5 (diff)
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
Diffstat (limited to 'qadevOOo/tests/java/mod/_toolkit')
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java6
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java8
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java4
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java14
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java14
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java14
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleList.java18
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java18
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java18
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java19
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java14
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java16
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java16
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java8
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java6
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java18
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java24
17 files changed, 42 insertions, 193 deletions
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
index da8ddffd0747..1b8f2461eb23 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java
@@ -100,14 +100,14 @@ public class AccessibleButton extends lib.TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
DiagThread psDiag = new DiagThread(xTextDoc, msf);
psDiag.start();
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
Object atw = tk.getActiveTopWindow();
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
index 06d85ac874c0..6def9bb8fe93 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java
@@ -103,7 +103,7 @@ public class AccessibleCheckBox extends TestCase {
}
}
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
XInterface oObj = null;
@@ -120,16 +120,16 @@ public class AccessibleCheckBox extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
log.println("Opening Dialog in second thread");
psDiag = new DiagThread(xTextDoc, msf);
psDiag.start();
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
log.println("Getting the active TopWindow");
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
index d7bb63033fbb..d48bd0b4763c 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java
@@ -98,7 +98,7 @@ public class AccessibleComboBox extends TestCase {
Param.getMSF());
psDiag.start();
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
Object atw = tk.getActiveTopWindow();
@@ -124,7 +124,7 @@ public class AccessibleComboBox extends TestCase {
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
e.printStackTrace(log);
}
- util.utils.shortWait(Param.getInt("ShortWait"));
+ util.utils.pause(Param.getInt("ShortWait"));
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 46e1aa1a2063..284f7a554494 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;
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = AccessibilityTools.getCurrentWindow(
xTextDoc);
@@ -128,16 +128,4 @@ public class AccessibleDropDownListBox extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
util.DesktopTools.closeDoc(xTextDoc);
}
-
- /**
- * 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);
- }
- }
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
index 6df7063268bc..270a5ff512d1 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
@@ -135,7 +135,7 @@ public class AccessibleEdit extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -208,16 +208,4 @@ public class AccessibleEdit extends TestCase {
throw new StatusException("Can't create document", e);
}
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
index 22eab84d3949..873d643a96c2 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java
@@ -137,7 +137,7 @@ public class AccessibleFixedText extends TestCase {
throw new StatusException("Couldn't get toolkit", e);
}
- shortWait();
+ util.utils.pause(500);
XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWinDlg);
@@ -181,16 +181,4 @@ public class AccessibleFixedText extends TestCase {
log.println(" Closing dialog ... ");
xWinDlg.dispose();
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
index 82a4b8d09ee6..12992f9209a8 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java
@@ -78,7 +78,7 @@ public class AccessibleList extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(1000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -113,7 +113,7 @@ public class AccessibleList extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(1000);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -136,7 +136,7 @@ public class AccessibleList extends TestCase {
XAccessibleSelection.class,
oObj);
xAccSel.selectAccessibleChild(3);
- shortWait();
+ util.utils.pause(1000);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
throw new StatusException("Can't switch to required tab", e);
}
@@ -213,16 +213,4 @@ public class AccessibleList extends TestCase {
throw new StatusException("Can't create document", e);
}
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
index 8a855caa0ed9..7eaf80d757e8 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
@@ -101,7 +101,7 @@ public class AccessibleListBox extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(1000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -136,7 +136,7 @@ public class AccessibleListBox extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(1000);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -160,7 +160,7 @@ public class AccessibleListBox extends TestCase {
XAccessibleSelection.class,
oObj);
xAccSel.selectAccessibleChild(3);
- shortWait();
+ util.utils.pause(1000);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
throw new StatusException("Can't switch to required tab", e);
}
@@ -225,16 +225,4 @@ public class AccessibleListBox extends TestCase {
throw new StatusException("Can't create document", e);
}
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
index 95962691b467..1443a4a68aed 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java
@@ -99,7 +99,7 @@ public class AccessibleListItem extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(1000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -134,7 +134,7 @@ public class AccessibleListItem extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(1000);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -157,7 +157,7 @@ public class AccessibleListItem extends TestCase {
XAccessibleSelection.class,
oObj);
xAccSel.selectAccessibleChild(3);
- shortWait();
+ util.utils.pause(1000);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
throw new StatusException("Can't switch to required tab", e);
}
@@ -217,16 +217,4 @@ public class AccessibleListItem extends TestCase {
throw new StatusException("Can't create document", e);
}
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
index 844f96ce76d0..5c83d76d4f0b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java
@@ -92,7 +92,7 @@ public class AccessibleMenu extends TestCase {
throw new StatusException("Can't create document", e);
}
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
getCurrentController().getFrame().getContainerWindow();
@@ -126,10 +126,7 @@ public class AccessibleMenu extends TestCase {
try {
act2.doAccessibleAction(0);
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- }
+ util.utils.pause(500);
act1.doAccessibleAction(0);
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
@@ -170,16 +167,4 @@ public class AccessibleMenu extends TestCase {
@Override
protected void initialize(TestParameters Param, PrintWriter log) {
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
index f0330df7feea..5b91847a95cf 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) {
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
getCurrentController().getFrame().getContainerWindow();
@@ -128,16 +128,4 @@ public class AccessibleMenuBar extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
util.DesktopTools.closeDoc(xTextDoc);
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
index 4b5a9514c5c7..6b1da6f840cf 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java
@@ -95,7 +95,7 @@ public class AccessibleMenuItem extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(500);
Object atw = tk.getActiveTopWindow();
@@ -114,7 +114,7 @@ public class AccessibleMenuItem extends TestCase {
XAccessibleAction act = UnoRuntime.queryInterface(
XAccessibleAction.class, Menu);
act.doAccessibleAction(0);
- shortWait();
+ util.utils.pause(500);
//get a menue-item
@@ -177,16 +177,4 @@ public class AccessibleMenuItem extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
util.DesktopTools.closeDoc(xTextDoc);
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java
index 0e3d97d05acb..f78335981175 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) {
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc).
getCurrentController().getFrame().getContainerWindow();
@@ -93,7 +93,7 @@ public class AccessibleMenuSeparator extends TestCase {
XAccessibleAction.class, Menu);
act.doAccessibleAction(0);
- shortWait();
+ util.utils.pause(500);
//get a menue-separator
@@ -144,16 +144,4 @@ public class AccessibleMenuSeparator extends TestCase {
protected void cleanup(TestParameters Param, PrintWriter log) {
util.DesktopTools.closeDoc(xTextDoc);
}
-
- /**
- * 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);
- }
- }
} \ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
index 335c8994d977..81da3dd50253 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
@@ -135,7 +135,7 @@ public class AccessiblePopupMenu extends TestCase {
throw new StatusException("Couldn't create document", e);
}
- shortWait(tParam);
+ util.utils.shortWait();
XModel aModel = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -166,7 +166,7 @@ public class AccessiblePopupMenu extends TestCase {
log.println("couldn't press mouse button");
}
- shortWait(tParam);
+ util.utils.shortWait();
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, toolkit);
@@ -212,8 +212,4 @@ public class AccessiblePopupMenu extends TestCase {
protected void closeDoc() {
util.DesktopTools.closeDoc(xTextDoc);
}
-
- private void shortWait(TestParameters tParam) {
- util.utils.shortWait(tParam.getInt(util.PropertyName.SHORT_WAIT));
- }
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
index 748a64a0496e..c00e6d340610 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
@@ -168,7 +168,7 @@ public class AccessibleRadioButton extends TestCase {
throw new StatusException("Couldn't create document", e);
}
- util.utils.shortWait(2000);
+ util.utils.pause(2000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -203,7 +203,7 @@ public class AccessibleRadioButton extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- util.utils.shortWait(2000);
+ util.utils.pause(2000);
XInterface oObj = null;
@@ -219,7 +219,7 @@ public class AccessibleRadioButton extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- util.utils.shortWait(2000);
+ util.utils.pause(2000);
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 e89dba8f95a7..053bbebeb3fc 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
@@ -160,7 +160,7 @@ public class AccessibleTabControl extends TestCase {
throw new StatusException("Couldn't create document", e);
}
- shortWait();
+ util.utils.pause(500);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -195,7 +195,7 @@ public class AccessibleTabControl extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(500);
XInterface oObj = null;
@@ -211,7 +211,7 @@ public class AccessibleTabControl extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(500);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -255,16 +255,4 @@ public class AccessibleTabControl extends TestCase {
return tEnv;
}
-
- /**
- * 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) {
- System.out.println("While waiting :" + e);
- }
- }
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
index ae18f9174a8e..abdc09b9dd2a 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
@@ -97,7 +97,7 @@ public class AccessibleTabPage extends TestCase {
if (accCloseButton != null) {
log.println("closing InsertFields Dialog");
accCloseButton.doAccessibleAction(0);
- shortWait();
+ util.utils.pause(1000);
}
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
e.printStackTrace(log);
@@ -140,7 +140,7 @@ public class AccessibleTabPage extends TestCase {
if (accCloseButton != null) {
log.println("closing InsertFields Dialog");
accCloseButton.doAccessibleAction(0);
- shortWait();
+ util.utils.pause(1000);
}
} catch (com.sun.star.lang.IndexOutOfBoundsException e) {
e.printStackTrace(log);
@@ -167,7 +167,7 @@ public class AccessibleTabPage extends TestCase {
throw new StatusException("Couldn't create document", e);
}
- shortWait();
+ util.utils.pause(1000);
XModel aModel1 = UnoRuntime.queryInterface(XModel.class,
xTextDoc);
@@ -202,7 +202,7 @@ public class AccessibleTabPage extends TestCase {
PropertyValue[] noArgs = new PropertyValue[0];
getting.dispatch(url[0], noArgs);
- shortWait();
+ util.utils.pause(1000);
XInterface oObj = null;
@@ -218,7 +218,7 @@ public class AccessibleTabPage extends TestCase {
XExtendedToolkit tk = UnoRuntime.queryInterface(
XExtendedToolkit.class, oObj);
- shortWait();
+ util.utils.pause(1000);
XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,
tk.getActiveTopWindow());
@@ -246,7 +246,7 @@ public class AccessibleTabPage extends TestCase {
oObj);
accComp.getLocationOnScreen();
- shortWait();
+ util.utils.pause(1000);
XInterface xEventInt = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Variables");
final XAccessibleComponent eventAccComp = UnoRuntime.queryInterface(
@@ -263,18 +263,6 @@ public class AccessibleTabPage extends TestCase {
return tEnv;
}
- /**
- * 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) {
- System.out.println("While waiting :" + e);
- }
- }
-
protected void closeDoc() {
util.DesktopTools.closeDoc(xTextDoc);
}