Convert to JUnit5

Author: daniellansun

src/spec/test/BaseScriptSpecTest.groovy

@@ -16,11 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-import groovy.test.GroovyTestCase
+
 import groovy.transform.CompileStatic
 
+import static groovy.test.GroovyAssert.assertScript
+
 @CompileStatic
-class BaseScriptSpecTest extends GroovyTestCase {
+class BaseScriptSpecTest {
     void testSimpleScript() {
         def script = '''
 // tag::simple_script[]

src/spec/test/ClassDesignASTTransformsTest.groovy

@@ -16,10 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-import groovy.test.GroovyTestCase
 
-class ClassDesignASTTransformsTest extends GroovyTestCase {
 
+import org.junit.jupiter.api.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+class ClassDesignASTTransformsTest {
+
+    @Test
     void testDelegateTransformation() {
         assertScript '''
 // tag::delegating_class[]
@@ -269,6 +274,7 @@ d.task$() //passes
 '''
     }
 
+    @Test
     void testImmutable() {
         assertScript '''
 // tag::immutable_simple[]
@@ -369,6 +375,7 @@ try {
 '''
     }
 
+    @Test
     void testMemoized() {
         assertScript '''
 import groovy.transform.Memoized
@@ -407,6 +414,7 @@ assert x!=z
 '''
     }
 
+    @Test
     void testSingleton() {
         assertScript '''
 // tag::singleton_simple[]
@@ -451,6 +459,7 @@ assert GreetingService.instance.greeting('Bob') == 'Hello, Bob!'
 '''
     }
 
+    @Test
     void testTailRecursive() {
         assertScript '''
 // tag::tailrecursive[]

src/spec/test/ClassTest.groovy

@@ -17,9 +17,8 @@
  *  under the License.
  */
 
-import groovy.test.GroovyTestCase
 
-final class ClassTest extends GroovyTestCase {
+final class ClassTest {
 
     void testClassDefinition() {
         assertScript '''
@@ -230,7 +229,7 @@ final class ClassTest extends GroovyTestCase {
             }
             // end::protected_forbidden[]
         '''
-        assert err.contains("The method 'greet' must be public as it is declared abstract in interface 'Greeter'")
+        assert err.message.contains("The method 'greet' must be public as it is declared abstract in interface 'Greeter'")
     }
 
     void testFields() {
@@ -730,7 +729,7 @@ import java.lang.annotation.Retention
             class Evil {}
             Evil
         '''
-        assert err =~ /Attribute 'value' should have type 'java.lang.String'; but found type 'int' in @Foo/
+        assert err.message =~ /Attribute 'value' should have type 'java.lang.String'; but found type 'int' in @Foo/
     }
 
     void testCustomProcessor() {
@@ -760,6 +759,9 @@ import java.lang.annotation.Retention
             import org.codehaus.groovy.ast.expr.PropertyExpression
             import org.codehaus.groovy.control.SourceUnit
             import org.codehaus.groovy.transform.AnnotationCollectorTransform
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Timeout
+import static groovy.test.GroovyAssert.*
 
             // tag::compiledynamic_def_fixed[]
             @AnnotationCollector(processor = "org.codehaus.groovy.transform.CompileDynamicProcessor")

src/spec/test/CloningASTTransformsTest.groovy

@@ -1,4 +1,3 @@
-import groovy.test.GroovyTestCase
 
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
@@ -18,7 +17,13 @@ import groovy.test.GroovyTestCase
  *  specific language governing permissions and limitations
  *  under the License.
  */
-class CloningASTTransformsTest extends GroovyTestCase {
+
+import org.junit.jupiter.api.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+class CloningASTTransformsTest {
+    @Test
     void testAutoCloneAnnotation() {
         assertScript '''
 // tag::example_autoclone[]
@@ -59,6 +64,7 @@ assert !(book.authors.is(clone.authors))
 '''
     }
 
+    @Test
     void testAutoCloneAnnotationWithExclude() {
         assertScript '''
 // tag::example_autoclone_excludes[]
@@ -82,6 +88,7 @@ assert clone.publicationDate==book.publicationDate
 '''
     }
 
+    @Test
     void testAutoCloneAnnotationWithIncludeFields() {
         assertScript '''
 // tag::example_autoclone_includeFields[]
@@ -105,6 +112,7 @@ assert clone.publicationDate==book.publicationDate
 '''
     }
 
+    @Test
     void testAutoExternalize() {
         assertScript '''
 // tag::example_autoext[]
@@ -168,6 +176,7 @@ assert book.price == 1.5
 '''
     }
 
+    @Test
     void testAutoExternalizeWithExcludes() {
         assertScript '''
 // tag::example_autoext_excludes[]
@@ -209,6 +218,7 @@ assert book.title == 'Auto externalization for dummies'
 assert book.price == 0 // because price is excluded
 '''
     }
+    @Test
     void testAutoExternalizeWithIncludeFields() {
         assertScript '''
 // tag::example_autoext_includeFields[]

src/spec/test/ClosuresSpecTest.groovy

@@ -1,4 +1,6 @@
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Test
+
+import static groovy.test.GroovyAssert.assertScript
 
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
@@ -18,9 +20,10 @@ import groovy.test.GroovyTestCase
  *  specific language governing permissions and limitations
  *  under the License.
  */
-class ClosuresSpecTest extends GroovyTestCase {
+class ClosuresSpecTest {
     static void sink(Closure cl) {}
 
+    @Test
     void testClosureSyntax() {
         sink
                 // tag::closure_syntax_1[]
@@ -61,6 +64,7 @@ class ClosuresSpecTest extends GroovyTestCase {
                 // end::closure_syntax_6[]
     }
 
+    @Test
     void testAssignClosureToAVariable() {
         // tag::closure_is_an_instance_of_Closure[]
         def listener = { e -> println "Clicked on $e.source" }      // <1>
@@ -72,6 +76,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::closure_is_an_instance_of_Closure[]
     }
 
+    @Test
     void testCallClosure() {
         // tag::closure_call_1[]
         def code = { 123 }
@@ -94,6 +99,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::closure_call_2[]
     }
 
+    @Test
     void testClosureParameters() {
         // tag::closure_param_declaration[]
         def closureWithOneArg = { str -> str.toUpperCase() }
@@ -116,6 +122,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::closure_param_declaration[]
     }
 
+    @Test
     void testImplicitIt() {
         assertScript '''
         // tag::implicit_it[]
@@ -146,6 +153,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testClosureVargs() {
         // tag::closure_vargs[]
         def concat1 = { String... args -> args.join('') }           // <1>
@@ -161,6 +169,7 @@ class ClosuresSpecTest extends GroovyTestCase {
 
     }
 
+    @Test
     void testThisObject() {
         assertScript '''
         // tag::closure_this[]
@@ -217,6 +226,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testOwner() {
         assertScript '''
         // tag::closure_owner[]
@@ -253,6 +263,7 @@ class ClosuresSpecTest extends GroovyTestCase {
 '''
     }
 
+    @Test
     void testClosureDelegate() {
         assertScript '''
         // tag::delegate_is_owner[]
@@ -306,6 +317,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testDelegationStrategy() {
         assertScript '''
                 // tag::delegation_strategy_intro[]
@@ -320,6 +332,7 @@ class ClosuresSpecTest extends GroovyTestCase {
             '''
     }
 
+    @Test
     void testOwnerFirst() {
         assertScript '''
             // tag::closure_owner_first[]
@@ -349,6 +362,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testDelegateOnly() {
         assertScript '''
             // tag::delegate_only[]
@@ -383,6 +397,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testDelegateOnlyPropertyMissing() {
         assertScript '''
             // tag::delegate_only_prop_missing[]
@@ -408,6 +423,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testGStringEager() {
         // tag::gstring_eager_intro[]
         def x = 1
@@ -424,6 +440,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         assert gs == 'x = 1'
     }
 
+    @Test
     void testGStringLazy() {
         // tag::gstring_lazy[]
         def x = 1
@@ -435,6 +452,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::gstring_lazy[]
     }
 
+    @Test
     void testGStringWithMutation() {
         assertScript '''
             // tag::gstring_mutation[]
@@ -455,6 +473,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testGStringWithoutMutation() {
         assertScript '''
             // tag::gstring_no_mutation[]
@@ -474,6 +493,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         '''
     }
 
+    @Test
     void testLeftCurry() {
         // tag::left_curry[]
         def nCopies = { int n, String str -> str*n }    // <1>
@@ -483,6 +503,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::left_curry[]
     }
 
+    @Test
     void testRightCurry() {
         // tag::right_curry[]
         def nCopies = { int n, String str -> str*n }    // <1>
@@ -492,6 +513,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::right_curry[]
     }
 
+    @Test
     void testNCurry() {
         // tag::ncurry[]
         def volume = { double l, double w, double h -> l*w*h }      // <1>
@@ -502,6 +524,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::ncurry[]
     }
 
+    @Test
     void testMemoize() {
         // tag::naive_fib[]
         def fib
@@ -514,6 +537,7 @@ class ClosuresSpecTest extends GroovyTestCase {
         // end::memoized_fib[]
     }
 
+    @Test
     void testComposition() {
         // tag::closure_composition[]
         def plus2  = { it + 2 }
@@ -533,6 +557,7 @@ class ClosuresSpecTest extends GroovyTestCase {
 
     }
 
+    @Test
     void testTrampoline() {
         // tag::trampoline[]
         def factorial