devonfw#103: fixed merge issues

added missing answers param to newContext

Author: jan-vcapgemini

cli/src/test/java/com/devonfw/tools/ide/context/AbstractIdeContextTest.java

@@ -62,7 +62,8 @@ protected static IdeTestContext newContext(String projectTestCaseName, String pr
    * @param answers the answers to use for the {@link IdeTestContext}.
    * @return the {@link IdeTestContext} pointing to that project.
    */
-  protected static IdeTestContext newContext(String projectTestCaseName, String projectPath, boolean copyForMutation) {
+  protected static IdeTestContext newContext(String projectTestCaseName, String projectPath, boolean copyForMutation,
+      String... answers) {
 
     Path sourceDir = PATH_PROJECTS.resolve(projectTestCaseName);
     Path userDir = sourceDir.resolve("project");

cli/src/test/java/com/devonfw/tools/ide/tool/ToolCommandletTest.java

@@ -3,6 +3,8 @@
 import java.nio.file.Path;
 import java.util.List;
 
+import org.junit.jupiter.api.Test;
+
 import com.devonfw.tools.ide.context.AbstractIdeContextTest;
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.context.IdeTestContext;
@@ -11,7 +13,6 @@
 import com.devonfw.tools.ide.url.model.file.UrlSecurityJsonFile;
 import com.devonfw.tools.ide.version.VersionIdentifier;
 import com.devonfw.tools.ide.version.VersionRange;
-import org.junit.jupiter.api.Test;
 
 /** Test of {@link ToolCommandlet} */
 public class ToolCommandletTest extends AbstractIdeContextTest {