This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 41bcd4c4c Execute ITs in embedded mode by default (#3323)
41bcd4c4c is described below
commit 41bcd4c4c540be81bde9734e7e097e07b8381203
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Sun Mar 15 15:08:04 2026 +0100
Execute ITs in embedded mode by default (#3323)
* Execute ITs in embedded mode by default
* More memory for ITs
---
surefire-its/pom.xml | 5 +----
.../apache/maven/surefire/its/CheckTestNgReportTestIT.java | 1 +
.../test/java/org/apache/maven/surefire/its/ForkCountIT.java | 9 +++++----
.../apache/maven/surefire/its/JUnit448TestCategoriesIT.java | 8 ++++----
.../maven/surefire/its/TestMultipleMethodPatternsIT.java | 3 ++-
.../its/TestMultipleMethodPatternsIncludesExcludesIT.java | 3 ++-
.../TestMultipleMethodPatternsTestNGIncludesExcludesIT.java | 3 ++-
.../its/TestMultipleMethodPatternsTestNGIncludesIT.java | 3 ++-
.../org/apache/maven/surefire/its/fixture/MavenLauncher.java | 11 ++++++++++-
.../surefire/its/jiras/Surefire1053SystemPropertiesIT.java | 3 ++-
.../maven/surefire/its/jiras/Surefire1211JUnit4TestNgIT.java | 6 +++++-
.../jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java | 4 +++-
.../its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java | 1 +
13 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index b25b4498b..5799470bf 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -221,9 +221,6 @@
<profiles>
<profile>
<id>run-its</id>
- <properties>
- <verifier.forkMode>forked</verifier.forkMode>
- </properties>
<build>
<plugins>
<plugin>
@@ -240,7 +237,7 @@
<forkCount>${its.forkCount}</forkCount>
<threadCount>${its.threadCount}</threadCount>
<perCoreThreadCount>false</perCoreThreadCount>
- <argLine>-Xmx128m -XX:+UseG1GC -XX:+TieredCompilation
-XX:TieredStopAtLevel=1 -Djava.awt.headless=true
-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+ <argLine>-Xmx512m -XX:+UseG1GC -Djava.awt.headless=true
-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
<!-- Pass current surefire version to the main suite so that it
-->
<!-- can forward to all integration test projects. SUREFIRE-513
-->
<systemPropertyVariables>
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
index eeb759d84..df317c020 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
@@ -60,6 +60,7 @@ public void shouldBeVerbose() throws Exception {
// JUnit 6.0.0 requires Java 17+
assumeJavaVersion(17);
unpack("/testng-simple")
+ .setForkJvm()
.sysProp("testNgVersion", "6.14.3")
.sysProp("surefire.testng.verbose", "15")
.executeTest()
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkCountIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkCountIT.java
index fea88676e..d2ac7073a 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkCountIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkCountIT.java
@@ -49,7 +49,7 @@ public static void installDumpPidPlugin() {
@Test
public void testForkNever() {
- String[] pids = doTest(unpack(getProject()).forkNever());
+ String[] pids = doTest(unpack(getProject()).setForkJvm().forkNever());
assertSamePids(pids);
assertEndWith(pids, "_1_1", 3);
assertEquals(getMainPID(), pids[0], "my pid is equal to pid 1 of the
test");
@@ -69,6 +69,7 @@ public void testForkOncePerThreadSingleThread() {
public void testForkOncePerThreadTwoThreads() {
int threadCount = 2;
String[] pids = doTest(unpack(getProject())
+ .setForkJvm()
.forkPerThread(threadCount)
.threadCount(threadCount)
.addGoal("-DsleepLength=7200"));
@@ -102,8 +103,8 @@ public void testForkCountTwoNoReuse() {
@Test
public void testForkCountTwoReuse() {
- String[] pids =
-
doTest(unpack(getProject()).forkCount(2).reuseForks(true).addGoal("-DsleepLength=7200"));
+ String[] pids = doTest(
+
unpack(getProject()).setForkJvm().forkCount(2).reuseForks(true).addGoal("-DsleepLength=7200"));
assertDifferentPids(pids, 2);
assertNotEquals(pids[0], getMainPID(), "pid 1 is not the same as the
main process' pid");
}
@@ -126,7 +127,7 @@ private void assertDifferentPids(String[] pids, int
numOfDifferentPids) {
@Test
public void testForkOnce() {
- String[] pids = doTest(unpack(getProject()).forkOnce());
+ String[] pids = doTest(unpack(getProject()).setForkJvm().forkOnce());
assertSamePids(pids);
assertNotEquals(pids[0], getMainPID(), "pid 1 is not the same as the
main process' pid");
}
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit448TestCategoriesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit448TestCategoriesIT.java
index d46e81542..c25ca8ace 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit448TestCategoriesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit448TestCategoriesIT.java
@@ -41,22 +41,22 @@ public void testCategoriesABForkAlways() {
@Test
public void testCategoriesACFullyQualifiedClassName() {
- runACFullyQualifiedClassName(unpacked());
+ runACFullyQualifiedClassName(unpacked().setForkJvm());
}
@Test
public void testCategoriesACFullyQualifiedClassNameForkAlways() {
- runACFullyQualifiedClassName(unpacked().forkAlways());
+ runACFullyQualifiedClassName(unpacked().setForkJvm().forkAlways());
}
@Test
public void testCategoriesACClassNameSuffix() {
- runACClassNameSuffix(unpacked());
+ runACClassNameSuffix(unpacked().setForkJvm());
}
@Test
public void testCategoriesACClassNameSuffixForkAlways() {
- runACClassNameSuffix(unpacked().forkAlways());
+ runACClassNameSuffix(unpacked().setForkJvm().forkAlways());
}
@Test
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
index 8f4ac2dad..fd6338276 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
@@ -36,6 +36,7 @@ protected Settings getSettings() {
@Override
protected SurefireLauncher unpack() {
- return unpack("junit4-multiple-method-patterns", "_" +
getSettings().path());
+ return unpack("junit4-multiple-method-patterns", "_" +
getSettings().path())
+ .setForkJvm();
}
}
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIncludesExcludesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIncludesExcludesIT.java
index 6fa14ee8a..fe9fb153b 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIncludesExcludesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIncludesExcludesIT.java
@@ -36,6 +36,7 @@ protected Settings getSettings() {
@Override
protected SurefireLauncher unpack() {
- return unpack("junit4-multiple-method-patterns", "_" +
getSettings().path());
+ return unpack("junit4-multiple-method-patterns", "_" +
getSettings().path())
+ .setForkJvm();
}
}
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesExcludesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesExcludesIT.java
index 4ec9691b8..c2ba954c0 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesExcludesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesExcludesIT.java
@@ -42,7 +42,8 @@ protected Settings getSettings() {
@Override
protected SurefireLauncher unpack() {
- return unpack("testng-multiple-method-patterns", "_" +
getSettings().path());
+ return unpack("testng-multiple-method-patterns", "_" +
getSettings().path())
+ .setForkJvm();
}
@Override
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesIT.java
index be8c0a134..f56446135 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIncludesIT.java
@@ -42,7 +42,8 @@ protected Settings getSettings() {
@Override
protected SurefireLauncher unpack() {
- return unpack("testng-multiple-method-patterns", "_" +
getSettings().path());
+ return unpack("testng-multiple-method-patterns", "_" +
getSettings().path())
+ .setForkJvm();
}
@Override
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 8e207e8ef..463d8b46e 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -69,11 +69,15 @@ public final class MavenLauncher {
private boolean expectFailure;
+ private boolean forkJvm;
+
MavenLauncher(Class<?> testClass, String resourceName, String suffix,
String[] cli) {
this.testCaseBeingRun = testClass;
this.resourceName = resourceName;
this.suffix = suffix != null ? suffix : "";
this.cli = cli == null ? null : cli.clone();
+ // by default use embedded mode
+ this.forkJvm = false;
resetGoals();
resetCliOptions();
}
@@ -265,6 +269,11 @@ public OutputValidator executeCurrentGoals() {
getVerifier().addCliArguments(goals.toArray(new String[] {}));
getVerifier().setSystemProperties(props);
getVerifier().setEnvironmentVariables(envVars);
+ if (envVars.isEmpty()) {
+ getVerifier().setForkJvm(forkJvm);
+ } else {
+ getVerifier().setForkJvm(true);
+ }
getVerifier().execute();
return getValidator();
} catch (VerificationException e) {
@@ -319,7 +328,7 @@ public OutputValidator getValidator() {
}
public void setForkJvm(boolean forkJvm) {
- getVerifier().setForkJvm(forkJvm);
+ this.forkJvm = forkJvm;
}
public String getLocalRepository() {
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
index 3f006f501..591ff5ffe 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
@@ -33,7 +33,8 @@
public class Surefire1053SystemPropertiesIT extends
SurefireJUnit4IntegrationTestCase {
@Test
public void checkWarningsFileEncoding() {
- unpack().sysProp("file.encoding", "ISO-8859-1")
+ unpack().setForkJvm()
+ .sysProp("file.encoding", "ISO-8859-1")
.executeTest()
.verifyErrorFree(1)
.verifyTextInLog("file.encoding cannot be set as system
property, use <argLine>-D"
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnit4TestNgIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnit4TestNgIT.java
index da02bed6f..bc54bc744 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnit4TestNgIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnit4TestNgIT.java
@@ -36,7 +36,11 @@ public void withJUnit() {
@Test
public void withoutJUnit() {
- unpack().threadCount(1).sysProp("junit",
"false").executeTest().verifyErrorFree(1);
+ unpack().setForkJvm()
+ .threadCount(1)
+ .sysProp("junit", "false")
+ .executeTest()
+ .verifyErrorFree(1);
}
private SurefireLauncher unpack() {
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
index 3c634c3ce..982dade82 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
@@ -33,7 +33,8 @@ public class Surefire1534ReuseForksFalseWithJavaModuleIT
extends AbstractJava9Pl
@Test
public void testExecuteWithReuseForksFalseWithJavaModule() {
- OutputValidator validator =
assumeJava9().reuseForks(false).forkCount(1).executeTest();
+ OutputValidator validator =
+
assumeJava9().setForkJvm().reuseForks(false).forkCount(1).executeTest();
validator.assertTestSuiteResults(2, 0, 0, 0);
validator.verifyErrorFreeLog();
@@ -49,6 +50,7 @@ public void testExecuteWithReuseForksFalseWithJavaModule() {
@Test
public void testExecuteWithReuseForksFalseWithJavaModuleWithFilter() {
OutputValidator validator = assumeJava9()
+ .setForkJvm()
.reuseForks(false)
.forkCount(1)
.setTestToRun("MainTest")
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
index 7b66d2df0..2065bacec 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
@@ -49,6 +49,7 @@ public void jarShouldUseFile() {
@Test
public void jarNotForkingShouldUseFile() {
unpack("surefire-855-failsafe-use-jar")
+ .setForkJvm()
.maven()
.sysProp("forkCount", 0)
.executeVerify()
