Rearrange ConvenienceKeyword unit tests

- Changed test directory structure to keywords/AdditionalKeywordsTests/ConvenienceKeywords
- Renamed ConvenienceKeywordsTest to DeprecatedFindKeywordsTest
- Added unit tests for waitForEventsInFxApplicationThread

Author: psaikkonen

…nalKeywords/ConvenienceKeywordsTest.java …Keywords/DeprecatedFindKeywordsTest.javasrc/test/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywordsTest.java renamed to src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/DeprecatedFindKeywordsTest.java src/test/java/javafxlibrary/keywords/AdditionalKeywords/ConvenienceKeywordsTest.java renamed to src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/DeprecatedFindKeywordsTest.java

@@ -15,30 +15,36 @@
  * limitations under the License.
  */
 
-package javafxlibrary.keywords.AdditionalKeywords;
+package javafxlibrary.keywords.AdditionalKeywordsTests.ConvenienceKeywords;
 
 import java.util.List;
 import com.google.common.collect.ImmutableSet;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Button;
 import javafxlibrary.TestFxAdapterTest;
-import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
+import javafxlibrary.keywords.AdditionalKeywords.ConvenienceKeywords;
 import javafxlibrary.utils.HelperFunctions;
 import mockit.Expectations;
 import mockit.Mocked;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.testfx.service.query.NodeQuery;
 
-public class ConvenienceKeywordsTest extends TestFxAdapterTest {
+public class DeprecatedFindKeywordsTest extends TestFxAdapterTest {
 
     @Mocked
     NodeQuery rootQuery;
 
     private Button button;
     private Button button2;
-    private ConvenienceKeywords keywords = new ConvenienceKeywords();
+    private static ConvenienceKeywords keywords;
+
+    @BeforeClass
+    public static void setupAllTests() {
+        keywords = new ConvenienceKeywords();
+    }
 
     @Before
     public void setup() {
@@ -57,20 +63,15 @@ public void setup() {
     @Test
     public void findAllWithPseudoClass() {
         expectTwoButtonsFromNodeQuery();
-
         List<Object> allWithPseudoClass = keywords.findAllWithPseudoClass("rootId", "selected");
         Assert.assertEquals(HelperFunctions.mapObject(button), allWithPseudoClass.get(0));
     }
 
     @Test
     public void findNoPseudoClasses() {
         expectTwoButtonsFromNodeQuery();
-        try {
-            List<Object> hits = keywords.findAllWithPseudoClass("rootId", "something");
-            Assert.assertEquals(0, hits.size());
-        } catch (JavaFXLibraryNonFatalException e) {
-
-        }
+        List<Object> hits = keywords.findAllWithPseudoClass("rootId", "something");
+        Assert.assertEquals(0, hits.size());
     }
 
     @Test
@@ -81,12 +82,8 @@ public void findNoNodes() {
                 result = ImmutableSet.of();
             }
         };
-        try {
-            List<Object> hits = keywords.findAllWithPseudoClass("rootId", "something");
-            Assert.assertEquals(0, hits.size());
-        } catch (JavaFXLibraryNonFatalException e) {
-
-        }
+        List<Object> hits = keywords.findAllWithPseudoClass("rootId", "something");
+        Assert.assertEquals(0, hits.size());
     }
 
     private void expectTwoButtonsFromNodeQuery() {

src/test/java/javafxlibrary/keywords/AdditionalKeywordsTests/ConvenienceKeywords/WaitForEventsInFxApplicationThreadTest.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2017-2018   Eficode Oy
+ * Copyright 2018-       Robot Framework Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javafxlibrary.keywords.AdditionalKeywordsTests.ConvenienceKeywords;
+
+import javafx.application.Platform;
+import javafx.scene.control.Button;
+import javafxlibrary.TestFxAdapterTest;
+import javafxlibrary.exceptions.JavaFXLibraryNonFatalException;
+import javafxlibrary.keywords.AdditionalKeywords.ConvenienceKeywords;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class WaitForEventsInFxApplicationThreadTest extends TestFxAdapterTest {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private static ConvenienceKeywords keywords;
+
+    @BeforeClass
+    public static void setupTests() {
+        keywords = new ConvenienceKeywords();
+    }
+
+    @Test
+    public void waitForEventsInFxApplicationThread() {
+        Button b = createDelayedButton(2000);
+        Platform.runLater(() -> b.fire());
+        keywords.waitForEventsInFxApplicationThread(2);
+        Assert.assertEquals("ChangedText", b.getText());
+    }
+
+    @Test
+    public void waitForEventsInFxApplicationThread_TimeoutExceeded() {
+        thrown.expect(JavaFXLibraryNonFatalException.class);
+        thrown.expectMessage("Events did not finish within the given timeout of 1 seconds.");
+        Button b = createDelayedButton(3000);
+        Platform.runLater(() -> b.fire());
+        keywords.waitForEventsInFxApplicationThread(1);
+    }
+
+    private Button createDelayedButton(int timeout) {
+        Button b = new Button("OriginalText");
+        b.setOnAction((e) -> {
+            try {
+                Thread.sleep(timeout);
+                b.setText("ChangedText");
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+            }
+        });
+        return b;
+    }
+}