Merge branch 'DockerizedEnv' of github.com:eficode/JavaFXLibrary into DockerizedEnv

Author: Hoisko Sakari.M 10802213

src/test/robotframework/acceptance/SwingApplicationWrapperTest.robot

@@ -3,37 +3,39 @@ Documentation       Tests for handling Swing embedded JavaFX nodes
 Resource            ../resource.robot
 Force Tags          set-embedded
 Suite Setup         Import JavaFXLibrary
+Test Teardown       Close Test Application
 
 *** Testcases ***
 Swing Embedded JavaFX Click Test
-    [Tags]                          smoke           demo-set
-    Launch Swing Application        javafxlibrary.testapps.SwingApplication
-    Wait Until Keyword Succeeds     15 sec          250ms           Find          css=.button     	failIfNotFound=True
-    ${colors}    Create List        0xdc143cff      0x00fa9aff      0xee82eeff    0xffff00ff        0x00ffffff
-    Text Value Should Be            Swing Embedded JavaFX
-    :FOR    ${I}    IN RANGE        0               5
-    \    Click On                   css=.button
-    \    Text Value Should Be       @{colors}[${i}]
-    Close Swing Application
+    [Tags]                              smoke           demo-set
+    Launch Swing Application            javafxlibrary.testapps.SwingApplication
+    Wait Until Keyword Succeeds         15 sec          250ms           Find          css=.button     	failIfNotFound=True
+    ${colors}    Create List            0xdc143cff      0x00fa9aff      0xee82eeff    0xffff00ff        0x00ffffff
+    Text Value Should Be                Swing Embedded JavaFX
+    :FOR    ${I}    IN RANGE            0               5
+    \    Click On                       css=.button
+    \    Wait Until Keyword Succeeds    3 sec           250ms           Text Value Should Be       @{colors}[${i}]
 
 Swing Embedded JavaFX Type Test
     [Tags]                          smoke
     Launch Swing Application        javafxlibrary.testapps.SwingApplication
     Wait Until Keyword Succeeds     15 sec          250ms           Find    id=textField     	failIfNotFound=True
     Write To                        id=textField    JavaFXLibrary
-    Text Value Should Be            JavaFXLibrary
-    Close Swing Application
+    Wait Until Keyword Succeeds     3 sec           250ms       Text Value Should Be    JavaFXLibrary
 
 Launch Swing Application Using External Wrapper Class
     [Tags]                          smoke
     Launch Javafx Application       javafxlibrary.testapps.SwingApplicationWrapper
-    Wait Until Keyword Succeeds     15 sec          250ms       Find    id=textField     	failIfNotFound=True
+    Wait Until Keyword Succeeds     15 sec          250ms       Find                    id=textField    failIfNotFound=True
     Write To                        id=textField    JavaFXLibrary
-    Text Value Should Be            JavaFXLibrary
-    Close Javafx Application
+    Wait Until Keyword Succeeds     3 sec           250ms       Text Value Should Be    JavaFXLibrary
 
 *** Keywords ***
 Text Value Should Be
     [Arguments]         ${value}
     ${text}             Get Node Text       id=textValue
     Should Be Equal     ${text}             ${value}
+
+Close Test Application
+    Run Keyword If      '${TEST NAME}' == 'Launch Swing Application Using External Wrapper Class'    Close Javafx Application
+    ...                 ELSE    Close Swing Application