changeset 6189:cce0b52bada2

RT-34965 Regression test for touch drag/move on egalax Test fixes
author Daniel Blaukopf <daniel.blaukopf@oracle.com>
date Sun, 26 Jan 2014 17:05:08 +0200
parents b98abd51d94d
children c27f9a0dcdaf
files tests/system/src/test/java/com/sun/glass/ui/monocle/input/SimpleTouchTest.java
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/SimpleTouchTest.java	Sun Jan 26 16:55:21 2014 +0200
+++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/input/SimpleTouchTest.java	Sun Jan 26 17:05:08 2014 +0200
@@ -182,7 +182,6 @@
      * Touch down, drag, touch up, coordinates sent before tap
      */
     @Test
-    @Ignore("RT-34296")
     public void tapAndDrag4() throws Exception {
         Rectangle2D r = Screen.getPrimary().getBounds();
         final int width = (int) r.getWidth();
@@ -194,21 +193,23 @@
         // send coordinates
         absPosition(x2, y2);
         ui.processLine("EV_SYN SYN_REPORT 0");
+        TestLog.waitForLog("Mouse pressed: %d, %d", x2, y2);
         // tap
         absPosition(x1, y1);
         ui.processLine("EV_KEY BTN_TOUCH 1");
         ui.processLine("EV_SYN SYN_REPORT 0");
+        TestLog.waitForLog("Mouse dragged: %d, %d", x1, y1);
         // drag
         absPosition(x2, y2);
         ui.processLine("EV_SYN SYN_REPORT 0");
+        TestLog.waitForLog("Mouse dragged: %d, %d", x2, y2);
         // release
         ui.processLine("EV_KEY BTN_TOUCH 0 ");
         ui.processLine("EV_SYN SYN_REPORT 0");
-        TestLog.waitForLog("Mouse pressed: %d, %d", x1, y1);
-        TestLog.waitForLog("Mouse dragged: %d, %d", x2, y2);
         TestLog.waitForLog("Mouse released: %d, %d", x2, y2);
         TestLog.waitForLog("Mouse clicked: %d, %d", x2, y2);
-        TestLog.waitForLog("Touch pressed: %d, %d", x1, y1);
+        TestLog.waitForLog("Touch pressed: %d, %d", x2, y2);
+        TestLog.waitForLog("Touch moved: %d, %d", x1, y1);
         TestLog.waitForLog("Touch moved: %d, %d", x2, y2);
         TestLog.waitForLog("Touch released: %d, %d", x2, y2);
     }