Wait for node to be rendered in WaitUntilExists

Author: psaikkonen

src/main/java/javafxlibrary/matchers/ExtendedNodeMatchers.java

@@ -17,7 +17,9 @@
 
 package javafxlibrary.matchers;
 
+import javafx.geometry.Bounds;
 import javafx.scene.Node;
+import javafxlibrary.utils.HelperFunctions;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -49,4 +51,10 @@ private static boolean hoverable(Node node) {
         new javafxlibrary.keywords.Keywords.MoveRobot().moveTo(node);
         return node.isHover();
     }
+
+    public static boolean hasValidCoordinates(Node node) {
+        Bounds bounds = HelperFunctions.objectToBounds(node);
+        return !(Double.isNaN(bounds.getMinX()) || Double.isNaN(bounds.getMinY()) ||
+                 Double.isNaN(bounds.getMaxX()) || Double.isNaN(bounds.getMaxY()));
+    }
 }

src/main/java/javafxlibrary/utils/HelperFunctions.java

@@ -61,6 +61,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static javafxlibrary.matchers.ExtendedNodeMatchers.hasValidCoordinates;
 import static javafxlibrary.utils.TestFxAdapter.objectMap;
 import static javafxlibrary.utils.TestFxAdapter.robot;
 import static org.testfx.matcher.base.NodeMatchers.*;
@@ -76,18 +77,16 @@ public static Node waitUntilExists(String target) {
 
     public static Node waitUntilExists(String target, int timeout, String timeUnit) {
         RobotLog.trace("Waiting until target \"" + target + "\" becomes existent, timeout="
-                + Integer.toString(timeout) + ", timeUnit=" + timeUnit);
+                + timeout + ", timeUnit=" + timeUnit);
 
         try {
-
-            WaitForAsyncUtils.waitFor((long) timeout,
-                    getTimeUnit(timeUnit),
-                    () -> Matchers.is(isNotNull()).matches(createFinder().find(target)));
-            return createFinder().find(target);
-
+            WaitForAsyncUtils.waitFor((long) timeout, getTimeUnit(timeUnit), () -> createFinder().find(target) != null);
+            Node node = createFinder().find(target);
+            WaitForAsyncUtils.waitFor((long) timeout, getTimeUnit(timeUnit), () -> hasValidCoordinates(node));
+            return node;
         } catch (TimeoutException te) {
             throw new JavaFXLibraryNonFatalException("Given element \"" + target + "\" was not found within given timeout of "
-                    + Integer.toString(timeout) + " " + timeUnit);
+                    + timeout + " " + timeUnit);
         } catch (Exception e) {
             RobotLog.trace("Exception in waitUntilExists: " + e + "\n" + e.getCause().toString());
             throw new JavaFXLibraryNonFatalException("waitUntilExist failed: " + e);