minor refactor: junit5 changes (tests weren't running)

Author: paulk-asert

src/test/groovy/bugs/Groovy4116Bug.groovy

@@ -20,10 +20,13 @@ package bugs
 
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
+import org.junit.jupiter.api.Test
+
 import static groovy.test.GroovyAssert.shouldFail
 
 final class Groovy4116Bug {
 
+    @Test
     void testAnInterfaceMethodNotImplementedPublic() {
         def err = shouldFail MultipleCompilationErrorsException, '''
             class C4116 implements I4116 {
@@ -36,6 +39,7 @@ final class Groovy4116Bug {
         assert err.message =~ /The method foo should be public as it implements the corresponding method from interface I4116/
     }
 
+    @Test
     void testAnInterfaceMethodNotImplementedPublicV2SuperClassInterface() {
         def err = shouldFail MultipleCompilationErrorsException, '''
             abstract class A4116 implements I4116 {

src/test/groovy/bugs/Groovy5396Bug.groovy

@@ -19,10 +19,13 @@
 package bugs
 
 
+import org.junit.jupiter.api.Test
+
 import static groovy.test.GroovyAssert.assertScript
 
 
 class Groovy5396Bug {
+    @Test
     void testClassAccessToPackageLocalPropertyInSuper() {
         assertScript """
             class GroovyBase extends AbstractBase {

src/test/groovy/bugs/Groovy6722Bug.groovy

@@ -19,10 +19,13 @@
 package bugs
 
 
+import org.junit.jupiter.api.Test
+
 import static groovy.test.GroovyAssert.assertScript
 
 
 class Groovy6722Bug {
+    @Test
     void testThatCompilerRecognizesCovariantArray() {
         assertScript '''
 abstract class Top<Elem,Result> {

src/test/groovy/bugs/Groovy7520Bug.groovy

@@ -19,10 +19,13 @@
 package bugs
 
 
+import org.junit.jupiter.api.Test
+
 import static groovy.test.GroovyAssert.shouldFail
 
 
 class Groovy7520Bug {
+    @Test
     void testShouldSeeConflictUsingAbstractMethod() {
         def msg = shouldFail '''
             abstract class DefinesMethod {

src/test/groovy/gls/annotations/closures/AnnotationClosureExhaustiveTestSupport.groovy

@@ -18,25 +18,31 @@
  */
 package gls.annotations.closures
 
+import org.junit.jupiter.api.Test
+
 abstract class AnnotationClosureExhaustiveTestSupport {
     abstract Class getAnnotationClass()
 
     abstract Class getAnnotatedClass()
 
     abstract void verify(Class closureClass)
 
+    @Test
     void testWorksOnClassLevel() {
         worksOn(annotatedClass)
     }
 
+    @Test
     void testWorksOnMethodLevel() {
         worksOn(annotatedClass.getDeclaredMethod("aMethod", Object))
     }
 
+    @Test
     void testWorksOnFieldLevel() {
         worksOn(annotatedClass.getDeclaredField("aField"))
     }
 
+    @Test
     void testWorksOnPropertyLevel() {
         worksOn(annotatedClass.getDeclaredField("aProperty"))
     }

src/test/groovy/gls/syntax/Gep3OrderDslTest.groovy

@@ -21,6 +21,7 @@ package gls.syntax
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 
 class Gep3OrderDslTest {
     @BeforeEach
@@ -37,6 +38,7 @@ class Gep3OrderDslTest {
 
     }
 
+    @Test
     void testDsl() {
         // use the script binding for silent sentence words like "to", "the"
         def binding = new CustomBinding()

src/test/groovy/groovy/lang/GroovyShellTest2.groovy

@@ -18,7 +18,10 @@
  */
 package groovy.lang
 
+import org.junit.jupiter.api.Test
+
 class GroovyShellTest2 {
+    @Test
     void testBindingsInBaseScriptInitializers() {
         def shell = new GroovyShell();
         def scriptText = '''
@@ -40,6 +43,7 @@ class GroovyShellTest2 {
         assert result == arg0
     }
 
+    @Test
     void testBindingsInScriptFieldInitializers() {
         def shell = new GroovyShell();
         def scriptText = '''
@@ -54,6 +58,7 @@ class GroovyShellTest2 {
         assert result == arg0
     }
 
+    @Test
     void testEvalBindingsInBaseScriptInitializers() {
         def context = new Binding()
         def arg0 = 'Hello Groovy Eval'
@@ -76,6 +81,7 @@ class GroovyShellTest2 {
         assert result == arg0
     }
 
+    @Test
     void testEvalBindingsInScriptFieldInitializers() {
         def context = new Binding()
         def arg0 = 'Rehi Groovy Eval'

src/test/groovy/groovy/lang/MapOfClosureTest.groovy

@@ -19,13 +19,17 @@
 package groovy.lang
 
 
+import org.junit.jupiter.api.Test
+
 import static groovy.test.GroovyAssert.shouldFail
+import static org.junit.jupiter.api.Assertions.assertEquals
 
 /**
  * Tests maps of closures coerced to classes by asType()
  */
 class MapOfClosureTest {
 
+    @Test
     void testInterfaceProxy() {
         def outer = 1
         def x = [run: { outer++ }] as Runnable
@@ -35,6 +39,7 @@ class MapOfClosureTest {
         assert outer == 2
     }
 
+    @Test
     void testInterfaceProxyWithoutAllMethods() {
         def proxy = [methodOne: { 'some string' }] as MultiMethodInterface
 
@@ -47,6 +52,7 @@ class MapOfClosureTest {
         }
     }
 
+    @Test
     void testObject() {
         def m = [bar: { "foo" }]
         def x = m as Object
@@ -55,6 +61,7 @@ class MapOfClosureTest {
         assert "foo" == x.bar()
     }
 
+    @Test
     void testAbstractClassSubclassing() {
         def outer = 1
         def x = [run: { outer++ }] as TimerTask
@@ -66,6 +73,7 @@ class MapOfClosureTest {
     /**
      * Checks public and protected methods from parents can also be overridden by the Map coercion to classes.
      */
+    @Test
     void testOverrideProtectedMethods() {
         def b = [pub: { "map pub" }, prot: { "map prot" }, child: { "map child" }] as B
 
@@ -78,6 +86,7 @@ class MapOfClosureTest {
     /**
      * Checks that abstract methods can also be overridden.
      */
+    @Test
     void testAbstractMethodIsOverrided() {
         def a = [abstractMethod: { "map abstract" }] as A
 
@@ -87,6 +96,7 @@ class MapOfClosureTest {
     /**
      * Verify that complex method signatures, even with primitive types and arrays, can be overridden.
      */
+    @Test
     void testComplexMethodSignature() {
         def c = [foo: { int a, List b, Double[] c -> ["map foo"] as String[] }] as C
 

src/test/groovy/groovy/lang/ReferenceSerializationTest.groovy

@@ -17,6 +17,9 @@
  *  under the License.
  */
 package groovy.lang
+
+import org.junit.jupiter.api.Test
+
 /**
  * GROOVY-4305: Make groovy.lang.Reference implement Serializable
  */
@@ -40,6 +43,7 @@ class ReferenceSerializationTest implements Serializable {
         return ois.readObject()
     }
 
+    @Test
     void testSimplePogoSerializationToObjectOutputStream() {
         int age = 33
         String name = "Guillaume"
@@ -54,6 +58,7 @@ class ReferenceSerializationTest implements Serializable {
         assert personDeserialized.pet.kind == "cat"
     }
 
+    @Test
     void testClosureSerializationWithAReferenceToALocalVariable() {
         int number = 2
         def doubler = { it * number }
@@ -64,6 +69,7 @@ class ReferenceSerializationTest implements Serializable {
         assert closure(3) == 6
     }
 
+    @Test
     void testAICReferencingLocalVariableTest() {
         long count = 0
         def button = new Button()

src/test/groovy/groovy/util/ProxyGeneratorAdapterTest.groovy

@@ -19,10 +19,12 @@
 package groovy.util
 
 import org.codehaus.groovy.runtime.ProxyGeneratorAdapter
+import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
 
 class ProxyGeneratorAdapterTest {
+    @Test
     void testShouldCreateProxy() {
         def map = ['toString': { 'HELLO' }]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Object, null, this.class.classLoader, false, null)
@@ -31,11 +33,13 @@ class ProxyGeneratorAdapterTest {
         assert obj.toString() == 'HELLO'
     }
 
+    @Test
     void testShouldCreateProxyWithArrayDelegate() {
         def adapter = new ProxyGeneratorAdapter([:], Map$Entry, [Map$Entry] as Class[], null, false, String[])
         assert adapter.proxyName() =~ /String_array\d+_groovyProxy/
     }
 
+    @Test
     void testImplementSingleAbstractMethod() {
         def map = ['m': { 'HELLO' }]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Foo, null, this.class.classLoader, false, null)
@@ -45,6 +49,7 @@ class ProxyGeneratorAdapterTest {
         assert obj.m() == 'HELLO'
     }
 
+    @Test
     void testImplementSingleAbstractMethodReturningVoid() {
         def map = ['bar': { println 'HELLO' }]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Bar, null, this.class.classLoader, false, null)
@@ -54,6 +59,7 @@ class ProxyGeneratorAdapterTest {
         obj.bar()
     }
 
+    @Test
     void testImplementSingleAbstractMethodReturningVoidAndSharedVariable() {
         def x = null
         def map = ['bar': { x = 'HELLO' }]
@@ -66,6 +72,7 @@ class ProxyGeneratorAdapterTest {
         assert x == 'HELLO'
     }
 
+    @Test
     void testImplementMethodFromInterface() {
         def map = ['foo': { 'HELLO' }]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Object, [FooInterface] as Class[], this.class.classLoader, false, null)
@@ -75,6 +82,7 @@ class ProxyGeneratorAdapterTest {
         assert obj.foo() == 'HELLO'
     }
 
+    @Test
     void testImplementMethodFromInterfaceUsingInterfaceAsSuperClass() {
         def map = ['foo': { 'HELLO' }]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, FooInterface, null, this.class.classLoader, false, null)
@@ -84,6 +92,7 @@ class ProxyGeneratorAdapterTest {
         assert obj.foo() == 'HELLO'
     }
 
+    @Test
     void testImplementMethodFromInterfaceAndSuperClass() {
         def x = null
         def map = ['foo': { 'HELLO' }, 'bar': { x='WORLD'} ]
@@ -98,6 +107,7 @@ class ProxyGeneratorAdapterTest {
         assert x == 'WORLD'
     }
 
+    @Test
     void testImplementMethodFromInterfaceWithPrimitiveTypes() {
         def map = ['calc': { x -> x*2 } ]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Bar, [OtherInterface] as Class[], this.class.classLoader, false, null)
@@ -107,6 +117,7 @@ class ProxyGeneratorAdapterTest {
         assert obj.calc(3) == 6
     }
 
+    @Test
     void testWildcardProxy() {
         def map = ['*': { '1' } ]
         ProxyGeneratorAdapter adapter = new ProxyGeneratorAdapter(map, Foo, null, this.class.classLoader, false, null)
@@ -116,6 +127,7 @@ class ProxyGeneratorAdapterTest {
         assert obj.m() == '1'
     }
 
+    @Test
     void testDelegatingProxy() {
         assertScript '''
         public abstract class A { abstract protected String doIt() }
@@ -131,6 +143,7 @@ class ProxyGeneratorAdapterTest {
     }
 
     // GROOVY-5925
+    @Test
     void testProxyForLongConstructor() {
 
         def map =  [nextInt: { x -> return 0 }]
@@ -142,6 +155,7 @@ class ProxyGeneratorAdapterTest {
         assert proxy.nextInt() == 0
     }
 
+    @Test
     void testProxyForDoubleConstructor() {
         assertScript '''
         public class A {
@@ -162,6 +176,7 @@ class ProxyGeneratorAdapterTest {
     }
 
     // GROOVY-7146
+    @Test
     void testShouldNotThrowVerifyErrorBecauseOfStackSize() {
         assertScript '''
             interface DoStuff {
@@ -178,6 +193,7 @@ class ProxyGeneratorAdapterTest {
     static trait Trait1 { def method1() { 'Trait1 method' } }
 
     // GROOVY-7443
+    @Test
     void testTraitFromDifferentClassloader() {
         def aWith1 = new ClassA().withTraits(Trait1)
         assert aWith1.method1() == 'Trait1 method'
@@ -192,6 +208,7 @@ class ProxyGeneratorAdapterTest {
         assert aWith2.method2() == 'Trait2 method'
     }
 
+    @Test
     void testGetTypeArgsRegisterLength() {
         def types = { list -> list as org.objectweb.asm.Type[] }
         def proxyGeneratorAdapter = new ProxyGeneratorAdapter([:], Object, [] as Class[], null, false, Object)