2 files changed, 32 insertions, 24 deletions
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
index da8a6ac..eb1a728 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
@@ -6,15 +6,11 @@ import static org.mockito.Mockito.when;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
 import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import javafx.scene.control.DialogPane;
 import javafx.scene.input.MouseButton;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
-import javafx.stage.Window;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -48,7 +44,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         write("Name");
         clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
 
-        Stage alertDialog = getTopModalStage();
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
@@ -63,7 +59,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         moveTo("#inputName");
         clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
 
-        Stage alertDialog = getTopModalStage();
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
@@ -80,26 +76,10 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
         write("Test");
         clickOn("#btnCreate", Motion.DIRECT, MouseButton.PRIMARY);
 
-        Stage alertDialog = getTopModalStage();
+        Stage alertDialog = Helper.getTopModalStage(robotContext());
         Assert.assertNotNull(alertDialog);
 
         DialogPane dialogPane = (DialogPane) alertDialog.getScene().getRoot();
         Assert.assertEquals("Speicherfehler", dialogPane.getHeaderText());
     }
-
-    private Stage getTopModalStage() {
-
-        List<Window> allWindows = new ArrayList<>(robotContext().getWindowFinder().listWindows());
-        Collections.reverse(allWindows);
-        return (Stage)
-                allWindows
-                        .stream()
-                        .filter(window -> window instanceof Stage)
-                        .filter(
-                                window ->
-                                        ((Stage) window).getModality()
-                                                == Modality.APPLICATION_MODAL)
-                        .findFirst()
-                        .orElse(null);
-    }
 }
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/Helper.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/Helper.java
new file mode 100644
index 0000000..b808206
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/util/Helper.java
@@ -0,0 +1,28 @@
+package at.ac.tuwien.sepm.assignment.groupphase.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.Window;
+import org.testfx.api.FxRobotContext;
+
+public class Helper {
+
+    public static Stage getTopModalStage(FxRobotContext robotContext) {
+
+        List<Window> allWindows = new ArrayList<>(robotContext.getWindowFinder().listWindows());
+        Collections.reverse(allWindows);
+        return (Stage)
+                allWindows
+                        .stream()
+                        .filter(window -> window instanceof Stage)
+                        .filter(
+                                window ->
+                                        ((Stage) window).getModality()
+                                                == Modality.APPLICATION_MODAL)
+                        .findFirst()
+                        .orElse(null);
+    }
+}