making workflow and pom changes to test only dev test

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

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -70,7 +70,7 @@ jobs:
       run: ./mvnw -V verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogsOnFailures"=true -D"invoker.test"="*setup*,*springboot-3-*,*compile-jsp-source-17-*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
     # Run tests
     - name: Run tests
-      run: ./mvnw -V verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogsOnFailures"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
+      run: ./mvnw -V verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogsOnFailures"=true -D"invoker.test"="*dev-it*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
 
 # WINDOWS BUILD
   build-windows:

diff --git a/liberty-maven-plugin/src/it/dev-it/pom.xml b/liberty-maven-plugin/src/it/dev-it/pom.xml
@@ -58,7 +58,9 @@
                     <argLine>-enableassertions</argLine>
                     <workingDirectory>${project.build.directory}</workingDirectory>
                     <includes>
-                        <include>**/*Test.java</include>
+                        <include>**/*DevRecompileWithCustomExecutionIdTest.java</include>
+                        <include>**/*DevRecompileWithDefaultExecutionIdTest.java</include>
+                        <include>**/*DevTest.java</include>
                     </includes>
                     <systemPropertyVariables>
                         <mavenPluginVersion>@pom.version@</mavenPluginVersion>

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,19 +36,19 @@ public class DevRecompileWithCustomExecutionIdTest extends BaseDevTest {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
-        setUpBeforeClass(null, "../resources/basic-dev-project-with-execution-id", false, false, null, null);
-        startProcess(null, false, "mvn compile liberty:", false);
+        setUpBeforeClass(null, "../resources/basic-dev-project-with-execution-id", true, false, null, null);
+        startProcess(null, true, "mvn compile liberty:", true);
     }
 
     @AfterClass
     public static void cleanUpAfterClass() throws Exception {
-        BaseDevTest.cleanUpAfterClass(false, false);
+        BaseDevTest.cleanUpAfterClass(true, true);
     }
 
     @Test
     public void validateRunExecutionNotSkipped() throws Exception {
         //java-compile is the custom execution id
-        assertTrue(verifyLogMessageExists("Running maven-compiler-plugin:compile#java-compile", 120000));
-        assertTrue(verifyLogMessageExists("Nothing to compile - all classes are up to date.", 120000));
+        assertTrue(getLogTail(), verifyLogMessageExists("Running maven-compiler-plugin:compile#java-compile", 120000));
+        assertTrue(getLogTail(), verifyLogMessageExists("Nothing to compile - all classes are up to date.", 120000));
     }
 }
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,20 +36,20 @@ public class DevRecompileWithDefaultExecutionIdTest extends BaseDevTest {
 
    @BeforeClass
    public static void setUpBeforeClass() throws Exception {
-      setUpBeforeClass(null, "../resources/basic-dev-project-with-default-execution-id", false, false, null, null);
-      startProcess(null, false, "mvn compile liberty:", false);
+      setUpBeforeClass(null, "../resources/basic-dev-project-with-default-execution-id", true, false, null, null);
+      startProcess(null, true, "mvn compile liberty:", true);
    }
 
    @AfterClass
    public static void cleanUpAfterClass() throws Exception {
-      BaseDevTest.cleanUpAfterClass(false, false);
+      BaseDevTest.cleanUpAfterClass(true, true);
    }
 
    @Test
    public void validateRunExecutionNotSkipped() throws Exception {
-      assertTrue(verifyLogMessageExists("Nothing to compile - all classes are up to date.", 120000));
       // Check that the correct execution id is picked up
       // in this case, we are not passing any execution id in pom.xml, hence default execution id will be taken up
-      assertTrue(verifyLogMessageExists("Running maven-compiler-plugin:compile#default-compile", 120000));
+      assertTrue(getLogTail(), verifyLogMessageExists("Running maven-compiler-plugin:compile#default-compile", 120000));
+      assertTrue(getLogTail(), verifyLogMessageExists("Nothing to compile - all classes are up to date.", 120000));
    }
 }