#207: refactor test folder structure (#211)

Author: MustaphaOuchen

.gitignore

@@ -7,6 +7,10 @@
 .*
 !.gitignore
 !.ide.software.version
+!.devon.software.version
+!.ide
+!.anyedit.properties
+!.ide.properties
 target/
 eclipse-target/
 generated/

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

@@ -32,46 +32,47 @@ public abstract class AbstractIdeContextTest extends Assertions {
   private static final int CHUNK_SIZE = 1024;
 
   /**
-   * @param projectName the (folder)name of the test project in {@link #PATH_PROJECTS}. E.g. "basic".
+   * @param projectTestCaseName the (folder)name of the project test case, in this folder a 'project' folder represents
+   *        the test project in {@link #PATH_PROJECTS}. E.g. "basic".
    * @return the {@link IdeTestContext} pointing to that project.
    */
-  protected IdeTestContext newContext(String projectName) {
+  protected IdeTestContext newContext(String projectTestCaseName) {
 
-    return newContext(projectName, null, true);
+    return newContext(projectTestCaseName, null, true);
   }
 
   /**
-   * @param projectName the (folder)name of the test project in {@link #PATH_PROJECTS}. E.g. "basic".
+   * @param projectTestCaseName the (folder)name of the project test case, in this folder a 'project' folder represents
+   *        the test project in {@link #PATH_PROJECTS}. E.g. "basic".
    * @param projectPath the relative path inside the test project where to create the context.
    * @return the {@link IdeTestContext} pointing to that project.
    */
-  protected static IdeTestContext newContext(String projectName, String projectPath) {
+  protected static IdeTestContext newContext(String projectTestCaseName, String projectPath) {
 
-    return newContext(projectName, projectPath, true);
+    return newContext(projectTestCaseName, projectPath, true);
   }
 
   /**
-   * @param projectName the (folder)name of the test project in {@link #PATH_PROJECTS}. E.g. "basic".
+   * @param projectTestCaseName the (folder)name of the project test case, in this folder a 'project' folder represents
+   *        the test project in {@link #PATH_PROJECTS}. E.g. "basic".
    * @param projectPath the relative path inside the test project where to create the context.
    * @param copyForMutation - {@code true} to create a copy of the project that can be modified by the test,
    *        {@code false} otherwise (only to save resources if you are 100% sure that your test never modifies anything
-   *        in that project.
+   *        in that project.)
    * @return the {@link IdeTestContext} pointing to that project.
    */
-  protected static IdeTestContext newContext(String projectName, String projectPath, boolean copyForMutation) {
+  protected static IdeTestContext newContext(String projectTestCaseName, String projectPath, boolean copyForMutation) {
 
-    Path sourceDir = PATH_PROJECTS.resolve(projectName);
-    Path userDir = sourceDir;
+    Path sourceDir = PATH_PROJECTS.resolve(projectTestCaseName);
+    Path userDir = sourceDir.resolve("project");
     IdeTestContext context;
     if (copyForMutation) {
-      Path projectDir = PATH_PROJECTS_COPY.resolve(projectName);
+      Path projectDir = PATH_PROJECTS_COPY.resolve(projectTestCaseName);
       FileAccess fileAccess = new FileAccessImpl(IdeTestContextMock.get());
       fileAccess.delete(projectDir);
       fileAccess.mkdirs(PATH_PROJECTS_COPY);
       fileAccess.copy(sourceDir, projectDir, FileCopyMode.COPY_TREE_OVERRIDE_TREE);
-      fileAccess.copy(PATH_PROJECTS.resolve(IdeContext.FOLDER_IDE), PATH_PROJECTS_COPY.resolve(IdeContext.FOLDER_IDE),
-          FileCopyMode.COPY_TREE_OVERRIDE_TREE);
-      userDir = projectDir;
+      userDir = projectDir.resolve("project");
     }
     if (projectPath != null) {
       userDir = userDir.resolve(projectPath);

cli/src/test/java/com/devonfw/tools/ide/merge/DirectoryMergerTest.java

@@ -17,8 +17,8 @@
  */
 public class DirectoryMergerTest extends AbstractIdeContextTest {
 
-  private static final String IDE_HOME = PATH_PROJECTS.resolve(PROJECT_BASIC).toAbsolutePath().toString().replace('\\',
-      '/');
+  private static final String IDE_HOME = PATH_PROJECTS.resolve(PROJECT_BASIC).resolve("project").toAbsolutePath()
+      .toString().replace('\\', '/');
 
   private static final Prop JAVA_VERSION = new Prop("java.version", "1.11");
 

cli/src/test/resources/ide-projects/_ide/urls/mvn/secondMvnEdition/.gitkeep

@@ -0,0 +1,10 @@
+
+  "manual" : false,
+  "urls" : {
+    "-997329125" : {
+      "success" : {
+        "timestamp" : "2023-04-28T07:12:26.601818Z"
+      }
+    }
+  }
+}

cli/src/test/resources/ide-projects/_ide/software/default/az/az/testVersion/.ide.software.version cli/src/test/resources/ide-projects/basic/_ide/software/default/az/az/testVersion/.ide.software.version

@@ -0,0 +1 @@
+this is the IDE_HOME directory

cli/src/test/resources/ide-projects/_ide/software/readme cli/src/test/resources/ide-projects/basic/_ide/software/readme

@@ -1 +1 @@
-this is the IDE_HOME directory
+this is the IDE_ROOT directory