summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-22 10:27:15 +0200
committerNoel Grandin <noel@peralex.com>2015-01-13 08:42:55 +0200
commitc55f945e4b092a7c972e6f64260ba98784c85a77 (patch)
tree2e83e6b8ebbe532e9217df8bfa80aa5e4634f168 /qadevOOo
parentb82cc80e8405086856a795a17e655cdcf85020fc (diff)
java: move DEFAULT_SHORT_WAIT_MS to util.utils
so I can turn PopertyNames into an enum Change-Id: I939a83c0962813302a3653e75976147b2300cb18
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/runner/util/PropertyName.java4
-rw-r--r--qadevOOo/runner/util/utils.java7
-rw-r--r--qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java6
3 files changed, 9 insertions, 8 deletions
diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java
index 27e29b12f651..51d52a873750 100644
--- a/qadevOOo/runner/util/PropertyName.java
+++ b/qadevOOo/runner/util/PropertyName.java
@@ -63,10 +63,6 @@ public interface PropertyName {
*/
String OUT_PRODUCER = "OutProducer";
/**
- * Default short wait time for the Office
- */
- int DEFAULT_SHORT_WAIT_MS = 500;
- /**
* internal only, no parameter
* The OfficeProvider contains the full qualified
* class that provides a connection to StarOffice<br>
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 4557cb5484e5..4a77e41e2331 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -648,7 +648,7 @@ public class utils {
* This is the default call, which waits for 500ms.
*/
public static void shortWait() {
- pause(PropertyName.DEFAULT_SHORT_WAIT_MS);
+ pause(utils.DEFAULT_SHORT_WAIT_MS);
}
/** Causes the thread to sleep some time.
@@ -857,4 +857,9 @@ public class utils {
dfmt.format(cal.get(Calendar.MILLISECOND));
return "[" + dateTime + "]";
}
+
+ /**
+ * Default short wait time for the Office
+ */
+ public static final int DEFAULT_SHORT_WAIT_MS = 500;
}
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 56dbf5369470..43bffcf83360 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -39,7 +39,7 @@ import java.awt.event.InputEvent;
import lib.MultiMethodTest;
import util.AccessibilityTools;
-import util.PropertyName;
+import util.utils;
/**
* Testing <code>com.sun.star.awt.XUserInputInterception</code>
@@ -151,7 +151,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
+ util.utils.pause(utils.DEFAULT_SHORT_WAIT_MS * 2);
log.println("key listener thread should be finished.");
@@ -214,7 +214,7 @@ public class _XUserInputInterception extends MultiMethodTest {
et.run();
- util.utils.pause(PropertyName.DEFAULT_SHORT_WAIT_MS * 2);
+ util.utils.pause(utils.DEFAULT_SHORT_WAIT_MS * 2);
log.println("mouse listener thread should be finished.");
boolean bOK = m_mousePressed1 & m_mouseReleased1 &