From faddeb42014aee3857f263fbc3723c63758a300d Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 26 Apr 2021 17:32:17 +0200 Subject: [PATCH 1/2] Fix editorControllerTest --- src/test/java/app/controllers/EditorControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/app/controllers/EditorControllerTest.java b/src/test/java/app/controllers/EditorControllerTest.java index 63ea51c..b959d72 100644 --- a/src/test/java/app/controllers/EditorControllerTest.java +++ b/src/test/java/app/controllers/EditorControllerTest.java @@ -64,7 +64,7 @@ public class EditorControllerTest extends FxTestTemplate { private String mockContent = """ class HelloWorld { - private String message = "Hello world"; + private String message = \"Hello world\"; public String getMessage() { return message; @@ -108,7 +108,7 @@ public class EditorControllerTest extends FxTestTemplate { String brokenFilePath = "/doesNotExist.txt"; eventBus.post(new OpenFileEvent(Optional.ofNullable(Paths.get(brokenFilePath)))); - verify(editor, never()).clear(); + verify(editor).appendText(""); } } From ecba05e4923eaf2c0d676779058a437dd936fbbc Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 26 Apr 2021 20:08:43 +0200 Subject: [PATCH 2/2] Remove excess test template --- src/test/java/app/FxTestTemplate.java | 44 --------------------------- 1 file changed, 44 deletions(-) delete mode 100644 src/test/java/app/FxTestTemplate.java diff --git a/src/test/java/app/FxTestTemplate.java b/src/test/java/app/FxTestTemplate.java deleted file mode 100644 index 13886ee..0000000 --- a/src/test/java/app/FxTestTemplate.java +++ /dev/null @@ -1,44 +0,0 @@ -package app; - -import javafx.scene.Node; -import javafx.stage.Stage; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.testfx.api.FxToolkit; -import org.testfx.framework.junit5.ApplicationTest; -import org.testfx.util.WaitForAsyncUtils; - -import java.util.concurrent.TimeoutException; - -public class FxTestTemplate extends ApplicationTest { - - private Stage stage; - - @BeforeEach - public void runAppToTests() throws Exception { - FxToolkit.registerPrimaryStage(); - FxToolkit.setupApplication(Main::new); - FxToolkit.showStage(); - WaitForAsyncUtils.waitForFxEvents(100); - } - - @AfterEach - public void stopApp() throws TimeoutException { - FxToolkit.cleanupStages(); - } - - @Override - public void start(Stage primaryStage){ - this.stage = primaryStage; - primaryStage.toFront(); - } - - public Stage getStage() { - return stage; - } - - public T find(final String query) { - /** TestFX provides many operations to retrieve elements from the loaded GUI. */ - return lookup(query).query(); - } -} \ No newline at end of file