tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java

rev 9504 : need to fix test log and others

*** 23,33 ****
   * questions.
   */
  
  package test.robot.com.sun.glass.ui.monocle;
  
! import com.sun.glass.ui.monocle.TestLog;
  import test.robot.com.sun.glass.ui.monocle.TestApplication;
  import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
  import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
  import javafx.animation.AnimationTimer;
  import javafx.application.Platform;
--- 23,33 ----
   * questions.
   */
  
  package test.robot.com.sun.glass.ui.monocle;
  
! import com.sun.glass.ui.monocle.TestLogShim;
  import test.robot.com.sun.glass.ui.monocle.TestApplication;
  import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice;
  import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices;
  import javafx.animation.AnimationTimer;
  import javafx.application.Platform;
*** 54,79 ****
      @Test
      public void tapTwentyTimes() throws Exception {
          for (int i = 0; i < 20; i++) {
              int p = device.addPoint(width / 2, height / 2);
              device.sync();
!             TestLog.waitForLogContaining("TouchPoint: PRESSED", 3000);
!             TestLog.waitForLogContaining("Mouse pressed", 3000);
              device.removePoint(p);
              device.sync();
          }
          TestRunnable.invokeAndWaitUntilSuccess(() -> {
!             Assert.assertEquals(20, TestLog.countLogContaining(
                      "TouchPoint: PRESSED"));
!             Assert.assertEquals(20, TestLog.countLogContaining(
                      "TouchPoint: RELEASED"));
              Assert.assertEquals(20,
!                                 TestLog.countLogContaining("Mouse pressed"));
              Assert.assertEquals(20,
!                                 TestLog.countLogContaining("Mouse released"));
              Assert.assertEquals(20,
!                                 TestLog.countLogContaining("Mouse clicked"));
          }, 3000);
      }
  
      /** 20 quick taps while the application thread is busy */
      @Test
--- 54,79 ----
      @Test
      public void tapTwentyTimes() throws Exception {
          for (int i = 0; i < 20; i++) {
              int p = device.addPoint(width / 2, height / 2);
              device.sync();
!             TestLogShim.waitForLogContaining("TouchPoint: PRESSED", 3000);
!             TestLogShim.waitForLogContaining("Mouse pressed", 3000);
              device.removePoint(p);
              device.sync();
          }
          TestRunnable.invokeAndWaitUntilSuccess(() -> {
!             Assert.assertEquals(20, TestLogShim.countLogContaining(
                      "TouchPoint: PRESSED"));
!             Assert.assertEquals(20, TestLogShim.countLogContaining(
                      "TouchPoint: RELEASED"));
              Assert.assertEquals(20,
!                                 TestLogShim.countLogContaining("Mouse pressed"));
              Assert.assertEquals(20,
!                                 TestLogShim.countLogContaining("Mouse released"));
              Assert.assertEquals(20,
!                                 TestLogShim.countLogContaining("Mouse clicked"));
          }, 3000);
      }
  
      /** 20 quick taps while the application thread is busy */
      @Test
*** 94,114 ****
          latch.await();
          try {
              for (int i = 0; i < 20; i++) {
                  int p = device.addPoint(width / 2, height / 2);
                  device.sync();
!                 TestLog.waitForLogContaining("TouchPoint: PRESSED", 3000);
!                 TestLog.waitForLogContaining("Mouse pressed", 3000);
                  device.removePoint(p);
                  device.sync();
              }
              TestRunnable.invokeAndWaitUntilSuccess(() -> {
!                 Assert.assertEquals(20, TestLog.countLogContaining("TouchPoint: PRESSED"));
!                 Assert.assertEquals(20, TestLog.countLogContaining("TouchPoint: RELEASED"));
!                 Assert.assertEquals(20, TestLog.countLogContaining("Mouse pressed"));
!                 Assert.assertEquals(20, TestLog.countLogContaining("Mouse released"));
!                 Assert.assertEquals(20, TestLog.countLogContaining("Mouse clicked"));
              }, 10000);
          } finally {
              Platform.runLater(a::stop);
          }
      }
--- 94,114 ----
          latch.await();
          try {
              for (int i = 0; i < 20; i++) {
                  int p = device.addPoint(width / 2, height / 2);
                  device.sync();
!                 TestLogShim.waitForLogContaining("TouchPoint: PRESSED", 3000);
!                 TestLogShim.waitForLogContaining("Mouse pressed", 3000);
                  device.removePoint(p);
                  device.sync();
              }
              TestRunnable.invokeAndWaitUntilSuccess(() -> {
!                 Assert.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: PRESSED"));
!                 Assert.assertEquals(20, TestLogShim.countLogContaining("TouchPoint: RELEASED"));
!                 Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse pressed"));
!                 Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse released"));
!                 Assert.assertEquals(20, TestLogShim.countLogContaining("Mouse clicked"));
              }, 10000);
          } finally {
              Platform.runLater(a::stop);
          }
      }