making changes to not use temp folder for new tests

Signed-off-by: Arun Venmany <[email protected]>
arunvenmany-ibm · Jan 15, 2025 · c1fc05a · c1fc05a
1 parent bb1ec32
commit c1fc05a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseDevTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseDevTest.java
@@ -151,6 +151,58 @@ protected static void setUpBeforeClass(String params, String projectRoot, boolea
       }
    }
 
+   /**
+    * Setup and optionally start dev/run
+    *
+    * @param params Params for the dev/run goal
+    * @param projectRoot The Maven project root
+    * @param isDevMode Use dev if true, use run if false.  Ignored if startProcessDuringSetup is false.
+    * @param startProcessDuringSetup If this method should start the actual dev/run process
+    * @param libertyConfigModule For multi module project, the module where Liberty configuration is located
+    * @param pomModule For multi module project, the module where the pom is located.  If null, use the project root.
+    * @throws IOException
+    * @throws InterruptedException
+    * @throws FileNotFoundException
+    */
+   protected static void setUpBeforeClassWithoutTemp(String params, String projectRoot, boolean isDevMode, boolean startProcessDuringSetup, String libertyConfigModule, String pomModule) throws IOException, InterruptedException, FileNotFoundException {
+      customLibertyModule = libertyConfigModule;
+      customPomModule = pomModule;
+
+      basicDevProj = new File(projectRoot);
+
+      tempProj = basicDevProj;
+      assertTrue("temp directory does not exist", tempProj.exists());
+
+      assertTrue(projectRoot+" directory does not exist", basicDevProj.exists());
+
+      assertTrue("temp directory does not contain expected copied files from "+projectRoot, tempProj.listFiles().length > 0);
+
+      // in case cleanup was not successful, try to delete the various log files so we can proceed
+      logFile = new File(basicDevProj, "logFile.txt");
+      if (logFile.exists()) {
+         assertTrue("Could not delete log file: "+logFile.getCanonicalPath(), logFile.delete());
+      }
+      assertTrue("log file already existed: "+logFile.getCanonicalPath(), logFile.createNewFile());
+      logErrorFile = new File(basicDevProj, "logErrorFile.txt");
+      if (logErrorFile.exists()) {
+         assertTrue("Could not delete logError file: "+logErrorFile.getCanonicalPath(), logErrorFile.delete());
+      }
+      assertTrue("logError file already existed: "+logErrorFile.getCanonicalPath(), logErrorFile.createNewFile());
+
+      if (customPomModule == null) {
+         pom = new File(tempProj, "pom.xml");
+      } else {
+         pom = new File(new File(tempProj, customPomModule), "pom.xml");
+      }
+      assertTrue(pom.getCanonicalPath()+" file does not exist", pom.exists());
+
+      replaceVersion();
+
+      if (startProcessDuringSetup) {
+         startProcess(params, isDevMode);
+      }
+   }
+
    protected static void startProcess(String params, boolean isDevMode) throws IOException, InterruptedException, FileNotFoundException {
       startProcess(params, isDevMode, "mvn liberty:");
    }

diff --git a/...ev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithCustomExecutionIdTest.java b/...ev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithCustomExecutionIdTest.java
@@ -36,7 +36,7 @@ public class DevRecompileWithCustomExecutionIdTest extends BaseDevTest {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-        setUpBeforeClass(null, "../resources/basic-dev-project-with-execution-id", true, false, null, null);
+        setUpBeforeClassWithoutTemp(null, "../resources/basic-dev-project-with-execution-id", true, false, null, null);
         startProcess(null, true, "mvn compile liberty:", true);
     }
 

diff --git a/...v-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithDefaultExecutionIdTest.java b/...v-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithDefaultExecutionIdTest.java
@@ -36,7 +36,7 @@ public class DevRecompileWithDefaultExecutionIdTest extends BaseDevTest {
 
    @BeforeClass
    public static void setUpBeforeClass() throws Exception {
-      setUpBeforeClass(null, "../resources/basic-dev-project-with-default-execution-id", true, false, null, null);
+      setUpBeforeClassWithoutTemp(null, "../resources/basic-dev-project-with-default-execution-id", true, false, null, null);
       startProcess(null, true, "mvn compile liberty:", true);
    }