fix scroll keywords to do one tick at time from main thread, fix related tests

sampeson · sampeson · commit fd3eba14da2f · 2020-11-09T14:40:10.000+02:00
diff --git a/src/main/java/JavaFXLibrary.java b/src/main/java/JavaFXLibrary.java
@@ -93,6 +93,8 @@ public class JavaFXLibrary extends AnnotationLibrary {
         add("nodeShouldBeHoverable");
         add("nodeShouldNotBeHoverable");
         add("pushManyTimes");
+        add("scrollHorizontally");
+        add("scrollVertically");
         add("setImageLogging");
         add("setSafeClicking");
         add("setScreenshotDirectory");
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/ScrollRobot.java b/src/main/java/javafxlibrary/keywords/Keywords/ScrollRobot.java
@@ -25,6 +25,9 @@
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.RobotKeyword;
 import org.robotframework.javalib.annotation.RobotKeywords;
+import java.util.concurrent.ExecutionException;
+import static javafxlibrary.utils.HelperFunctions.sleepFor;
+import static org.testfx.util.WaitForAsyncUtils.asyncFx;
 
 @RobotKeywords
 public class ScrollRobot extends TestFxAdapter {
@@ -39,7 +42,13 @@ public class ScrollRobot extends TestFxAdapter {
     public void scrollVertically(String direction, int amount) {
         try {
             RobotLog.info("Scrolling \"" + direction + "\" by \"" + amount + "\" ticks.");
-            robot.scroll(amount, HelperFunctions.getVerticalDirection(direction));
+            //Scrolling is done one tick at time from main thread as in asyncFx thread it would result only one visible scroll
+            for (int i = 0; i < amount; i++) {
+                asyncFx(() -> robot.scroll(1, HelperFunctions.getVerticalDirection(direction))).get();
+                sleepFor(10);
+            }
+        } catch (InterruptedException | ExecutionException iee) {
+            throw new JavaFXLibraryNonFatalException("Unable to scroll vertically!");
         } catch (Exception e) {
             if(e instanceof JavaFXLibraryNonFatalException)
                 throw e;
@@ -62,9 +71,17 @@ public void scrollVertically(String direction, int amount) {
     public void scrollHorizontally(String direction, int amount) {
         try {
             RobotLog.info("Scrolling \"" + direction + "\" by \"" + amount + "\" ticks.");
-            robot.press(KeyCode.SHIFT);
-            robot.scroll(amount, HelperFunctions.getHorizontalDirection(direction));
-            robot.release(KeyCode.SHIFT);
+            //Scrolling is done one tick at time from main thread as in asyncFx thread it would result only one visible scroll
+            for (int i = 0; i < amount; i++) {
+                asyncFx(() -> {
+                    robot.press(KeyCode.SHIFT);
+                    robot.scroll(1, HelperFunctions.getHorizontalDirection(direction));
+                    robot.release(KeyCode.SHIFT);
+                }).get();
+                sleepFor(10);
+            }
+        } catch (InterruptedException | ExecutionException iee) {
+            throw new JavaFXLibraryNonFatalException("Unable to scroll horizontally!");
         } catch (Exception e) {
             if(e instanceof JavaFXLibraryNonFatalException)
                 throw e;
diff --git a/src/test/robotframework/acceptance/ScrollRobotTest.robot b/src/test/robotframework/acceptance/ScrollRobotTest.robot
@@ -24,7 +24,7 @@ Scroll down
     Scroll Vertically       DOWN                    25
     Verify String           ${VERTICAL_TOTAL}       ${TARGET_DISTANCE}
     Verify String           ${VERTICAL_ACTUAL}      -${TARGET_DISTANCE}
-    Verify String           ${VERTICAL_EVENTS}      1
+    Verify String           ${VERTICAL_EVENTS}      25
 
 Scroll up
     [Tags]                  smoke
@@ -34,7 +34,7 @@ Scroll up
     Scroll Vertically       UP                      25
     Verify String           ${VERTICAL_TOTAL}       ${TARGET_DISTANCE}
     Verify String           ${VERTICAL_ACTUAL}      ${TARGET_DISTANCE}
-    Verify String           ${VERTICAL_EVENTS}      1
+    Verify String           ${VERTICAL_EVENTS}      25
 
 Scroll Once Vertically
     [Tags]    smoke
@@ -54,7 +54,7 @@ Scroll Left
     Scroll Horizontally     LEFT                    25
     Verify String           ${HORIZONTAL_TOTAL}     ${TARGET_DISTANCE}
     Verify String           ${HORIZONTAL_ACTUAL}    ${TARGET_DISTANCE}
-    Verify String           ${HORIZONTAL_EVENTS}    1
+    Verify String           ${HORIZONTAL_EVENTS}    25
 
 Scroll Right
     [Tags]                  smoke
@@ -65,7 +65,7 @@ Scroll Right
     Scroll Horizontally     RIGHT                   10
     Verify String           ${HORIZONTAL_TOTAL}     ${TARGET_DISTANCE}
     Verify String           ${HORIZONTAL_ACTUAL}    -${TARGET_DISTANCE}
-    Verify String           ${HORIZONTAL_EVENTS}    1
+    Verify String           ${HORIZONTAL_EVENTS}    10
 
 *** Keywords ***
 Setup all tests
