Move Finder related utility classes to their own package

psaikkonen · psaikkonen · commit adc58fa6f4fb · 2018-08-16T16:37:41.000+03:00
diff --git a/src/main/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywords.java b/src/main/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywords.java
@@ -39,7 +39,7 @@
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.RobotLog;
 import javafxlibrary.utils.TestFxAdapter;
-import javafxlibrary.utils.XPathFinder;
+import javafxlibrary.utils.finder.XPathFinder;
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.RobotKeyword;
 import org.robotframework.javalib.annotation.RobotKeywordOverload;
@@ -57,7 +57,7 @@ public class ConvenienceKeywords extends TestFxAdapter {
 
     @Deprecated
     @RobotKeyword("*DEPRECATED!!* Use keyword `Find` instead.\n\n" +
-            "Finder that mimics _xpath_ style search.\n\n"
+            "finder that mimics _xpath_ style search.\n\n"
             + "``query`` is a query locator, see `3.1 Using queries`.\n\n"
             + "``failIfNotFound`` specifies if keyword should fail if nothing is found. By default it's false and "
             + "keyword returns null in case lookup returns nothing.\n\n"
diff --git a/src/main/java/javafxlibrary/keywords/AdditionalKeywords/Find.java b/src/main/java/javafxlibrary/keywords/AdditionalKeywords/Find.java
@@ -2,7 +2,7 @@
 
 import javafx.scene.Parent;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.RobotLog;
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.RobotKeyword;
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/MoveRobot.java b/src/main/java/javafxlibrary/keywords/Keywords/MoveRobot.java
@@ -18,7 +18,7 @@
 package javafxlibrary.keywords.Keywords;
 
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.RobotLog;
 import javafxlibrary.utils.TestFxAdapter;
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/NodeLookup.java b/src/main/java/javafxlibrary/keywords/Keywords/NodeLookup.java
@@ -19,7 +19,7 @@
 
 import javafx.scene.Node;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.RobotLog;
 import javafxlibrary.utils.TestFxAdapter;
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/PointLocation.java b/src/main/java/javafxlibrary/keywords/Keywords/PointLocation.java
@@ -18,7 +18,7 @@
 package javafxlibrary.keywords.Keywords;
 
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.RobotLog;
 import javafxlibrary.utils.TestFxAdapter;
diff --git a/src/main/java/javafxlibrary/keywords/Keywords/PointOffset.java b/src/main/java/javafxlibrary/keywords/Keywords/PointOffset.java
@@ -18,7 +18,7 @@
 package javafxlibrary.keywords.Keywords;
 
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import javafxlibrary.utils.RobotLog;
 import javafxlibrary.utils.TestFxAdapter;
diff --git a/src/main/java/javafxlibrary/utils/HelperFunctions.java b/src/main/java/javafxlibrary/utils/HelperFunctions.java
@@ -29,6 +29,7 @@
 import javafx.stage.Window;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.matchers.ProgressBarMatchers;
+import javafxlibrary.utils.finder.Finder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 import org.apache.maven.model.Model;
@@ -563,7 +564,7 @@ private static String remainingQueries(String query) {
     }
 
 
-    // Deprecated: Use javafxlibrary.utils.Finder instead
+    // Deprecated: Use javafxlibrary.utils.finder.finder instead
     @Deprecated
     public static Node findNode(Node node, String query) {
 
@@ -605,7 +606,7 @@ public static Node findNode(Node node, String query) {
         }
     }
 
-    // Deprecated: Use javafxlibrary.utils.Finder instead
+    // Deprecated: Use javafxlibrary.utils.finder.finder instead
     @Deprecated
     public static Node findNode(String query) {
         return findNode(robot.listTargetWindows().get(0).getScene().getRoot(), query);
diff --git a/src/main/java/javafxlibrary/utils/TestFxAdapter.java b/src/main/java/javafxlibrary/utils/TestFxAdapter.java
@@ -33,6 +33,7 @@ public class TestFxAdapter {
     public static void setRobot(FxRobotInterface robot) {
         TestFxAdapter.robot = robot;
     }
+    public static FxRobotInterface getRobot() { return robot; }
 
     // current robot context
     protected static FxRobotContext robotContext;
diff --git a/src/main/java/javafxlibrary/utils/finder/Finder.java b/src/main/java/javafxlibrary/utils/finder/Finder.java
@@ -1,4 +1,4 @@
-package javafxlibrary.utils;
+package javafxlibrary.utils.finder;
 
 import javafx.collections.ObservableSet;
 import javafx.css.PseudoClass;
@@ -7,19 +7,27 @@
 import javafx.stage.Window;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
 import javafxlibrary.matchers.InstanceOfMatcher;
+import javafxlibrary.utils.RobotLog;
+import javafxlibrary.utils.TestFxAdapter;
+import org.testfx.api.FxRobotInterface;
 import org.testfx.matcher.control.LabeledMatchers;
 import org.testfx.service.query.NodeQuery;
 
 import java.util.*;
 
-import static javafxlibrary.utils.TestFxAdapter.robot;
+// import static javafxlibrary.utils.TestFxAdapter.robot;
 
 public class Finder {
 
     public enum FindPrefix { ID, CSS, CLASS, TEXT, XPATH, PSEUDO }
 
     private String[] queries;
     private Set<Node> results = new LinkedHashSet<>();
+    private FxRobotInterface robot;
+
+    public Finder() {
+        this.robot = TestFxAdapter.getRobot();
+    }
 
     public Node find(String query) {
         // TODO: Remove old style lookup queries
diff --git a/src/main/java/javafxlibrary/utils/finder/QueryParser.java b/src/main/java/javafxlibrary/utils/finder/QueryParser.java
@@ -1,4 +1,4 @@
-package javafxlibrary.utils;
+package javafxlibrary.utils.finder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/javafxlibrary/utils/finder/XPathFinder.java b/src/main/java/javafxlibrary/utils/finder/XPathFinder.java
@@ -1,8 +1,9 @@
-package javafxlibrary.utils;
+package javafxlibrary.utils.finder;
 
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
+import javafxlibrary.utils.RobotLog;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.NodeList;
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/ObjectToNodeTest.java
@@ -4,7 +4,7 @@
 import javafx.scene.control.Button;
 import javafxlibrary.TestFxAdapterTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Expectations;
 import mockit.Mock;
diff --git a/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilExistsTest.java b/src/test/java/javafxlibrary/utils/HelperFunctionsTests/WaitUntilExistsTest.java
@@ -4,7 +4,7 @@
 import javafx.scene.control.Button;
 import javafxlibrary.TestFxAdapterTest;
 import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
-import javafxlibrary.utils.Finder;
+import javafxlibrary.utils.finder.Finder;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.*;
 import org.junit.*;
diff --git a/src/test/java/javafxlibrary/utils/finder/FinderTest.java b/src/test/java/javafxlibrary/utils/finder/FinderTest.java
@@ -1,4 +1,4 @@
-package javafxlibrary.utils;
+package javafxlibrary.utils.finder;
 
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -8,6 +8,7 @@
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafxlibrary.TestFxAdapterTest;
+import javafxlibrary.utils.TestFxAdapter;
 import mockit.Expectations;
 import mockit.Mocked;
 import org.junit.*;
@@ -69,6 +70,7 @@ public void find_CustomRoot_TestFXSelector() {
         // Use a real FxRobot instance for this test
         FxRobot robot = new FxRobot();
         TestFxAdapter.setRobot(robot);
+        finder = new Finder();
 
         new Expectations() {
             {
diff --git a/src/test/java/javafxlibrary/utils/finder/QueryParserTest.java b/src/test/java/javafxlibrary/utils/finder/QueryParserTest.java
@@ -1,4 +1,4 @@
-package javafxlibrary.utils;
+package javafxlibrary.utils.finder;
 
 import org.junit.Assert;
 import org.junit.Test;

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public class TestFxAdapter {`
`33`	`33`	`public static void setRobot(FxRobotInterface robot) {`
`34`	`34`	`TestFxAdapter.robot = robot;`
`35`	`35`	`}`
	`36`	`+ public static FxRobotInterface getRobot() { return robot; }`
`36`	`37`
`37`	`38`	`// current robot context`
`38`	`39`	`protected static FxRobotContext robotContext;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package javafxlibrary.utils;`
	`1`	`+package javafxlibrary.utils.finder;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.Arrays;`