From d1055c425f6388710ab659e35eadb19c2c381492 Mon Sep 17 00:00:00 2001 From: Adrian Kunz Date: Tue, 14 May 2024 21:57:17 +0200 Subject: [PATCH] fix: Remove System.exit from FulibFxApp.stop --- framework/src/main/java/org/fulib/fx/FulibFxApp.java | 1 - .../test/java/org/fulib/fx/mocking/ControllerTest.java | 10 +++++++++- ludo/src/test/java/de/uniks/ludo/ControllerTest.java | 10 +++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/org/fulib/fx/FulibFxApp.java b/framework/src/main/java/org/fulib/fx/FulibFxApp.java index 200eb6d9..422a7d5f 100644 --- a/framework/src/main/java/org/fulib/fx/FulibFxApp.java +++ b/framework/src/main/java/org/fulib/fx/FulibFxApp.java @@ -206,7 +206,6 @@ public void start(Stage primaryStage) { public void stop() { cleanup(); autoRefresher().close(); - System.exit(0); } /** diff --git a/framework/src/test/java/org/fulib/fx/mocking/ControllerTest.java b/framework/src/test/java/org/fulib/fx/mocking/ControllerTest.java index afd7a797..eaf62a88 100644 --- a/framework/src/test/java/org/fulib/fx/mocking/ControllerTest.java +++ b/framework/src/test/java/org/fulib/fx/mocking/ControllerTest.java @@ -7,7 +7,7 @@ public class ControllerTest extends ApplicationTest { @Spy - public final MyApp app = new MyApp(); + protected MyApp app = new MyApp(); protected Stage stage; @@ -18,4 +18,12 @@ public void start(Stage stage) throws Exception { stage.requestFocus(); app.start(stage); } + + @Override + public void stop() throws Exception { + super.stop(); + app.stop(); + app = null; + stage = null; + } } diff --git a/ludo/src/test/java/de/uniks/ludo/ControllerTest.java b/ludo/src/test/java/de/uniks/ludo/ControllerTest.java index de132ef3..b98fa916 100644 --- a/ludo/src/test/java/de/uniks/ludo/ControllerTest.java +++ b/ludo/src/test/java/de/uniks/ludo/ControllerTest.java @@ -7,7 +7,7 @@ public class ControllerTest extends ApplicationTest { @Spy - public final App app = new App(); + protected App app = new App(); protected Stage stage; @@ -18,4 +18,12 @@ public void start(Stage stage) throws Exception { stage.requestFocus(); app.start(stage); } + + @Override + public void stop() throws Exception { + super.stop(); + app.stop(); + app = null; + stage = null; + } }