GROOVY-11997: Add @ForkedJvm and @ExpectedToFail JUnit extensions to groovy-test-junit6 (additional tests converted)

Author: paulk-asert

.github/workflows/groovy-build-test.yml

@@ -36,6 +36,9 @@ jobs:
             env-no-color: '1'
           - java: 17
             os: macos-latest
+          - java: 25
+            os: ubuntu-latest
+            junit-network: '-Djunit.network=true'
     runs-on: ${{ matrix.os }}
     env:
       NO_COLOR: ${{ matrix.env-no-color }}
@@ -55,7 +58,7 @@ jobs:
       - name: "🔍 Setup TestLens"
         uses: testlens-app/setup-testlens@v1
       - name: "🏃Test with Gradle"
-        run: ./gradlew test -Ptarget.java.home="$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}"
+        run: ./gradlew test ${{ matrix.junit-network }} -Ptarget.java.home="$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}"
         shell: bash
         timeout-minutes: 60
       - name: "🚀Upload reports"

build-logic/src/main/groovy/org.apache.groovy-tested.gradle

@@ -177,6 +177,22 @@ Closure buildExcludeFilter(boolean legacyTestSuite) {
     }
 }
 
+// Warn (rather than silently NO-SOURCE) when the groovy/grape exclusion
+// swallows the entirety of a project's test source set. A plain
+// `:groovy-grape-test:test` invocation otherwise reports BUILD SUCCESSFUL
+// with zero tests executed — easy to mistake for a passing run.
+afterEvaluate {
+    if (!providers.systemProperty('junit.network').getOrNull()) {
+        boolean hasGrapeTests = sourceSets.test.allSource.srcDirs.any {
+            new File(it, 'groovy/grape').isDirectory()
+        }
+        if (hasGrapeTests) {
+            String testPath = (project.path == ':' ? '' : project.path) + ':test'
+            logger.warn("WARNING: ${testPath} will skip groovy/grape/* tests; set -Djunit.network=true to include them")
+        }
+    }
+}
+
 interface TestServices {
     @javax.inject.Inject
     FileSystemOperations getFileSystemOperations()

src/test/groovy/bugs/Groovy11046.groovy

@@ -18,6 +18,7 @@
  */
 package bugs
 
+import groovy.junit6.plugin.ForkedJvm
 import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
@@ -35,12 +36,15 @@ final class Groovy11046 {
     }
 
     @Test
+    @ForkedJvm(systemProperties = [
+            'Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector'])
     void testMissingDependency2() {
+        // Log4jContextSelector is read by log4j at class-load time, so it must
+        // be set on the JVM command line — we run in a forked child to keep
+        // the rest of the suite from inheriting log4j routing changes.
         def err = shouldFail '''
             @Grab('org.apache.logging.log4j:log4j-core:2.22.0')
             org.apache.logging.log4j.core.async.AsyncLogger log
-            System.setProperty('Log4jContextSelector',
-                'org.apache.logging.log4j.core.async.AsyncLoggerContextSelector')
             log = org.apache.logging.log4j.LogManager.getLogger(getClass()) //XXX
         '''
         assert err instanceof NoClassDefFoundError // CompilationFailedException (previously)

src/test/groovy/groovy/grape/GrabResolverTest.groovy

@@ -18,29 +18,29 @@
  */
 package groovy.grape
 
+import groovy.junit6.plugin.ForkedJvm
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilationFailedException
-import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
 import static groovy.test.GroovyAssert.shouldFail
 
 @CompileStatic
+@ForkedJvm(inheritProperties = ['grape.root', 'user.home', 'gradle.home'])
 final class GrabResolverTest {
 
-    private static String originalGrapeRoot
-
-    @BeforeAll
-    static void setUpTestSuite() {
-        originalGrapeRoot = System.getProperty('grape.root')
-    }
-
     @BeforeEach @CompileDynamic
     void setUp() {
+        // Lifecycle hooks fire in BOTH the parent test JVM and each forked
+        // child; the parent never runs the test bodies, so its Grape state
+        // and grape.root must stay untouched. The previous BeforeAll/AfterAll
+        // save/restore dance becomes redundant once nothing in the parent
+        // mutates grape.root.
+        if (!Boolean.parseBoolean(System.getProperty('groovy.junit6.forked'))) return
+
         Grape.@instance = null // isolate each test
 
         // create a new grape root directory for each test for isolation
@@ -62,17 +62,6 @@ final class GrabResolverTest {
         }
     }
 
-    @AfterAll
-    static void tearDownTestSuite() {
-        if (originalGrapeRoot == null) {
-            System.clearProperty('grape.root')
-        } else {
-            System.setProperty('grape.root', originalGrapeRoot)
-        }
-
-        Grape.@instance = null // isolate tests
-    }
-
     @Test
     void testResolverDefinitionIsRequired() {
         shouldFail CompilationFailedException, '''

src/test/groovy/groovy/lang/GroovyClassLoaderTest.groovy

@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.junit6.plugin.ForkedJvm
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.CompileUnit
@@ -207,21 +208,19 @@ final class GroovyClassLoaderTest {
     }
 
     @Test
+    @ForkedJvm(systemProperties = ['file.encoding=US-ASCII'])
     void testSourceEncoding() {
-        String oldEncoding = System.getProperty('file.encoding')
-        System.setProperty('file.encoding', 'US-ASCII')
-        try {
-            def gcl = new GroovyClassLoader(this.class.classLoader, new CompilerConfiguration().tap{sourceEncoding = 'UTF-8'})
-            def clazz = gcl.parseClass('return "\u20AC"') // EURO currency symbol
-            def result = clazz.getDeclaredConstructor().newInstance().run()
-            int i = result[0]
-            // 0xFFFD is used if the original character was not found,
-            // it is the famous ? that can often be seen. So if this here
-            // fails, then the String conversion failed at one point
-            assert i != 0xFFFD
-        } finally {
-            System.setProperty('file.encoding', oldEncoding)
-        }
+        // file.encoding is JVM-global (and consulted by JDK internals at
+        // class-load time on some platforms), so we set it via the forked
+        // command line rather than mutating the running JVM.
+        def gcl = new GroovyClassLoader(this.class.classLoader, new CompilerConfiguration().tap{sourceEncoding = 'UTF-8'})
+        def clazz = gcl.parseClass('return "\u20AC"') // EURO currency symbol
+        def result = clazz.getDeclaredConstructor().newInstance().run()
+        int i = result[0]
+        // 0xFFFD is used if the original character was not found,
+        // it is the famous ? that can often be seen. So if this here
+        // fails, then the String conversion failed at one point
+        assert i != 0xFFFD
     }
 
     // GROOVY-3537

src/test/groovy/org/codehaus/groovy/control/CompilerConfigurationTest.java

@@ -18,16 +18,14 @@
  */
 package org.codehaus.groovy.control;
 
+import groovy.junit6.plugin.ForkedJvm;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 import org.codehaus.groovy.control.messages.WarningMessage;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Properties;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,19 +40,6 @@
  */
 public final class CompilerConfigurationTest {
 
-    private Properties savedProperties;
-
-    @BeforeEach
-    public void setUp() {
-        savedProperties = System.getProperties();
-        System.setProperties(new Properties(savedProperties));
-    }
-
-    @AfterEach
-    public void tearDown() {
-        System.setProperties(savedProperties);
-    }
-
     @Test
     public void testDefaultConstructor() {
         CompilerConfiguration config = CompilerConfiguration.DEFAULT;
@@ -76,13 +61,17 @@ public void testDefaultConstructor() {
     }
 
     @Test
+    @ForkedJvm(systemProperties = {
+            "groovy.warnings=PaRaNoiA",
+            "groovy.output.verbose=trUE",
+            "groovy.mem.stub=true",
+            "groovy.generate.stub.in.memory=true",
+            "groovy.recompile.minimumInterval=867892345"})
     public void testSetViaSystemProperties() {
-        System.setProperty("groovy.warnings", "PaRaNoiA");
-        System.setProperty("groovy.output.verbose", "trUE");
-        System.setProperty("groovy.mem.stub", "true");
-        System.setProperty("groovy.generate.stub.in.memory", "true");
-        System.setProperty("groovy.recompile.minimumInterval", "867892345");
-
+        // Properties are set on the JVM command line via @ForkedJvm; the
+        // forked child reads them through the normal System.getProperties()
+        // path the production code uses, and parent-JVM state stays clean
+        // for all the other (read-only) tests in this class.
         assertEquals("PaRaNoiA", System.getProperty("groovy.warnings"));
 
         CompilerConfiguration config = new CompilerConfiguration(System.getProperties());

src/test/groovy/org/codehaus/groovy/transform/traitx/TraitASTTransformationTest.groovy

@@ -18,6 +18,7 @@
  */
 package org.codehaus.groovy.transform.traitx
 
+import groovy.junit6.plugin.ForkedJvm
 import groovy.transform.AnnotationCollector
 import groovy.transform.SelfType
 import org.codehaus.groovy.ast.ClassHelper
@@ -3376,6 +3377,7 @@ final class TraitASTTransformationTest {
 
     // GROOVY-10521
     @Test
+    @ForkedJvm(systemProperties = ['spock.iKnowWhatImDoing.disableGroovyVersionCheck=true'])
     void testVariadicMethodOfPrecompiledTrait() {
         assertScript shell, """import org.codehaus.groovy.ast.*
             class CT implements ${T10521.name} {
@@ -3390,7 +3392,6 @@ final class TraitASTTransformationTest {
             assert td == 'm(java.lang.Class,[java.lang.Object):java.lang.Object'
         """
 
-        System.setProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck','true')
         assertScript shell, """
             @Grab('org.spockframework:spock-core:2.4-groovy-5.0')
             @GrabExclude('org.codehaus.groovy:groovy-all')

subprojects/groovy-grape-ivy/build.gradle

@@ -26,6 +26,7 @@ dependencies {
         transitive = false
     }
     testImplementation projects.groovyTest
+    testImplementation projects.groovyTestJunit6
 }
 
 // The only Java source is a package-private implementation class;

subprojects/groovy-grape-ivy/src/test/groovy/groovy/grape/ivy/GrapeIvyTest.groovy

@@ -19,6 +19,7 @@
 package groovy.grape.ivy
 
 import groovy.grape.Grape
+import groovy.junit6.plugin.ForkedJvm
 
 import org.codehaus.groovy.control.CompilationFailedException
 import org.junit.jupiter.api.BeforeAll
@@ -264,6 +265,7 @@ final class GrapeIvyTest {
     }
 
     @Test // GROOVY-8372
+    @ForkedJvm(inheritProperties = ['grape.root', 'user.home', 'gradle.home'])
     void testConf2() {
         assumeTrue(Grape.instance instanceof GrapeIvy) // only GrapeIvy uses <ivysettings>
         def tempDir = File.createTempDir()
@@ -496,6 +498,7 @@ final class GrapeIvyTest {
     }
 
     @Test // GROOVY-7548
+    @ForkedJvm(inheritProperties = ['grape.root', 'user.home', 'gradle.home'])
     void testSystemProperties() {
         System.setProperty('groovy7548prop', 'x')
         assert System.getProperty('groovy7548prop') == 'x'

subprojects/groovy-grape-maven/build.gradle

@@ -24,6 +24,11 @@ dependencies {
     api rootProject
     implementation "org.apache.maven:maven-resolver-provider:${versions.mavenResolverProvider}"
     implementation "org.apache.maven.resolver:maven-resolver-supplier-mvn4:${versions.mavenResolverSupplier}"
+    // Maven Resolver's supplier instantiates components annotated with javax.inject (JSR-330);
+    // without javax.inject on the classpath, RepositorySystemSupplier.get() fails with
+    // NoClassDefFoundError: javax/inject/Provider. The supplier's POM doesn't declare this
+    // transitively as of 2.0.17, so we provide it explicitly.
+    implementation "javax.inject:javax.inject:${versions.javaxInject}"
 }
 
 tasks.withType(Javadoc).configureEach {