changeset 7370:546a65de05f2

RT-37590:[Tests] Work around Eclipse compiler difference
author Elina Kleyman <elina.kleyman@oracle.com>
date Sun, 22 Jun 2014 19:33:50 +0300
parents 9b91b21cd638
children c771f928a886
files tests/system/src/test/java/com/sun/glass/ui/monocle/input/RotateTest.java tests/system/src/test/java/com/sun/glass/ui/monocle/input/ScrollTestBase.java tests/system/src/test/java/com/sun/glass/ui/monocle/input/TestLog.java tests/system/src/test/java/com/sun/glass/ui/monocle/input/ZoomTest.java
diffstat 4 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/RotateTest.java	Sun Jun 22 12:57:01 2014 +0300
+++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/input/RotateTest.java	Sun Jun 22 19:33:50 2014 +0300
@@ -199,7 +199,7 @@
                     + ", inertia value: false"));
         }
         if (TestLog.countLogContaining("Rotation finished") > 0) {
-            TestLog.waitForLogContaining("Rotation", "inertia value: true");
+            TestLog.waitForLogContainingSubstrings("Rotation", "inertia value: true");
         }
         TestLog.reset();
         p2 = device.addPoint(x2, y2);
--- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/ScrollTestBase.java	Sun Jun 22 12:57:01 2014 +0300
+++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/input/ScrollTestBase.java	Sun Jun 22 19:33:50 2014 +0300
@@ -337,7 +337,7 @@
         totalDeltaY = 0;
         Assert.assertEquals(expectedValue, TestLog.countLogContaining(expectedLog));
         if (TestLog.countLogContaining("Scroll finished") > 0) {
-            TestLog.waitForLogContaining("Scroll", "inertia value: true");
+            TestLog.waitForLogContainingSubstrings("Scroll", "inertia value: true");
         }
     }
 
@@ -400,7 +400,7 @@
         totalDeltaY = 0;
         Assert.assertEquals(expectedValue, TestLog.countLogContaining(expectedLog));
         if (TestLog.countLogContaining("Scroll finished") > 0) {
-            TestLog.waitForLogContaining("Scroll", "inertia value: true");
+            TestLog.waitForLogContainingSubstrings("Scroll", "inertia value: true");
         }
     }
 
--- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/TestLog.java	Sun Jun 22 12:57:01 2014 +0300
+++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/input/TestLog.java	Sun Jun 22 19:33:50 2014 +0300
@@ -240,8 +240,7 @@
                           DEFAULT_TIMEOUT);
     }
 
-    public static String waitForLogContaining(String... s) throws InterruptedException {
+    public static String waitForLogContainingSubstrings(String... s) throws InterruptedException {
         return waitForLog(s, DEFAULT_TIMEOUT, false);
     }
-
 }
--- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/ZoomTest.java	Sun Jun 22 12:57:01 2014 +0300
+++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/input/ZoomTest.java	Sun Jun 22 19:33:50 2014 +0300
@@ -144,7 +144,7 @@
         TestLog.waitForLogContaining("TouchPoint: RELEASED %d, %d", x2, newy2);
         TestLog.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLog.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        TestLog.waitForLogContaining("Zoom", "inertia value: true");
+        TestLog.waitForLogContainingSubstrings("Zoom", "inertia value: true");
         Assert.assertEquals(1, TestLog.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
     }
@@ -223,7 +223,7 @@
                 x2, newy2);
         TestLog.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLog.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        TestLog.waitForLogContaining("Zoom", "inertia value: true");
+        TestLog.waitForLogContainingSubstrings("Zoom", "inertia value: true");
         Assert.assertEquals(1, TestLog.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
     }
@@ -321,7 +321,7 @@
                 x2, newy2);
         TestLog.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLog.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        TestLog.waitForLogContaining("Zoom", "inertia value: true");
+        TestLog.waitForLogContainingSubstrings("Zoom", "inertia value: true");
         Assert.assertEquals(1, TestLog.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
     }
@@ -439,7 +439,7 @@
                 x2, newy2);
         TestLog.waitForLog("Mouse released: %d, %d", x2, newy2);
         TestLog.waitForLog("Mouse clicked: %d, %d", x2, newy2);
-        TestLog.waitForLogContaining("Zoom", "inertia value: true");
+        TestLog.waitForLogContainingSubstrings("Zoom", "inertia value: true");
         Assert.assertEquals(1, TestLog.countLogContaining("Mouse clicked: "
                 + x2 +", " + newy2));
     }