devonfw#608: implemented requested changes

removed hacks
jan-vcapgemini · Oct 30, 2024 · c7f2c55 · c7f2c55
1 parent c39829e
commit c7f2c55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/jmc/JmcTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/jmc/JmcTest.java
@@ -11,7 +11,6 @@
 import com.devonfw.tools.ide.context.IdeTestContext;
 import com.devonfw.tools.ide.os.SystemInfo;
 import com.devonfw.tools.ide.os.SystemInfoMock;
-import com.devonfw.tools.ide.process.ProcessMode;
 
 /**
  * Integration test of {@link Jmc}.
@@ -59,9 +58,10 @@ public void testJmcRun(String os) {
     context.setSystemInfo(systemInfo);
     Jmc commandlet = new Jmc(context);
 
+    commandlet.arguments.addValue("foo");
+    commandlet.arguments.addValue("bar");
     // act
-    // hack to log output of test script execution. Original processMode was BACKGROUND.
-    commandlet.runTool(ProcessMode.DEFAULT, null, "foo", "bar");
+    commandlet.run();
 
     // assert
     assertThat(context).logAtInfo().hasEntries("java jmc", "jmc " + os + " foo bar");

diff --git a/cli/src/test/java/com/devonfw/tools/ide/tool/tomcat/TomcatTest.java b/cli/src/test/java/com/devonfw/tools/ide/tool/tomcat/TomcatTest.java
@@ -8,7 +8,6 @@
 import com.devonfw.tools.ide.context.IdeTestContext;
 import com.devonfw.tools.ide.log.IdeLogEntry;
 import com.devonfw.tools.ide.log.IdeLogLevel;
-import com.devonfw.tools.ide.process.ProcessMode;
 import com.devonfw.tools.ide.tool.java.Java;
 
 /**
@@ -38,9 +37,9 @@ public void testTomcat() {
     Path javaTomcatPath = context.getToolRepositoryPath().resolve("default").resolve("java").resolve("java").resolve(javaVersionTomcat);
 
     // act
-    // hack to capture output of test script. Original processMode was BACKGROUND.
-    javaCommandlet.runTool(ProcessMode.DEFAULT, null, "--version");
-    tomcatCommandlet.runTool(ProcessMode.DEFAULT, null);
+    javaCommandlet.arguments.addValue("--version");
+    javaCommandlet.run();
+    tomcatCommandlet.run();
 
     // assert
     assertThat(context.getSoftwarePath().resolve("java/.ide.software.version")).exists().hasContent(javaVersionProject);