fix moveTo in osx also

sampeson · sampeson · commit cd4549f76ffc · 2020-11-10T15:26:06.000+02:00
diff --git a/src/main/java/JavaFXLibrary.java b/src/main/java/JavaFXLibrary.java
@@ -90,6 +90,7 @@ public class JavaFXLibrary extends AnnotationLibrary {
         add("launchSwingApplicationInSeparateThread");
         add("logApplicationClasspath");
         add("logSystemProperties");
+        add("moveTo");
         add("nodeShouldBeHoverable");
         add("nodeShouldNotBeHoverable");
         add("pushManyTimes");
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/MoveRobot.java b/src/main/java/javafxlibrary/keywords/Keywords/MoveRobot.java
@@ -30,8 +30,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.concurrent.ExecutionException;
 
 import static javafxlibrary.utils.HelperFunctions.*;
+import static org.testfx.util.WaitForAsyncUtils.asyncFx;
 
 @RobotKeywords
 public class MoveRobot extends TestFxAdapter {
@@ -46,18 +48,49 @@ public class MoveRobot extends TestFxAdapter {
             + "| ${point} | Create Point | ${x} | ${y} | \n"
             + "| Move To | ${POINT} | VERTICAL_FIRST | | # moves mouse on top of given Point object by moving first vertically and then horizontally |")
     @ArgumentNames({ "locator", "motion=DIRECT" })
-    public FxRobotInterface moveTo(Object locator, String motion) {
+    public void moveTo(Object locator, String motion) {
         checkObjectArgumentNotNull(locator);
         try {
             RobotLog.info("Moving to target \"" + locator + "\" using motion: \"" + getMotion(motion) + "\"");
+            Object node;
             if (locator instanceof String) {
-                locator = objectToNode(locator);
+                node = asyncFx(() -> {
+                    try {
+                        return objectToNode(locator);
+                    } catch (Exception e) {
+                        RobotLog.info("Locator not found: " + e.getCause());
+                        return null;
+                    }
+                }).get();
+                if (node == null)
+                    throw new JavaFXLibraryNonFatalException("Given locator \"" + locator + "\" was not found.");
+            } else node = locator;
+            if (isMac()) {
+                // TODO: why asyncFx thread does not work in mac?
+                Method method = MethodUtils.getMatchingAccessibleMethod(robot.getClass(), "moveTo", node.getClass(), Motion.class);
+                method.invoke(robot, node, getMotion(motion));
+            } else {
+                boolean success = asyncFx(() -> {
+                    try {
+                        Method method = MethodUtils.getMatchingAccessibleMethod(robot.getClass(), "moveTo", node.getClass(), Motion.class);
+                        method.invoke(robot, node, getMotion(motion));
+                        return true;
+                    } catch (IllegalAccessException | InvocationTargetException e) {
+                        RobotLog.trace("failed in asyncFx thread moveTo");
+                        return false;
+                    }
+                }).get();
+                if (!success) throw new JavaFXLibraryNonFatalException("moveTo: Could not execute move to using locator \"" + locator + "\" " +
+                        "and motion " + motion);
             }
-            Method method = MethodUtils.getMatchingAccessibleMethod(robot.getClass(), "moveTo", locator.getClass(), Motion.class);
-            return (FxRobotInterface) method.invoke(robot, locator, getMotion(motion));
+        } catch (InterruptedException | ExecutionException iee) {
+            throw new JavaFXLibraryNonFatalException("moveTo: Could not execute move to using locator \"" + locator + "\" " +
+                    "and motion " + motion + " (asyncFx thread): " + iee.getCause());
+        } catch (JavaFXLibraryNonFatalException e) {
+            throw e;
         } catch (IllegalAccessException | InvocationTargetException e) {
             throw new JavaFXLibraryNonFatalException("moveTo: Could not execute move to using locator \"" + locator + "\" " +
-                    "and motion " + motion + ": " + e.getCause().getMessage(), e);
+                    "and motion " + motion + ": " + e.getCause());
         }
     }
 
diff --git a/src/test/robotframework/acceptance/FindTest.robot b/src/test/robotframework/acceptance/FindTest.robot
@@ -133,7 +133,7 @@ Find With Pseudo Class
     ${root}                Find            css=VBox HBox VBox HBox StackPane
     ${target}              Find            xpath=//Text[@text="150x150"]
     Move To                ${target}
-    Wait Until Element Exists     pseudo=hover
+    Wait Until Element Exists              pseudo=hover
     ${result}              Find            pseudo=hover    false    ${root}
     Should Be Equal        ${result}       ${target}
 
diff --git a/src/test/robotframework/acceptance/MoveRobotTest.robot b/src/test/robotframework/acceptance/MoveRobotTest.robot
@@ -87,7 +87,7 @@ Move To Window
 
 Move To Nonexistent Location
     [Tags]                           smoke
-    Run Keyword And Expect Error     unable to find node for query "id=rectangleNOTfound"
+    Run Keyword And Expect Error     Given locator "id=rectangleNOTfound" was not found.
     ...                              Move To                 id=rectangleNOTfound
 
 *** Keywords ***
