diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 24d837339..48c3546d4 100644 --- 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 index 218102db3..b0d6576ae 100755 --- a/liberty-maven-plugin/src/it/dev-it/pom.xml +++ b/liberty-maven-plugin/src/it/dev-it/pom.xml @@ -58,7 +58,9 @@ -enableassertions ${project.build.directory} - **/*Test.java + **/*DevRecompileWithCustomExecutionIdTest.java + **/*DevRecompileWithDefaultExecutionIdTest.java + **/*DevTest.java @pom.version@ diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithCustomExecutionIdTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithCustomExecutionIdTest.java index 9bd123b66..c9f6bd2ea 100644 --- a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithCustomExecutionIdTest.java +++ b/liberty-maven-plugin/src/it/dev-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)); } } \ No newline at end of file diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithDefaultExecutionIdTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithDefaultExecutionIdTest.java index d7d2f7fb4..f714a4d68 100644 --- a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevRecompileWithDefaultExecutionIdTest.java +++ b/liberty-maven-plugin/src/it/dev-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)); } } \ No newline at end of file