3.5.x/bug/cherry pick embedded mode its (#3328)

olamy · slawekjaranowski · web-flow · commit 0d5df8a3b460 · 2026-03-20T06:59:41.000+10:00
* Execute ITs in embedded mode by default (#3323) * Execute ITs in embedded mode by default * More memory for ITs * more forkJvm Signed-off-by: Olivier Lamy <olamy@apache.org> --------- Signed-off-by: Olivier Lamy <olamy@apache.org> Co-authored-by: Slawomir Jaranowski <s.jaranowski@gmail.com>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
@@ -216,7 +216,7 @@
               <forkCount>${its.forkCount}</forkCount>
               <threadCount>${its.threadCount}</threadCount>
               <perCoreThreadCount>false</perCoreThreadCount>
-              <argLine>-server -Xmx64m -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/AbstractFailFastIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
@@ -95,7 +95,7 @@ private OutputValidator prepare(String description, String profile, Map<String,
         if (failures != 0 || errors != 0) {
             launcher.withFailure();
         }
-
+        launcher.setForkJvm(true);
         return launcher.sysProp(properties).executeTest();
     }
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
@@ -64,6 +64,7 @@ protected SurefireLauncher prepare(String tests) {
                 throw new IllegalArgumentException(
                         "Unsupported configuration " + getSettings().getConfiguration());
         }
+        launcher.setForkJvm();
         return launcher;
     }
 
@@ -105,6 +106,7 @@ public void simpleNameTestAsParallel() {
         assumeThat(getSettings().getFramework(), anyOf(is(JUNIT47), is(TestNG)));
         prepare("TestTwo")
                 .parallel("classes")
+                .setForkJvm()
                 .useUnlimitedThreads()
                 .executeTest()
                 .verifyErrorFree(2)
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
@@ -55,6 +55,7 @@ public void shouldNotBeVerbose() throws Exception {
     @Test
     public void shouldBeVerbose() throws Exception {
         unpack("/testng-simple")
+                .setForkJvm()
                 .sysProp("testNgVersion", "5.10")
                 .sysProp("testNgClassifier", "jdk15")
                 .sysProp("surefire.testng.verbose", "10")
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("my pid is equal to pid 1 of the test", getMainPID(), pids[0]);
@@ -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("pid 1 is not the same as the main process' pid", pids[0], getMainPID());
     }
@@ -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("pid 1 is not the same as the main process' pid", pids[0], getMainPID());
     }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.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/JUnit4IgnoreIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
@@ -37,6 +37,7 @@ public void testJunit4Ignore() {
     @Test
     public void testJunit47ParallelIgnore() {
         unpack().setJUnitVersion("4.8.1")
+                .setForkJvm()
                 .parallelClasses()
                 .executeTest()
                 .verifyErrorFreeLog()
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
@@ -56,6 +56,6 @@ protected Settings getSettings() {
 
     @Override
     protected SurefireLauncher unpack() {
-        return unpack("junit48-multiple-method-patterns", "_" + settings.path());
+        return unpack("junit48-multiple-method-patterns", "_" + settings.path()).setForkJvm();
     }
 }
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();
     }
@@ -264,6 +268,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) {
@@ -318,7 +327,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/Surefire1211JUnitTestNgIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.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/Surefire809GroupExpressionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
@@ -29,8 +29,10 @@
 public class Surefire809GroupExpressionsIT extends SurefireJUnit4IntegrationTestCase {
     @Test
     public void categoryAB() {
-        OutputValidator validator =
-                unpackJUnit().groups("junit4.CategoryA AND junit4.CategoryB").executeTest();
+        OutputValidator validator = unpackJUnit()
+                .setForkJvm()
+                .groups("junit4.CategoryA AND junit4.CategoryB")
+                .executeTest();
         validator.verifyErrorFreeLog();
         validator.assertTestSuiteResults(2, 0, 0, 0);
         validator.verifyTextInLog("catA: 1");
@@ -45,6 +47,7 @@ public void categoryAB() {
     @Test
     public void incorrectJUnitVersions() {
         unpackJUnit()
+                .setForkJvm()
                 .setJUnitVersion("4.5")
                 .groups("junit4.CategoryA AND junit4.CategoryB")
                 .maven()
@@ -54,7 +57,8 @@ public void incorrectJUnitVersions() {
 
     @Test
     public void testJUnitRunCategoryNotC() {
-        OutputValidator validator = unpackJUnit().groups("!junit4.CategoryC").executeTest();
+        OutputValidator validator =
+                unpackJUnit().setForkJvm().groups("!junit4.CategoryC").executeTest();
         validator.verifyErrorFreeLog();
         validator.assertTestSuiteResults(5, 0, 0, 0);
         validator.verifyTextInLog("catA: 2");
@@ -67,7 +71,7 @@ public void testJUnitRunCategoryNotC() {
     @Test
     public void testExcludedGroups() {
         OutputValidator validator =
-                unpackJUnit().setExcludedGroups("junit4.CategoryC").executeTest();
+                unpackJUnit().setForkJvm().setExcludedGroups("junit4.CategoryC").executeTest();
         validator.verifyErrorFreeLog();
         validator.assertTestSuiteResults(5, 0, 0, 0);
         validator.verifyTextInLog("catA: 2");
@@ -79,8 +83,11 @@ public void testExcludedGroups() {
 
     @Test
     public void testNGRunCategoryAB() {
-        OutputValidator validator =
-                unpackTestNG().groups("CategoryA AND CategoryB").debugLogging().executeTest();
+        OutputValidator validator = unpackTestNG()
+                .setForkJvm()
+                .groups("CategoryA AND CategoryB")
+                .debugLogging()
+                .executeTest();
         validator.verifyErrorFreeLog();
         validator.assertTestSuiteResults(2, 0, 0, 0);
         validator.verifyTextInLog("BasicTest.testInCategoriesAB()");
@@ -90,7 +97,7 @@ public void testNGRunCategoryAB() {
     @Test
     public void testNGRunCategoryNotC() {
         OutputValidator validator =
-                unpackTestNG().groups("!CategoryC").debugLogging().executeTest();
+                unpackTestNG().setForkJvm().groups("!CategoryC").debugLogging().executeTest();
         validator.verifyErrorFreeLog();
         validator.assertTestSuiteResults(8, 0, 0, 0);
         validator.verifyTextInLog("catA: 2");
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
@@ -45,6 +45,7 @@ public void jarShouldUseFile() {
     @Test
     public void jarNotForkingShouldUseFile() {
         unpack("surefire-855-failsafe-use-jar")
+                .setForkJvm()
                 .maven()
                 .sysProp("forkCount", 0)
                 .executeVerify()
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
@@ -42,6 +42,7 @@ public void negativeTestShouldRunAllCategories() {
     @Test
     public void junit411ShouldRunExplicitCategory() {
         final OutputValidator outputValidator = unpack().addGoal("-Ppositive-tests")
+                .setForkJvm()
                 .sysProp("version.junit", "4.11")
                 .executeTest();
 
@@ -52,6 +53,7 @@ public void junit411ShouldRunExplicitCategory() {
     public void junit411ShouldExcludeExplicitCategory() {
         final OutputValidator outputValidator = unpack().addGoal("-Ppositive-tests-excluded-categories")
                 .sysProp("version.junit", "4.11")
+                .setForkJvm()
                 .executeTest();
         // SpecialCategorizedTest inherits the excluded annotation but should still run as
         // until junit 4.11, the Category annotation is not inherited
@@ -82,6 +84,7 @@ public void junit411ShouldIgnoreInheritedCategories() throws VerificationExcepti
                 .sysProp("version.junit", "4.11")
                 // AND the tests marked with CategoryB are marked for execution
                 .setGroups("jiras.surefire955.group.marker.CategoryB")
+                .setForkJvm()
                 // WHEN the tests are executed
                 .executeTest();
 
@@ -107,6 +110,7 @@ public void junit412ShouldExecuteInheritedCategories() {
                 .sysProp("version.junit", "4.12")
                 // AND the tests marked with CategoryB are marked for execution
                 .setGroups("jiras.surefire955.group.marker.CategoryB")
+                .setForkJvm()
                 // WHEN the tests are executed
                 .executeTest();
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private OutputValidator prepare(String description, String profile, Map<String,`
`95`	`95`	`if (failures != 0 \|\| errors != 0) {`
`96`	`96`	`launcher.withFailure();`
`97`	`97`	`}`
`98`		`-`
	`98`	`+ launcher.setForkJvm(true);`
`99`	`99`	`return launcher.sysProp(properties).executeTest();`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ protected SurefireLauncher prepare(String tests) {`
`64`	`64`	`throw new IllegalArgumentException(`
`65`	`65`	`"Unsupported configuration " + getSettings().getConfiguration());`
`66`	`66`	`}`
	`67`	`+ launcher.setForkJvm();`
`67`	`68`	`return launcher;`
`68`	`69`	`}`
`69`	`70`
`@@ -105,6 +106,7 @@ public void simpleNameTestAsParallel() {`
`105`	`106`	`assumeThat(getSettings().getFramework(), anyOf(is(JUNIT47), is(TestNG)));`
`106`	`107`	`prepare("TestTwo")`
`107`	`108`	`.parallel("classes")`
	`109`	`+ .setForkJvm()`
`108`	`110`	`.useUnlimitedThreads()`
`109`	`111`	`.executeTest()`
`110`	`112`	`.verifyErrorFree(2)`
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
`@@ -56,6 +56,6 @@ protected Settings getSettings() {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`protected SurefireLauncher unpack() {`
`59`		`- return unpack("junit48-multiple-method-patterns", "_" + settings.path());`
	`59`	`+ return unpack("junit48-multiple-method-patterns", "_" + settings.path()).setForkJvm();`
`60`	`60`	`}`
`61`	`61`	`}`