Merge branch 'main' into enhancement/1024-move-urls-to-url-updater

# Conflicts:
#	cli/src/test/resources/ide-projects/basic/project/home/environment.properties

cli/src/test/java/com/devonfw/tools/ide/completion/CompleteTest.java

@@ -10,14 +10,14 @@
 import com.devonfw.tools.ide.commandlet.Commandlet;
 import com.devonfw.tools.ide.commandlet.ContextCommandlet;
 import com.devonfw.tools.ide.context.AbstractIdeContext;
-import com.devonfw.tools.ide.context.IdeContextTest;
+import com.devonfw.tools.ide.context.AbstractIdeContextTest;
 import com.devonfw.tools.ide.property.KeywordProperty;
 import com.devonfw.tools.ide.property.Property;
 
 /**
  * Test of {@link AbstractIdeContext#complete(CliArguments, boolean) auto-completion}.
  */
-public class CompleteTest extends IdeContextTest {
+public class CompleteTest extends AbstractIdeContextTest {
 
   /** Test of {@link AbstractIdeContext#complete(CliArguments, boolean) auto-completion} for empty input. */
   @Test

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

@@ -40,8 +40,8 @@ public void testBasicProjectEnvironment() {
     assertThat(context.getWorkspacePath().resolve("readme")).hasContent("this is the foo-test workspace of basic");
     SystemPath systemPath = IdeVariables.PATH.get(context);
     assertThat(systemPath).isSameAs(context.getPath());
-    String envPath = context.getIdeRoot().resolve("_ide").resolve("bin").toString();
-    assertThat(systemPath.toString()).isNotEqualTo(envPath).endsWith(envPath);
+    String javaPath = context.getSoftwarePath().resolve("java").resolve("bin").toString();
+    assertThat(systemPath.toString()).isNotEqualTo(javaPath).contains(javaPath);
     Path softwarePath = context.getSoftwarePath();
     Path javaBin = softwarePath.resolve("java/bin");
     assertThat(systemPath.getPath("java")).isEqualTo(javaBin);