From 072a94810519ceb36675984ea9f3cb4e094f3af6 Mon Sep 17 00:00:00 2001 From: Nicolas Sorin Date: Wed, 26 May 2021 22:29:28 +0200 Subject: [PATCH] Renamed Application class and merged some UI Test --- .github/workflows/release.yml | 4 ++-- .../java/com/github/nsorin/aramis/TextEditor.java | 4 ++-- ...nApplication.java => TextEditorApplication.java} | 4 ++-- .../nsorin/aramis/ui/TextEditorApplicationTest.java | 13 +++---------- 4 files changed, 9 insertions(+), 16 deletions(-) rename src/main/java/com/github/nsorin/aramis/ui/{TextnApplication.java => TextEditorApplication.java} (91%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f2cc3e..97fa01a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,6 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./target/Textn.zip - asset_name: Textn-${{ github.ref }}.zip + asset_path: ./target/Aramis.zip + asset_name: Aramis-${{ github.ref }}.zip asset_content_type: application/zip diff --git a/src/main/java/com/github/nsorin/aramis/TextEditor.java b/src/main/java/com/github/nsorin/aramis/TextEditor.java index a35377e..8428c96 100644 --- a/src/main/java/com/github/nsorin/aramis/TextEditor.java +++ b/src/main/java/com/github/nsorin/aramis/TextEditor.java @@ -3,7 +3,7 @@ import com.github.nsorin.aramis.injection.DependencyProvider; import com.github.nsorin.aramis.service.FileManager; import com.github.nsorin.aramis.service.FileManagerFilesystem; -import com.github.nsorin.aramis.ui.TextnApplication; +import com.github.nsorin.aramis.ui.TextEditorApplication; import com.github.nsorin.aramis.ui.service.FileChooserSelector; import com.github.nsorin.aramis.ui.service.FileSelector; import javafx.application.Application; @@ -11,7 +11,7 @@ public class TextEditor { public static void main(String[] args) { provideDependencies(); - Application.launch(TextnApplication.class, args); + Application.launch(TextEditorApplication.class, args); } public static void provideDependencies() { diff --git a/src/main/java/com/github/nsorin/aramis/ui/TextnApplication.java b/src/main/java/com/github/nsorin/aramis/ui/TextEditorApplication.java similarity index 91% rename from src/main/java/com/github/nsorin/aramis/ui/TextnApplication.java rename to src/main/java/com/github/nsorin/aramis/ui/TextEditorApplication.java index 0b80ac9..17cd6e3 100644 --- a/src/main/java/com/github/nsorin/aramis/ui/TextnApplication.java +++ b/src/main/java/com/github/nsorin/aramis/ui/TextEditorApplication.java @@ -9,9 +9,9 @@ import java.io.IOException; import java.util.Objects; -public class TextnApplication extends Application { +public class TextEditorApplication extends Application { - private static final String STAGE_TITLE = "Textn Text Editor"; + private static final String STAGE_TITLE = "Aramis Text Editor"; private static final String LAYOUT_FXML_PATH = "layout.fxml"; public static final int SCENE_WIDTH = 300; diff --git a/src/test/java/com/github/nsorin/aramis/ui/TextEditorApplicationTest.java b/src/test/java/com/github/nsorin/aramis/ui/TextEditorApplicationTest.java index a99c039..f63ce2e 100644 --- a/src/test/java/com/github/nsorin/aramis/ui/TextEditorApplicationTest.java +++ b/src/test/java/com/github/nsorin/aramis/ui/TextEditorApplicationTest.java @@ -34,7 +34,7 @@ public void runAppToTests() throws Exception { TextEditor.provideDependencies(); provideDependencyStubs(); FxToolkit.registerPrimaryStage(); - FxToolkit.setupApplication(TextnApplication::new); + FxToolkit.setupApplication(TextEditorApplication::new); FxToolkit.showStage(); WaitForAsyncUtils.waitForFxEvents(100); } @@ -50,19 +50,12 @@ public void start(Stage primaryStage) { } @Test - void hasToolBarAndTextArea() { + void startsCorrectly() { verifyThat(".tool-bar", isVisible()); verifyThat("#inputArea", isVisible()); - } - - @Test - void startsWithEmptyText() { verifyThat("#inputArea", hasText("")); - } - - @Test - void focusesTextAreaOnStart() { verifyThat("#inputArea", isFocused()); + } @Test