Merge branch 'main' into devonfw#590-asciidoc

alfeilex · Oct 1, 2024 · 8e788d7 · 8e788d7
2 parents 3ea62ab + 00b7dd6
commit 8e788d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1 +1 @@
--Drevision=2024.09.002-beta-SNAPSHOT
+-Drevision=2024.09.003-beta-SNAPSHOT
diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/androidstudio/AndroidStudioTest.java
@@ -72,10 +72,9 @@ public void testAndroidStudioRun(String os, WireMockRuntimeInfo wmRuntimeInfo) t
     commandlet.run();
 
     // assert
+    checkInstallation(this.context);
     assertThat(commandlet.getToolBinPath().resolve("android-studio-test")).hasContent(
         ANDROID_STUDIO + " " + this.context.getSystemInfo().getOs() + " " + this.context.getWorkspacePath());
-
-    checkInstallation(this.context);
   }
 
   private void checkInstallation(IdeTestContext context) {

diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/intellij/IntellijTest.java
@@ -132,11 +132,9 @@ public void testIntellijRun(String os, WireMockRuntimeInfo wmRuntimeInfo) throws
     commandlet.run();
 
     // assert
-    SystemInfo currentSystemInfo = this.context.getSystemInfo();
-    Path workspacePath = this.context.getWorkspacePath();
-    assertThat(commandlet.getToolBinPath().resolve("intellijtest")).hasContent(
-        "intellij " + currentSystemInfo.getOs() + " " + workspacePath);
     checkInstallation(this.context);
+    assertThat(commandlet.getToolBinPath().resolve("intellijtest")).hasContent(
+        "intellij " + this.context.getSystemInfo().getOs() + " " + this.context.getWorkspacePath());
   }
 
   private void checkInstallation(IdeTestContext context) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-Drevision=2024.09.002-beta-SNAPSHOT
		-Drevision=2024.09.003-beta-SNAPSHOT