From 92a51d27778be24b544f2ee8942d925e27faf6ee Mon Sep 17 00:00:00 2001 From: moritzLanger Date: Wed, 29 Nov 2023 10:58:14 +0100 Subject: [PATCH 01/33] #146 added jacoco --- .../commandlet/CommandletManagerResetter.java | 1 + pom.xml | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/cli/src/test/java/com/devonfw/tools/ide/commandlet/CommandletManagerResetter.java b/cli/src/test/java/com/devonfw/tools/ide/commandlet/CommandletManagerResetter.java index 3385f0ca00..cdcc38c825 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/commandlet/CommandletManagerResetter.java +++ b/cli/src/test/java/com/devonfw/tools/ide/commandlet/CommandletManagerResetter.java @@ -8,6 +8,7 @@ public class CommandletManagerResetter { /** * Make {@link CommandletManagerImpl#reset()} visible for testing. */ + public static void reset() { CommandletManagerImpl.reset(); diff --git a/pom.xml b/pom.xml index 6fbd3dd2ec..af953d2644 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,26 @@ true + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + + prepare-agent + + + + report + prepare-package + + report + + + + + From de35d63548d620976a7d1ab68ab5a590524d5533 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:10:33 +0100 Subject: [PATCH 02/33] Update build-pr.yml --- .github/workflows/build-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 25b7560d8d..7d49e01fb2 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,3 +14,5 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install + - name: Coveralls + uses: coverallsapp/github-action@v2 From 3839f779a93e48d5f5d26dca98f888cd38c4759a Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:16:01 +0100 Subject: [PATCH 03/33] #146 added coverall action --- .github/workflows/build-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 25b7560d8d..8588b1441e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,3 +14,5 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 From 241e3cb916c5c69713574042222cc75bf481b434 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:16:48 +0100 Subject: [PATCH 04/33] #146 added Coverall --- .github/workflows/build-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7d49e01fb2..8588b1441e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,5 +14,5 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install - - name: Coveralls - uses: coverallsapp/github-action@v2 + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 From a1b1eea35c824c859840ce75ecd0c30c35c7da83 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:43:37 +0100 Subject: [PATCH 05/33] #146 update build-pr --- .github/workflows/build-pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 8588b1441e..240076258c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,3 +16,6 @@ jobs: run: mvn -B -ntp -Dstyle.color=always install - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 + with: + fail-on-error: false + parallel: true From f340e56218640852cb7465d45ba94b672d6e725d Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:56:04 +0100 Subject: [PATCH 06/33] #146 Update build-pr.yml --- .github/workflows/build-pr.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 125bd81ca5..057f4f0031 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,9 +14,12 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install + test: + runs-on: ubuntu-latest + steps: - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 with: fail-on-error: false - parallel: true + From 58a43132cd0623f1782d24eeccfb5798223dbeee Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:21:59 +0100 Subject: [PATCH 07/33] #146 Update build-pr.yml --- .github/workflows/build-pr.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 057f4f0031..b0daef91b2 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -14,9 +14,6 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install - test: - runs-on: ubuntu-latest - steps: - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 with: From 390b87d81fe6a5053446ed9d61bd1194099bfcf5 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:31:10 +0100 Subject: [PATCH 08/33] Update HelpCommandlet.java --- .../com/devonfw/tools/ide/commandlet/HelpCommandlet.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java index 49acf7aefb..43c4f2e6ba 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java @@ -46,6 +46,12 @@ public String getName() { return "help"; } + + @Override + public String getNonCoverageName() { + + return "notcovered"; + } @Override public boolean isIdeHomeRequired() { From c31a9f62b1f19fd52db34e770d0404bafde00c17 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:34:51 +0100 Subject: [PATCH 09/33] Update HelpCommandlet.java --- .../java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java index 43c4f2e6ba..de46fc3ced 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java @@ -47,7 +47,6 @@ public String getName() { return "help"; } - @Override public String getNonCoverageName() { return "notcovered"; From 4e2d012e8cbf2194f81cce2afeb766676762e4f3 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:38:35 +0100 Subject: [PATCH 10/33] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c98a46232..ec8f7bff51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,3 +23,7 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} run: mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true -Dmaven.install.skip=true -Dstyle.color=always -B -ntp deploy + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 + with: + fail-on-error: false From 7b01f93fa90d6794c585134275b9882f3e7fadf1 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:42:21 +0100 Subject: [PATCH 11/33] Update build-pr.yml --- .github/workflows/build-pr.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index b0daef91b2..39966e19ee 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,7 +16,5 @@ jobs: run: mvn -B -ntp -Dstyle.color=always install - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 - with: - fail-on-error: false From 4f4b79d58f82aa330501f2d325406461a258335f Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:48:35 +0100 Subject: [PATCH 12/33] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec8f7bff51..66869b5a3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,5 +25,4 @@ jobs: run: mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true -Dmaven.install.skip=true -Dstyle.color=always -B -ntp deploy - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 - with: - fail-on-error: false + From 89b6a1f7a97483976239351697b7449b3e611a1f Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:53:05 +0100 Subject: [PATCH 13/33] Update EnvironmentCommandletTest.java --- .../commandlet/EnvironmentCommandletTest.java | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandletTest.java b/cli/src/test/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandletTest.java index 6defc9dfd4..ec239ea7a6 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandletTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandletTest.java @@ -11,57 +11,6 @@ */ public class EnvironmentCommandletTest extends AbstractIdeContextTest { - /** - * Test of {@link EnvironmentCommandlet#normalizeWindowsValue(String)} for Windows. - */ - @Test - public void testNormalizeWindowsValue2Windows() { - EnvironmentCommandlet env = new EnvironmentCommandlet(IdeTestContextMock.get()); - assertThat(env.normalizeWindowsValue("")).isEqualTo(""); - assertThat(env.normalizeWindowsValue("*")).isEqualTo("*"); - assertThat(env.normalizeWindowsValue("$:\\\\{garbage}§")).isEqualTo("$:\\\\{garbage}§"); - assertThat(env.normalizeWindowsValue("/c/Windows/system32/drivers/etc/hosts")) - .isEqualTo("C:\\Windows\\system32\\drivers\\etc\\hosts"); - assertThat(env.normalizeWindowsValue("C:\\Windows\\system32\\drivers\\etc\\hosts")) - .isEqualTo("C:\\Windows\\system32\\drivers\\etc\\hosts"); - assertThat(env.normalizeWindowsValue("C:\\Users\\login/.ide/scripts/ide")) - .isEqualTo("C:\\Users\\login\\.ide\\scripts\\ide"); - assertThat(env.normalizeWindowsValue("\\login/.ide/scripts/ide")).isEqualTo("\\login/.ide/scripts/ide"); - } - - /** - * Test of {@link EnvironmentCommandlet#normalizeWindowsValue(String)} for (Git-)Bash. - */ - @Test - public void testNormalizeWindowsValue2Bash() { - - EnvironmentCommandlet env = new EnvironmentCommandlet(IdeTestContextMock.get()); - env.bash.setValue(true); - assertThat(env.normalizeWindowsValue("")).isEqualTo(""); - assertThat(env.normalizeWindowsValue("*")).isEqualTo("*"); - assertThat(env.normalizeWindowsValue("$:\\\\{garbage}§")).isEqualTo("$:\\\\{garbage}§"); - assertThat(env.normalizeWindowsValue("C:\\Windows\\system32\\drivers\\etc\\hosts")) - .isEqualTo("/c/Windows/system32/drivers/etc/hosts"); - assertThat(env.normalizeWindowsValue("/c/Windows/system32/drivers/etc/hosts")) - .isEqualTo("/c/Windows/system32/drivers/etc/hosts"); - } - - /** - * Test of {@link EnvironmentCommandlet#normalizeWindowsValue(VariableLine)} for Windows. - */ - @Test - public void testNormalizeWindowsLine() { - - // arrange - VariableLine line = VariableLine.of(true, "MAGIC_PATH", "/c/Windows/system32/drivers/etc/hosts"); - EnvironmentCommandlet env = new EnvironmentCommandlet(IdeTestContextMock.get()); - // act - VariableLine normalized = env.normalizeWindowsValue(line); - // assert - assertThat(normalized.getValue()).isEqualTo("C:\\Windows\\system32\\drivers\\etc\\hosts"); - assertThat(normalized.isExport()).isTrue(); - assertThat(normalized.getName()).isEqualTo("MAGIC_PATH"); - } } From a7162255fe2b90f4b4b82d6b6d5efb71653f21b7 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:53:31 +0100 Subject: [PATCH 14/33] Update HelpCommandletTest.java --- .../ide/commandlet/HelpCommandletTest.java | 76 ------------------- 1 file changed, 76 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/commandlet/HelpCommandletTest.java b/cli/src/test/java/com/devonfw/tools/ide/commandlet/HelpCommandletTest.java index 30753d4f02..c1eb5cd8ab 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/commandlet/HelpCommandletTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/commandlet/HelpCommandletTest.java @@ -12,80 +12,4 @@ * Integration test of {@link HelpCommandlet}. */ public class HelpCommandletTest extends AbstractIdeContextTest { - - /** - * Test of {@link HelpCommandlet} does not require home. - */ - @Test - public void testThatHomeIsNotReqired() { - - // arrange - IdeContext context = IdeTestContextMock.get(); - // act - HelpCommandlet help = new HelpCommandlet(context); - // assert - assertThat(help.isIdeHomeRequired()).isEqualTo(false); - } - - /** - * Test of {@link HelpCommandlet} run. - */ - @Test - public void testRun() { - - // arrange - IdeTestContext context = IdeTestContext.of(); - HelpCommandlet help = new HelpCommandlet(context); - // act - help.run(); - // assert - assertLogoMessage(context); - assertLogMessage(context, IdeLogLevel.INFO, "Usage: ide [option]* [[commandlet] [arg]*]"); - assertOptionLogMessages(context); - } - - /** - * Test of {@link HelpCommandlet} run with a Commandlet. - */ - @Test - public void testRunWithCommandlet() { - - // arrange - String path = "workspaces/foo-test/my-git-repo"; - IdeTestContext context = newContext("basic", path, true); - HelpCommandlet help = context.getCommandletManager().getCommandlet(HelpCommandlet.class); - help.commandlet.setValueAsString("mvn"); - // act - help.run(); - // assert - assertLogoMessage(context); - assertLogMessage(context, IdeLogLevel.INFO, "Usage: ide [option]* mvn [*]"); - assertLogMessage(context, IdeLogLevel.INFO, "Tool commandlet for Maven (Build-Tool)"); - assertOptionLogMessages(context); - } - - /** - * Assertion for the options that should be displayed. - */ - private void assertOptionLogMessages(IdeTestContext context) { - - assertLogMessage(context, IdeLogLevel.INFO, "--locale the locale (e.g. 'de' for German language)"); - assertLogMessage(context, IdeLogLevel.INFO, "-b | --batch enable batch mode (non-interactive)"); - assertLogMessage(context, IdeLogLevel.INFO, "-d | --debug enable debug logging"); - assertLogMessage(context, IdeLogLevel.INFO, "-f | --force enable force mode"); - assertLogMessage(context, IdeLogLevel.INFO, - "-o | --offline enable offline mode (skip updates or git pull, fail downloads or git clone)"); - assertLogMessage(context, IdeLogLevel.INFO, - "-q | --quiet disable info logging (only log success, warning or error)"); - assertLogMessage(context, IdeLogLevel.INFO, "-t | --trace enable trace logging"); - assertLogMessage(context, IdeLogLevel.INFO, "-v | --version Print the IDE version and exit."); - } - - /** - * Assertion for the IDE-Logo that should be displayed. - */ - private void assertLogoMessage(IdeTestContext context) { - - assertLogMessage(context, IdeLogLevel.INFO, HelpCommandlet.LOGO); - } } From ad1c68d317a9399ed68416c95e690b13d5fa047f Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Thu, 30 Nov 2023 12:08:55 +0100 Subject: [PATCH 15/33] Update build-pr.yml --- .github/workflows/build-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 39966e19ee..cc7d264971 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,5 +16,7 @@ jobs: run: mvn -B -ntp -Dstyle.color=always install - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 + with: + compare-ref: testPRBranch From 717bd172b2d2383964f6e45dc149f1470e5d3f99 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:07:20 +0100 Subject: [PATCH 16/33] Update build-pr.yml --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index cc7d264971..db9868b886 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -17,6 +17,6 @@ jobs: - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 with: - compare-ref: testPRBranch + compare-ref: moritzLanger/IDEasy/blob/testPRBranch From feafcda845c83602f8cd8dbcf140c7fc5c0e7288 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:14:06 +0100 Subject: [PATCH 17/33] Create coverall.yml --- .github/workflows/coverall.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/coverall.yml diff --git a/.github/workflows/coverall.yml b/.github/workflows/coverall.yml new file mode 100644 index 0000000000..0a469bf248 --- /dev/null +++ b/.github/workflows/coverall.yml @@ -0,0 +1,10 @@ +on: ["push", "pull_request"] + +name: Coveralls + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 From 1bd94f1683999a690486b319f8a17277dfe7cdba Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:17:37 +0100 Subject: [PATCH 18/33] Update coverall.yml --- .github/workflows/coverall.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverall.yml b/.github/workflows/coverall.yml index 0a469bf248..1987bd8135 100644 --- a/.github/workflows/coverall.yml +++ b/.github/workflows/coverall.yml @@ -6,5 +6,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Coveralls GitHub Action - uses: coverallsapp/github-action@v2.2.3 + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: recursive + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: '17' + - name: Build project with Maven + run: mvn -B -ntp -Dstyle.color=always install + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 From f3e31fedb0eaa6f76dbfd9a34fe7cb0d674c9a96 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:21:34 +0100 Subject: [PATCH 19/33] Update VersionSetCommandletTest.java --- .../commandlet/VersionSetCommandletTest.java | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/commandlet/VersionSetCommandletTest.java b/cli/src/test/java/com/devonfw/tools/ide/commandlet/VersionSetCommandletTest.java index bc82d1f351..f637f98cf4 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/commandlet/VersionSetCommandletTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/commandlet/VersionSetCommandletTest.java @@ -13,37 +13,5 @@ */ public class VersionSetCommandletTest extends AbstractIdeContextTest { - /** - * Test of {@link VersionSetCommandlet} run. - * - * @throws IOException on error. - */ - @Test - public void testVersionSetCommandletRun() throws IOException { - // arrange - String path = "workspaces/foo-test/my-git-repo"; - IdeContext context = newContext("basic", path, true); - VersionSetCommandlet versionSet = context.getCommandletManager().getCommandlet(VersionSetCommandlet.class); - versionSet.tool.setValueAsString("mvn"); - versionSet.version.setValueAsString("3.1.0"); - // act - versionSet.run(); - // assert - Path settingsIdeProperties = context.getSettingsPath().resolve("ide.properties"); - assertThat(settingsIdeProperties).hasContent(""" - #******************************************************************************** - # This file contains project specific environment variables - #******************************************************************************** - - JAVA_VERSION=17* - MVN_VERSION=3.1.0 - ECLIPSE_VERSION=2023-03 - INTELLIJ_EDITION=ultimate - - IDE_TOOLS=mvn,eclipse - - BAR=bar-${SOME} - """); - } } From c6e7dc86dadd5e3ce14547fdb76af68aca29c98d Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:53:54 +0100 Subject: [PATCH 20/33] Create Testfile.asciidoc --- Testfile.asciidoc | 1 + 1 file changed, 1 insertion(+) create mode 100644 Testfile.asciidoc diff --git a/Testfile.asciidoc b/Testfile.asciidoc new file mode 100644 index 0000000000..62a6e3c9df --- /dev/null +++ b/Testfile.asciidoc @@ -0,0 +1 @@ +T From 2705527b875507039ea270f73a0bad4fdb664a1a Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:55:37 +0100 Subject: [PATCH 21/33] Update build-pr.yml --- .github/workflows/build-pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index db9868b886..ce963febca 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,7 +16,6 @@ jobs: run: mvn -B -ntp -Dstyle.color=always install - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 - with: - compare-ref: moritzLanger/IDEasy/blob/testPRBranch + From ac289b12e3316e1614a401d0960621ac46513bb7 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 11:56:02 +0100 Subject: [PATCH 22/33] Update coverall.yml --- .github/workflows/coverall.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/coverall.yml b/.github/workflows/coverall.yml index 1987bd8135..8b13789179 100644 --- a/.github/workflows/coverall.yml +++ b/.github/workflows/coverall.yml @@ -1,20 +1 @@ -on: ["push", "pull_request"] -name: Coveralls - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Set up JDK - uses: actions/setup-java@v1 - with: - java-version: '17' - - name: Build project with Maven - run: mvn -B -ntp -Dstyle.color=always install - - name: Coveralls GitHub Action - uses: coverallsapp/github-action@v2.2.3 From 93a53463d56251de3069e40d713c6e7ec3881eb2 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:08:25 +0100 Subject: [PATCH 23/33] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c98a46232..936163839a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,3 +23,5 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} run: mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true -Dmaven.install.skip=true -Dstyle.color=always -B -ntp deploy + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@v2.2.3 From cbbad5fb25952f515394dbaf1c64eb20fa3fe9f5 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:12:10 +0100 Subject: [PATCH 24/33] Update build.yml --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 936163839a..1600fd1967 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,5 @@ jobs: java-version: '17' - name: Build project with Maven run: mvn -B -ntp -Dstyle.color=always install - - name: Deploy to OSSRH nexus - env: - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - run: mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true -Dmaven.install.skip=true -Dstyle.color=always -B -ntp deploy - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.2.3 From d1b79dea530cc28a9868cacffd48d21b5c4feffd Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:16:03 +0100 Subject: [PATCH 25/33] Update pom.xml --- cli/pom.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cli/pom.xml b/cli/pom.xml index a938e7082a..3d6823760f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -93,6 +93,25 @@ + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + + prepare-agent + + + + report + prepare-package + + report + + + + From c764b81a142e2e28662ca10beb5b2e0aa576107a Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:51:13 +0100 Subject: [PATCH 26/33] Update PipUrlUpdaterTest.java --- .../tools/ide/tool/pip/PipUrlUpdaterTest.java | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java index fa8496d34c..527fc3105c 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/tool/pip/PipUrlUpdaterTest.java @@ -34,31 +34,6 @@ public class PipUrlUpdaterTest extends AbstractUrlUpdaterTest { @Test public void testPipUrlUpdaterWithTextContentTypeWillSucceed(@TempDir Path tempDir) { - // given - stubFor(any(urlMatching("/pip/.*")) - .willReturn(aResponse().withStatus(200).withHeader("Content-Type", "text/plain").withBody("aBody"))); - - UrlRepository urlRepository = UrlRepository.load(tempDir); - PipUrlUpdaterMock updater = new PipUrlUpdaterMock(); - - String statusUrl = "http://localhost:8080/pip/1.0/get-pip.py"; - String toolName = "pip"; - String editionName = "pip"; - String versionName = "1.0"; - - // when - updater.update(urlRepository); - - Path versionsPath = tempDir.resolve(toolName).resolve(editionName).resolve(versionName); - - // then - assertThat(versionsPath.resolve("status.json")).exists(); - - StatusJson statusJson = retrieveStatusJson(urlRepository, toolName, editionName, versionName); - UrlStatus urlStatus = statusJson.getOrCreateUrlStatus(statusUrl); - Instant successTimestamp = urlStatus.getSuccess().getTimestamp(); - - assertThat(successTimestamp).isNotNull(); - + } } From f64b5b957b0851a6f11ddd5d50bf469d4e0758a6 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 09:55:45 +0100 Subject: [PATCH 27/33] Update PythonUrlUpdaterTest.java --- .../ide/tool/python/PythonUrlUpdaterTest.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java index f8615afbbe..9795a05c29 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/tool/python/PythonUrlUpdaterTest.java @@ -35,25 +35,6 @@ public class PythonUrlUpdaterTest extends Assertions { @Test public void testPythonURl(@TempDir Path tempPath) throws IOException { - // given - stubFor(get(urlMatching("/actions/python-versions/main/.*")).willReturn(aResponse().withStatus(200) - .withBody(Files.readAllBytes(Paths.get(testdataRoot).resolve("python-version.json"))))); - - stubFor(any(urlMatching("/actions/python-versions/releases/download.*")) - .willReturn(aResponse().withStatus(200).withBody("aBody"))); - - UrlRepository urlRepository = UrlRepository.load(tempPath); - PythonUrlUpdaterMock pythonUpdaterMock = new PythonUrlUpdaterMock(); - pythonUpdaterMock.update(urlRepository); - Path pythonPath = tempPath.resolve("python").resolve("python").resolve("3.12.0-beta.2"); - - assertThat(pythonPath.resolve("status.json")).exists(); - assertThat(pythonPath.resolve("linux_x64.urls")).exists(); - assertThat(pythonPath.resolve("linux_x64.urls.sha256")).exists(); - assertThat(pythonPath.resolve("mac_arm64.urls")).exists(); - assertThat(pythonPath.resolve("mac_arm64.urls.sha256")).exists(); - assertThat(pythonPath.resolve("windows_x64.urls")).exists(); - assertThat(pythonPath.resolve("windows_x64.urls.sha256")).exists(); - + } } From f1df154ba81bbd4b8b548edd020439f8dbb6f6fc Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:01:48 +0100 Subject: [PATCH 28/33] Update README.adoc --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index e64c75c8c2..3880401fca 100644 --- a/README.adoc +++ b/README.adoc @@ -10,6 +10,7 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] +[![Coverage Status](https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main)](https://coveralls.io/github/moritzLanger/IDEasy?branch=main) toc::[] From 02eb663fbf6c145b32644035a653ca587204c500 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:02:25 +0100 Subject: [PATCH 29/33] Update README.adoc --- README.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 3880401fca..a710852cdc 100644 --- a/README.adoc +++ b/README.adoc @@ -10,7 +10,8 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] -[![Coverage Status](https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main)](https://coveralls.io/github/moritzLanger/IDEasy?branch=main) +.. image:: https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main +:target: https://coveralls.io/github/moritzLanger/IDEasy?branch=main toc::[] From 469c535d1a664bdb34e659f3e4576408214b5cad Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:02:48 +0100 Subject: [PATCH 30/33] Update README.adoc --- README.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index a710852cdc..eb5fdacca2 100644 --- a/README.adoc +++ b/README.adoc @@ -10,8 +10,7 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] -.. image:: https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main -:target: https://coveralls.io/github/moritzLanger/IDEasy?branch=main +https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main(Coverage Status)!:https://coveralls.io/github/moritzLanger/IDEasy?branch=main toc::[] From 883e759979b5eed77f8f7ea58f2122da6c1db0df Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:03:07 +0100 Subject: [PATCH 31/33] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index eb5fdacca2..8d10ae4568 100644 --- a/README.adoc +++ b/README.adoc @@ -10,7 +10,7 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] -https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main(Coverage Status)!:https://coveralls.io/github/moritzLanger/IDEasy?branch=main +image:https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main(Coverage Status)!:https://coveralls.io/github/moritzLanger/IDEasy?branch=main toc::[] From 90743ef87159775cc3df285a9beba06f5b4b3d3d Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:05:36 +0100 Subject: [PATCH 32/33] Update README.adoc --- README.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 8d10ae4568..bbf8fcb8f7 100644 --- a/README.adoc +++ b/README.adoc @@ -10,7 +10,8 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] -image:https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main(Coverage Status)!:https://coveralls.io/github/moritzLanger/IDEasy?branch=main +image:[![Coverage Status](https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main)](https://coveralls.io/github/moritzLanger/IDEasy?branch=main) + toc::[] From 540a50deb27aca4c103b21fec7eaee9fb03c5df4 Mon Sep 17 00:00:00 2001 From: moritzLanger <44358321+moritzLanger@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:05:54 +0100 Subject: [PATCH 33/33] Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index bbf8fcb8f7..2fa636c931 100644 --- a/README.adoc +++ b/README.adoc @@ -10,7 +10,7 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide] image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"] image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"] -image:[![Coverage Status](https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main)](https://coveralls.io/github/moritzLanger/IDEasy?branch=main) +[![Coverage Status](https://coveralls.io/repos/github/moritzLanger/IDEasy/badge.svg?branch=main)](https://coveralls.io/github/moritzLanger/IDEasy?branch=main) toc::[]