GROOVY-11997: Add @ForkedJvm and @ExpectedToFail JUnit extensions to groovy-test-junit6

Author: paulk-asert

build.gradle

@@ -125,6 +125,7 @@ dependencies {
     testImplementation projects.groovyTest
     testImplementation projects.groovyMacro
     testImplementation projects.groovyDateutil
+    testImplementation projects.groovyTestJunit6 // for groovy.junit6.plugin.ForkedJvm
     testImplementation "net.jcip:jcip-annotations:${versions.jcipAnnotations}"
     testImplementation "com.thoughtworks.qdox:qdox:${versions.qdox}"
     testImplementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"

src/test/groovy/groovy/ValDisabledTest.groovy

@@ -18,32 +18,24 @@
  */
 package groovy
 
+import groovy.junit6.plugin.ForkedJvm
 import org.junit.jupiter.api.Test
 
-import static org.codehaus.groovy.runtime.m12n.ExtensionModuleHelperForTests.doInFork
+import static groovy.test.GroovyAssert.assertScript
 
 /**
  * Tests that when {@code groovy.val.enabled=false}, GEP-16 breaking
  * changes are resolved and {@code val} behaves as a regular identifier.
- *
- * Each test runs in a freshly forked JVM (compile + execution) with the
- * property set, so the lexer's {@code static final VAL_ENABLED} is
- * initialised to {@code false}.
+ * <p>
+ * Each test runs in a freshly forked JVM with the property set, so the
+ * lexer's {@code static final VAL_ENABLED} is initialised to {@code false}.
  */
+@ForkedJvm(systemProperties = ['groovy.val.enabled=false'])
 final class ValDisabledTest {
 
-    private static final List<String> JVM_ARGS = ['-Dgroovy.val.enabled=false']
-
-    private static void doInForkWithValDisabled(String script) {
-        // Wrap each snippet in assertScript so top-level class declarations work
-        // (the snippet is otherwise placed inside a method body where local
-        // classes are not supported).
-        doInFork('java.lang.Object', "assertScript '''${script.replace("'", "\\'")}'''", JVM_ARGS)
-    }
-
     @Test
     void testFieldNamedValBeforeMethod() {
-        doInForkWithValDisabled '''
+        assertScript '''
             class Foo {
                 def val
                 void doSomething() {}
@@ -56,16 +48,16 @@ final class ValDisabledTest {
 
     @Test
     void testValAsCastExpression() {
-        doInForkWithValDisabled '''
+        assertScript '''
             def val = 42
             def result = val as String
-            assert result == "42"
+            assert result == '42'
         '''
     }
 
     @Test
     void testClassNamedVal() {
-        doInForkWithValDisabled '''
+        assertScript '''
             class val {
                 int x
             }
@@ -76,7 +68,7 @@ final class ValDisabledTest {
 
     @Test
     void testValAsMethodReturnType() {
-        doInForkWithValDisabled '''
+        assertScript '''
             class val {
                 int x
             }
@@ -90,7 +82,7 @@ final class ValDisabledTest {
 
     @Test
     void testValAsExplicitType() {
-        doInForkWithValDisabled '''
+        assertScript '''
             class val {
                 int x
             }
@@ -101,15 +93,15 @@ final class ValDisabledTest {
 
     @Test
     void testDefValAssignment() {
-        doInForkWithValDisabled '''
+        assertScript '''
             def val = 1
             assert val == 1
         '''
     }
 
     @Test
     void testValReassignment() {
-        doInForkWithValDisabled '''
+        assertScript '''
             def val = 1
             val = 2
             assert val == 2
@@ -118,18 +110,18 @@ final class ValDisabledTest {
 
     @Test
     void testValAsMapKey() {
-        doInForkWithValDisabled '''
+        assertScript '''
             def m = [val: 42]
             assert m.val == 42
         '''
     }
 
     @Test
     void testValPropertyAccess() {
-        doInForkWithValDisabled '''
-            class Foo { def val = "hello" }
+        assertScript '''
+            class Foo { def val = 'hello' }
             def f = new Foo()
-            assert f.val == "hello"
+            assert f.val == 'hello'
         '''
     }
 }

src/test/groovy/groovy/transform/stc/STCExtensionMethodsTest.groovy

@@ -18,10 +18,10 @@
  */
 package groovy.transform.stc
 
+import groovy.junit6.plugin.ForkedJvm
+import org.codehaus.groovy.runtime.m12n.ExtensionModuleRegistry
 import org.junit.jupiter.api.Test
 
-import static org.codehaus.groovy.runtime.m12n.ExtensionModuleHelperForTests.doInFork
-
 /**
  * Unit tests for static type checking : extension methods.
  */
@@ -53,33 +53,32 @@ class STCExtensionMethodsTest extends StaticTypeCheckingTestCase {
      * @see org.codehaus.groovy.runtime.m12n.TestStaticStringExtension
      */
     @Test
+    @ForkedJvm
     void testShouldFindExtensionMethodWithGrab() {
-        doInFork 'groovy.transform.stc.StaticTypeCheckingTestCase', '''
-            def impl = new MetaClassImpl(String)
-            impl.initialize()
-            String.metaClass = impl
-            try {
-                ExtensionModuleRegistry registry = GroovySystem.metaClassRegistry.moduleRegistry
-                // ensure that the module isn't loaded
-                assert !registry.modules.any { it.name == 'Test module for Grab' && it.version == '1.4' }
-
-                def jarURL = this.class.getResource('/jars')
-                assert jarURL
-
-                assertScript """@GrabResolver(name='local',root='$jarURL')
-                    @Grab('module-test:module-test:1.4;changing=true')
-                    import org.codehaus.groovy.runtime.m12n.*
-
-                    // the following methods are added by the Grab test module
-                    def str = 'This is a string'
-                    assert str.reverseToUpperCase2() == str.toUpperCase().reverse()
-                    // a static method added to String thanks to a @Grab extension
-                    assert String.answer2() == 42
-                """
-            } finally {
-                String.metaClass = null
-            }
-        '''
+        def impl = new MetaClassImpl(String)
+        impl.initialize()
+        String.metaClass = impl
+        try {
+            ExtensionModuleRegistry registry = GroovySystem.metaClassRegistry.moduleRegistry
+            // ensure that the module isn't loaded
+            assert !registry.modules.any { it.name == 'Test module for Grab' && it.version == '1.4' }
+
+            def jarURL = this.class.getResource('/jars')
+            assert jarURL
+
+            assertScript """@GrabResolver(name='local',root='$jarURL')
+                @Grab('module-test:module-test:1.4;changing=true')
+                import org.codehaus.groovy.runtime.m12n.*
+
+                // the following methods are added by the Grab test module
+                def str = 'This is a string'
+                assert str.reverseToUpperCase2() == str.toUpperCase().reverse()
+                // a static method added to String thanks to a @Grab extension
+                assert String.answer2() == 42
+            """
+        } finally {
+            String.metaClass = null
+        }
     }
 
     /**