Execute ITs in embedded mode by default (#3323)

slawekjaranowski · web-flow · commit 41bcd4c4c540 · 2026-03-15T15:08:04.000+01:00
* Execute ITs in embedded mode by default

* More memory for ITs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -49,6 +49,7 @@ public void jarShouldUseFile() {
     @Test
     public void jarNotForkingShouldUseFile() {
         unpack("surefire-855-failsafe-use-jar")
+                .setForkJvm()
                 .maven()
                 .sysProp("forkCount", 0)
                 .executeVerify()

Original file line number	Diff line number	Diff line change
`@@ -41,22 +41,22 @@ public void testCategoriesABForkAlways() {`
`41`	`41`
`42`	`42`	`@Test`
`43`	`43`	`public void testCategoriesACFullyQualifiedClassName() {`
`44`		`- runACFullyQualifiedClassName(unpacked());`
	`44`	`+ runACFullyQualifiedClassName(unpacked().setForkJvm());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Test`
`48`	`48`	`public void testCategoriesACFullyQualifiedClassNameForkAlways() {`
`49`		`- runACFullyQualifiedClassName(unpacked().forkAlways());`
	`49`	`+ runACFullyQualifiedClassName(unpacked().setForkJvm().forkAlways());`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Test`
`53`	`53`	`public void testCategoriesACClassNameSuffix() {`
`54`		`- runACClassNameSuffix(unpacked());`
	`54`	`+ runACClassNameSuffix(unpacked().setForkJvm());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
`58`	`58`	`public void testCategoriesACClassNameSuffixForkAlways() {`
`59`		`- runACClassNameSuffix(unpacked().forkAlways());`
	`59`	`+ runACClassNameSuffix(unpacked().setForkJvm().forkAlways());`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ protected Settings getSettings() {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`protected SurefireLauncher unpack() {`
`39`		`- return unpack("junit4-multiple-method-patterns", "_" + getSettings().path());`
	`39`	`+ return unpack("junit4-multiple-method-patterns", "_" + getSettings().path())`
	`40`	`+ .setForkJvm();`
`40`	`41`	`}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ protected Settings getSettings() {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`protected SurefireLauncher unpack() {`
`45`		`- return unpack("testng-multiple-method-patterns", "_" + getSettings().path());`
	`45`	`+ return unpack("testng-multiple-method-patterns", "_" + getSettings().path())`
	`46`	`+ .setForkJvm();`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`@Override`