diff --git a/ludo/src/main/java/de/uniks/ludo/App.java b/ludo/src/main/java/de/uniks/ludo/App.java index c44e3dea..1c428bac 100644 --- a/ludo/src/main/java/de/uniks/ludo/App.java +++ b/ludo/src/main/java/de/uniks/ludo/App.java @@ -73,7 +73,9 @@ public void start(Stage primaryStage) { setDefaultResourceBundle(component.bundle()); // Starting the application by showing the main view without any parameters - show(""); + if (!LudoUtil.inControllerTest()) { + show(""); + } } catch (Exception e) { // If an error occurs while starting the application, we want to log it and exit the application diff --git a/ludo/src/main/java/de/uniks/ludo/LudoUtil.java b/ludo/src/main/java/de/uniks/ludo/LudoUtil.java index 92d03ddf..03f6731e 100644 --- a/ludo/src/main/java/de/uniks/ludo/LudoUtil.java +++ b/ludo/src/main/java/de/uniks/ludo/LudoUtil.java @@ -5,6 +5,16 @@ public class LudoUtil { + private static final String CONTROLLER_TEST = "controller.test.enabled"; + + public static boolean inControllerTest() { + return Boolean.parseBoolean(System.getProperty(CONTROLLER_TEST)); + } + + public static void enableControllerTest() { + System.setProperty(CONTROLLER_TEST, Boolean.toString(true)); + } + /** * Plays a media/sound. * diff --git a/ludo/src/test/java/de/uniks/ludo/ControllerTest.java b/ludo/src/test/java/de/uniks/ludo/ControllerTest.java index de132ef3..0a9ab303 100644 --- a/ludo/src/test/java/de/uniks/ludo/ControllerTest.java +++ b/ludo/src/test/java/de/uniks/ludo/ControllerTest.java @@ -13,6 +13,7 @@ public class ControllerTest extends ApplicationTest { @Override public void start(Stage stage) throws Exception { + LudoUtil.enableControllerTest(); super.start(stage); this.stage = stage; stage.requestFocus();