Import the library dynamically

psaikkonen · psaikkonen · commit 8281072d1342 · 2018-08-24T17:24:27.000+03:00
Each test suite calls Import JavaFXLibrary keyword which imports the
local jar library on Jython and the Remote library with Docker containers
address on Python.
diff --git a/src/main/java/JavaFXLibrary.java b/src/main/java/JavaFXLibrary.java
@@ -82,7 +82,7 @@ public Object runKeyword(String keywordName, Object[] args) {
 
         try {
             // timeout + 100 ms so that underlying timeout has a chance to expire first
-            WaitForAsyncUtils.waitFor(getWaitUntilTimeout(TimeUnit.MILLISECONDS) + 100, TimeUnit.MILLISECONDS, () -> {
+            WaitForAsyncUtils.waitFor(getWaitUntilTimeout(TimeUnit.MILLISECONDS) + 500, TimeUnit.MILLISECONDS, () -> {
 
                 try {
                     retval.set(super.runKeyword(keywordName, finalArgs));
diff --git a/src/test/robotframework/acceptance/0_ClickRobotTest.robot b/src/test/robotframework/acceptance/0_ClickRobotTest.robot
@@ -256,6 +256,7 @@ Click On Unsupported Type
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
     Set Scene Values
diff --git a/src/test/robotframework/acceptance/BoundsLocationTest.robot b/src/test/robotframework/acceptance/BoundsLocationTest.robot
@@ -83,6 +83,7 @@ Get Bounds Of Id That Does Not Exist
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     1
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/DatePickerTest.robot b/src/test/robotframework/acceptance/DatePickerTest.robot
@@ -32,6 +32,7 @@ Select JavaFX Release Date
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/DragRobotTest.robot b/src/test/robotframework/acceptance/DragRobotTest.robot
@@ -242,6 +242,7 @@ Drag From + Drop To Using XPath Query
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/FindTest.robot b/src/test/robotframework/acceptance/FindTest.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation       Tests to test javafxlibrary.keywords.AdditionalKeywords.Find related keywords
-Resource          ../resource.robot
+Resource            ../resource.robot
+Suite Setup         Setup All Tests
 Suite Teardown      Teardown all tests
-Suite Setup         Set Timeout    0
 Force Tags          set-find
 
 *** Variables ***
@@ -280,6 +280,10 @@ Change Current Application
     Launch Javafx Application       ${APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
 
+Setup All Tests
+    Import JavaFXLibrary
+    Set Timeout    0
+
 Teardown all tests
     Close Javafx Application
 
diff --git a/src/test/robotframework/acceptance/KeyboardRobotTest.robot b/src/test/robotframework/acceptance/KeyboardRobotTest.robot
@@ -80,6 +80,7 @@ Write special characters
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                 0
     Launch Javafx Application   ${TEST_APPLICATION}
     Set Screenshot Directory    ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/MenuAppTest.robot b/src/test/robotframework/acceptance/MenuAppTest.robot
@@ -82,6 +82,7 @@ Combined
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
 
diff --git a/src/test/robotframework/acceptance/MiscTests.robot b/src/test/robotframework/acceptance/MiscTests.robot
@@ -3,7 +3,7 @@ Documentation       Tests for AdditionalKeywords
 Resource          ../resource.robot
 Library             Collections
 Library             String
-Suite Setup         Set Timeout    0
+Suite Setup         Setup All Tests
 Suite Teardown      Close Javafx Application
 
 *** Variables ***
@@ -298,6 +298,10 @@ Set Test Application
     [Arguments]             ${APPLICATION}
     Run Keyword Unless      '${CURRENT_APPLICATION}' == '${APPLICATION}'    Change Current Application    ${APPLICATION}
 
+Setup All Tests
+    Import JavaFXLibrary
+    Set Timeout    0
+
 Change Current Application
     [Arguments]                     ${APPLICATION}
     Run Keyword Unless              '${CURRENT_APPLICATION}' == 'NOT SET'    Close Javafx Application
diff --git a/src/test/robotframework/acceptance/MoveRobotTest.robot b/src/test/robotframework/acceptance/MoveRobotTest.robot
@@ -86,6 +86,7 @@ Move To Window
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/NodeLookupTest.robot b/src/test/robotframework/acceptance/NodeLookupTest.robot
@@ -49,6 +49,7 @@ Root Node Of Node That Does Not Exist
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
 
diff --git a/src/test/robotframework/acceptance/PointLocationTest.robot b/src/test/robotframework/acceptance/PointLocationTest.robot
@@ -170,6 +170,7 @@ Set New Target Position
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/ScreenCapturingTest.robot b/src/test/robotframework/acceptance/ScreenCapturingTest.robot
@@ -96,6 +96,7 @@ Try To Compare Different Size Images
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
diff --git a/src/test/robotframework/acceptance/ScrollRobotTest.robot b/src/test/robotframework/acceptance/ScrollRobotTest.robot
@@ -66,6 +66,7 @@ Scroll Right
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
     Set Variables
diff --git a/src/test/robotframework/acceptance/ScrollRobotTest2.robot b/src/test/robotframework/acceptance/ScrollRobotTest2.robot
@@ -56,6 +56,7 @@ Scroll Left Once
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application   ${TEST_APPLICATION}
     Set Screenshot Directory    ${OUTPUT_DIR}${/}report-images
     Move To                     id=scrollPane
diff --git a/src/test/robotframework/acceptance/SwingApplicationWrapperTest.robot b/src/test/robotframework/acceptance/SwingApplicationWrapperTest.robot
@@ -1,7 +1,8 @@
 *** Settings ***
 Documentation       Tests for handling Swing embedded JavaFX nodes
-Resource          ../resource.robot
+Resource            ../resource.robot
 Force Tags          set-embedded
+Suite Setup         Import JavaFXLibrary
 
 *** Testcases ***
 Swing Embedded JavaFX Click Test
diff --git a/src/test/robotframework/acceptance/WindowLookupTest.robot b/src/test/robotframework/acceptance/WindowLookupTest.robot
@@ -102,6 +102,7 @@ Activate window
     Click On                ${window_node}
 
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
 
diff --git a/src/test/robotframework/acceptance/WindowManagementTest.robot b/src/test/robotframework/acceptance/WindowManagementTest.robot
@@ -61,6 +61,7 @@ Find All From Node
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
 
diff --git a/src/test/robotframework/acceptance/WindowTargetingTest.robot b/src/test/robotframework/acceptance/WindowTargetingTest.robot
@@ -55,6 +55,7 @@ Target Window By Node
 
 *** Keywords ***
 Setup all tests
+    Import JavaFXLibrary
     Launch Javafx Application    ${TEST_APPLICATION}
     Set Screenshot Directory     ${OUTPUT_DIR}${/}report-images
 
diff --git a/src/test/robotframework/resource.robot b/src/test/robotframework/resource.robot
@@ -1,3 +1,4 @@
-*** Settings ***
-Library           JavaFXLibrary
-Library           Remote    http://javafxcompile:8270/    WITH NAME    RemoteJavaFXLibrary
+*** Keywords ***
+Import JavaFXLibrary
+    Run Keyword If    sys.platform.startswith('java')    Import Library    JavaFXLibrary
+    ...    ELSE    Import Library    Remote    http://javafxcompile:8270/    WITH NAME    RemoteJavaFXLibrary
