Merge branches 'DockerizedEnv' and 'master' of https://github.com/eficode/JavaFXLibrary into DockerizedEnv

# Conflicts:
#	src/main/java/JavaFXLibrary.java
#	src/test/robotframework/acceptance/NodeLookupTest.robot

Author: psaikkonen

README.md

@@ -10,7 +10,7 @@ You can connect to applications running on your local machine or even on a diffe
 
 
 ## Keyword documentation
-See keyword [documentation](https://eficode.github.io/JavaFXLibrary/JavaFXLibrary.html).
+See keyword [documentation](https://eficode.github.io/JavaFXLibrary/javafxlibrary.html).
 
 ## Installation
 

docs/JavaFXLibrary.html docs/javafxlibrary.htmldocs/JavaFXLibrary.html renamed to docs/javafxlibrary.html

@@ -21,7 +21,7 @@
     <groupId>org.robotframework</groupId>
     <artifactId>javafxlibrary</artifactId>
     <packaging>jar</packaging>
-    <version>0.4.2-SNAPSHOT</version>
+    <version>0.5.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

pom.xml

@@ -81,7 +81,7 @@ public Object runKeyword(String keywordName, Object[] args) {
         AtomicReference<RuntimeException> retExcep = new AtomicReference<>();
 
         try {
-            // timeout + 100 ms so that underlying timeout has a chance to expire first
+            // timeout + 500 ms so that underlying timeout has a chance to expire first
             WaitForAsyncUtils.waitFor(getWaitUntilTimeout(TimeUnit.MILLISECONDS) + 500, TimeUnit.MILLISECONDS, () -> {
 
                 try {

src/main/java/JavaFXLibrary.java

@@ -1144,8 +1144,9 @@ public static Object getProgressBarValue(Object locator) {
             + "``timeout`` is the maximum time in seconds that the events will be waited for. If the timeout is "
             + "exceeded the keyword will fail. Default timeout is 5 seconds.\n\n")
     @ArgumentNames({ "timeout=" })
-    public static void waitForEventsInFxApplicationThread(int timeout) {
+    public static void waitForEventsInFxApplicationThread(int timeout) throws Throwable {
 
+        final Throwable[] threadException = new JavaFXLibraryNonFatalException[1];
         try {
             Semaphore semaphore = new Semaphore(0);
             Platform.runLater(() -> semaphore.release());
@@ -1165,16 +1166,21 @@ public static void waitForEventsInFxApplicationThread(int timeout) {
                             "Fx Application Thread: " + e.getMessage());
                 }
             });
+            t.setUncaughtExceptionHandler((thread, e) -> threadException[0] = e);
             t.start();
             semaphore.acquire();
+
+            if (threadException[0] != null)
+                throw threadException[0];
+
         } catch (InterruptedException e) {
             throw new JavaFXLibraryNonFatalException("Wait For Events in Fx Application Thread was interrupted: "
                     + e.getMessage());
         }
     }
 
     @RobotKeywordOverload
-    public static void waitForEventsInFxApplicationThread() {
+    public static void waitForEventsInFxApplicationThread() throws Throwable {
         waitForEventsInFxApplicationThread(HelperFunctions.getWaitUntilTimeout());
     }
 }

src/main/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywords.java

@@ -40,8 +40,8 @@ public Node find(String query) {
         // TODO: Remove old style lookup queries
         // Use TestFX lookup for queries with no prefixes
         if (!QueryParser.startsWithPrefix(query)) {
-            RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
-                    "the updated lookup query syntax.");
+            //RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
+            //        "the updated lookup query syntax.");
             return robot.lookup(query).query();
         }
 
@@ -63,8 +63,8 @@ public Node find(String query, Parent root) {
         // TODO: Remove old style lookup queries
         // Use TestFX lookup for queries with no prefixes
         if (!QueryParser.startsWithPrefix(query)) {
-            RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
-                    "the updated lookup query syntax.");
+            //RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
+            //        "the updated lookup query syntax.");
             return robot.from(root).lookup(query).query();
         }
 
@@ -97,8 +97,8 @@ public Set<Node> findAll(String query) {
         // TODO: Remove old style lookup queries
         // Use TestFX lookup for queries with no prefixes
         if (!QueryParser.startsWithPrefix(query)) {
-            RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
-                    "the updated lookup query syntax.");
+            //RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
+            //        "the updated lookup query syntax.");
             return robot.lookup(query).queryAll();
         }
 
@@ -116,8 +116,8 @@ public Set<Node> findAll(String query, Parent root) {
         // TODO: Remove old style lookup queries
         // Use TestFX lookup for queries with no prefixes
         if (!QueryParser.startsWithPrefix(query)) {
-            RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
-                    "the updated lookup query syntax.");
+            //RobotLog.warn("You are using deprecated lookup queries! See library documentation for information about " +
+            //        "the updated lookup query syntax.");
             return robot.from(root).lookup(query).query();
         }
 

src/main/java/javafxlibrary/utils/finder/Finder.java

@@ -103,6 +103,7 @@ Set Node Visibility (Call Method With Argument Types That Require Casting)
 Wait For Events In Fx Application Thread
     [Tags]                                          smoke    demo-set
     Set Test Application                            javafxlibrary.testapps.TestBoundsLocation
+    Set Timeout                                     3
     ${node}                                         Find        id=red
     Call Object Method In Fx Application Thread     ${node}     changeFillAfterTwoSeconds
     Wait For Events In Fx Application Thread
@@ -113,6 +114,7 @@ Wait For Events In Fx Application Thread
     Wait For Events In Fx Application Thread
     ${result}                                       Find        id=red
     Should End With                                 ${result}   fill=0xff0000ff]
+    Set Timeout                                     0
 
 Find From Node
     [Tags]                  smoke

src/test/robotframework/acceptance/MiscTests.robot

@@ -43,7 +43,7 @@ Root Node Of XPath Query
     Should Be Equal     ${ROOT_NODE}        ${TARGET}
 
 Root Node Of Node That Does Not Exist
-    [Tags]              smoke
+    [Tags]              smoke    negative
     ${MSG}              Run Keyword And Expect Error    *    Get Root Node Of    id=non-existent-node-id
     Should Contain      ${MSG}    Unable to find any node with query: "id=non-existent-node-id"
 
@@ -52,6 +52,7 @@ Setup all tests
     Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
+    Set Timeout                     1
 
 Teardown all tests
     Close Javafx Application