junit jupiter

Author: eric-milles

src/test/groovy/bugs/ArrayMethodCallBug.groovy

@@ -19,9 +19,11 @@
 package bugs
 
 import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class ArrayMethodCallBug extends TestSupport {
+final class ArrayMethodCallBug extends TestSupport {
 
+    @Test
     void testMethodCallingWithArrayBug() {
         def array = getMockArguments()
 

src/test/groovy/bugs/ClosureWithStaticVariablesBug.groovy

@@ -18,12 +18,13 @@
  */
 package bugs
 
-import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class ClosureWithStaticVariablesBug extends TestSupport {
+final class ClosureWithStaticVariablesBug {
 
     static def y = [:]
 
+    @Test
     void testBug() {
         def c = { x ->
             return {

src/test/groovy/bugs/DoubleSizeParametersBug.groovy

@@ -18,18 +18,21 @@
  */
 package bugs
 
-import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class DoubleSizeParametersBug extends TestSupport {
+import static groovy.test.GroovyAssert.assertScript
 
+final class DoubleSizeParametersBug {
+
+    @Test
     void testBug() {
-        assertScript """
+        assertScript '''
             def foo(double x, y) {
                 println "x: "+x
                 println "y: "+y
             }
 
             foo(10.0d, 0)
-        """
+        '''
     }
 }

src/test/groovy/bugs/IterateOverCustomTypeBug.groovy

@@ -19,9 +19,11 @@
 package bugs
 
 import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class IterateOverCustomTypeBug extends TestSupport {
+final class IterateOverCustomTypeBug extends TestSupport {
 
+    @Test
     void testBug() {
         def object = this
 

src/test/groovy/bugs/NestedClosure2Bug.groovy

@@ -18,14 +18,15 @@
  */
 package bugs
 
-import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-/**
- */
-class NestedClosure2Bug extends TestSupport {
+import static groovy.test.GroovyAssert.assertScript
+
+final class NestedClosure2Bug {
 
     Object f
 
+    @Test
     void testFieldBug() {
         def closure = {
             return {
@@ -38,6 +39,7 @@ class NestedClosure2Bug extends TestSupport {
         assert f == 123
     }
 
+    @Test
     void testBugOutsideOfScript() {
         def a = 123
         def b = 456
@@ -61,8 +63,9 @@ class NestedClosure2Bug extends TestSupport {
         assert value == 123
     }
 
+    @Test
     void testBug() {
-        assertScript """
+        assertScript '''
             def a = 123
             def closure = {
                 return {
@@ -76,6 +79,6 @@ class NestedClosure2Bug extends TestSupport {
             value = c3()
 
             assert value == 123
-"""
+        '''
     }
 }

src/test/groovy/bugs/SubscriptOnPrimitiveTypeArrayBug.groovy

@@ -19,11 +19,14 @@
 package bugs
 
 import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
+
+final class SubscriptOnPrimitiveTypeArrayBug extends TestSupport {
 
-class SubscriptOnPrimitiveTypeArrayBug extends TestSupport {
     int[] ia;  // type is not necessary
     int i1;
 
+    @Test
     void testBug() {
         def array = getIntArray() // this function returns [I, true primitive array
 
@@ -42,6 +45,7 @@ class SubscriptOnPrimitiveTypeArrayBug extends TestSupport {
         assert range == [2, 8]
     }
 
+    @Test
     void testGroovyIntArray() {
         int[] ia = [1, 2]
         int[] ia1 = ia; // type is not necessary
@@ -50,11 +54,11 @@ class SubscriptOnPrimitiveTypeArrayBug extends TestSupport {
         assert i2 == 1
     }
 
+    @Test
     void testIntArrayObjectRangeSelection() {
         int[] ia = [1000, 1100, 1200, 1300, 1400]
         def range = new ObjectRange(new Integer(1), new Integer(3))
         def selected = ia[range]
         assert selected == [1100, 1200, 1300]
     }
-
 }

src/test/groovy/bugs/SubscriptOnStringArrayBug.groovy

@@ -19,22 +19,25 @@
 package bugs
 
 import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class SubscriptOnStringArrayBug extends TestSupport {
+final class SubscriptOnStringArrayBug extends TestSupport {
 
+    @Test
     void testArraySubscript() {
         def array = getMockArguments()
 
-        assert array[1] == "b"
+        assert array[1] == 'b'
 
-        array[0] = "d"
+        array[0] = 'd'
 
-        assert array[0] == "d"
+        assert array[0] == 'd'
     }
 
+    @Test
     void testRobsTestCase() {
-        def array = "one two three".split(" ")
+        def array = 'one two three'.split(' ')
 
-        assert array[1] == "two"
+        assert array[1] == 'two'
     }
 }

src/test/groovy/bugs/VariableScopingBug.groovy

@@ -18,35 +18,36 @@
  */
 package bugs
 
-import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class VariableScopingBug extends TestSupport {
+import static groovy.test.GroovyAssert.assertScript
+import static groovy.test.GroovyAssert.shouldFail
 
+final class VariableScopingBug {
+
+    @Test
     void testUndeclaredVariable() {
-        shouldFail(MissingPropertyException) {
-            def shell = new GroovyShell()
-            shell.evaluate("""
-                class SomeTest {
-                    void run() {
-                        for (z in 0..2) {
-                            def x = [1, 2, 3]
-                        }
+        shouldFail MissingPropertyException, '''
+            class SomeTest {
+                void run() {
+                    for (z in 0..2) {
+                        def x = [1, 2, 3]
+                    }
 
-                        for (t in 0..3) {
-                            for (y in x) { // previous x no longer be in scope
-                                println x
-                            }
+                    for (t in 0..3) {
+                        for (y in x) { // previous x no longer be in scope
+                            println x
                         }
                     }
                 }
-                new SomeTest().run()
-            """)
-        }
+            }
+            new SomeTest().run()
+        '''
     }
 
+    @Test
     void testVariableReuseAllowedInDifferentScopes() {
-        def shell = new GroovyShell()
-        shell.evaluate("""
+        assertScript '''
             for (z in 0..2) {
                 def x = [1, 2, 3]
             }
@@ -55,13 +56,13 @@ class VariableScopingBug extends TestSupport {
                 def x = 123
                 println x
             }
-        """)
+        '''
     }
 
     // GROOVY-5961
+    @Test
     void testVariableInAicInsideStaticMethod() {
-        def shell = new GroovyShell()
-        shell.evaluate("""
+        assertScript '''
             static foo() {
                 new LinkedList([1, 2]) {
                     int count
@@ -73,6 +74,6 @@ class VariableScopingBug extends TestSupport {
             assert l.count == 0
             assert l[0] == 1
             assert l.count == 1
-        """)
+        '''
     }
 }

src/test/groovy/groovy/SerializableCompatibilityTest.groovy

@@ -18,9 +18,11 @@
  */
 package groovy
 
-import groovy.bugs.TestSupport
+import org.junit.jupiter.api.Test
 
-class SerializableCompatibilityTest extends TestSupport {
+final class SerializableCompatibilityTest {
+
+    @Test
     void testSerialize() {
         def obj = new GroovyRuntimeException('boom')
         assert obj instanceof GroovyRuntimeException
@@ -34,6 +36,7 @@ class SerializableCompatibilityTest extends TestSupport {
         println out.toByteArray().encodeBase64().toString()
     }
 
+    @Test
     void testDeserialize() {
         // generated by testSerialize
         def serializedObjectStr_2_4_X = 'rO0ABXNyACJncm9vdnkubGFuZy5Hcm9vdnlSdW50aW1lRXhjZXB0aW9u/VHW5CcH3PYCAAJMAAZtb2R1bGV0ACRMb3JnL2NvZGVoYXVzL2dyb292eS9hc3QvTW9kdWxlTm9kZTtMAARub2RldAAhTG9yZy9jb2RlaGF1cy9ncm9vdnkvYXN0L0FTVE5vZGU7eHIAGmphdmEubGFuZy5SdW50aW1lRXhjZXB0aW9unl8GRwo0g+UCAAB4cgATamF2YS5sYW5nLkV4Y2VwdGlvbtD9Hz4aOxzEAgAAeHIAE2phdmEubGFuZy5UaHJvd2FibGXVxjUnOXe4ywMABEwABWNhdXNldAAVTGphdmEvbGFuZy9UaHJvd2FibGU7TAANZGV0YWlsTWVzc2FnZXQAEkxqYXZhL2xhbmcvU3RyaW5nO1sACnN0YWNrVHJhY2V0AB5bTGphdmEvbGFuZy9TdGFja1RyYWNlRWxlbWVudDtMABRzdXBwcmVzc2VkRXhjZXB0aW9uc3QAEExqYXZhL3V0aWwvTGlzdDt4cHEAfgAKdAAEYm9vbXVyAB5bTGphdmEubGFuZy5TdGFja1RyYWNlRWxlbWVudDsCRio8PP0iOQIAAHhwAAAAIHNyABtqYXZhLmxhbmcuU3RhY2tUcmFjZUVsZW1lbnRhCcWaJjbdhQIABEkACmxpbmVOdW1iZXJMAA5kZWNsYXJpbmdDbGFzc3EAfgAHTAAIZmlsZU5hbWVxAH4AB0wACm1ldGhvZE5hbWVxAH4AB3hw/////nQAKXN1bi5yZWZsZWN0Lk5hdGl2ZUNvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAiTmF0aXZlQ29uc3RydWN0b3JBY2Nlc3NvckltcGwuamF2YXQADG5ld0luc3RhbmNlMHNxAH4ADgAAAD5xAH4AEHEAfgARdAALbmV3SW5zdGFuY2VzcQB+AA4AAAAtdAAtc3VuLnJlZmxlY3QuRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAmRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsLmphdmFxAH4AFHNxAH4ADgAAAad0AB1qYXZhLmxhbmcucmVmbGVjdC5Db25zdHJ1Y3RvcnQAEENvbnN0cnVjdG9yLmphdmFxAH4AFHNxAH4ADgAAAFN0ADBvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJlZmxlY3Rpb24uQ2FjaGVkQ29uc3RydWN0b3J0ABZDYWNoZWRDb25zdHJ1Y3Rvci5qYXZhdAAGaW52b2tlc3EAfgAOAAAAaXQAVG9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5Db25zdHJ1Y3RvclNpdGUkQ29uc3RydWN0b3JTaXRlTm9VbndyYXBOb0NvZXJjZXQAFENvbnN0cnVjdG9yU2l0ZS5qYXZhdAAPY2FsbENvbnN0cnVjdG9yc3EAfgAOAAAAO3QAMm9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5DYWxsU2l0ZUFycmF5dAASQ2FsbFNpdGVBcnJheS5qYXZhdAAWZGVmYXVsdENhbGxDb25zdHJ1Y3RvcnNxAH4ADgAAAO50ADVvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJ1bnRpbWUuY2FsbHNpdGUuQWJzdHJhY3RDYWxsU2l0ZXQAFUFic3RyYWN0Q2FsbFNpdGUuamF2YXEAfgAic3EAfgAOAAAA+nEAfgAocQB+AClxAH4AInNxAH4ADgAAAAF0AA9Db25zb2xlU2NyaXB0MzVxAH4ALHQAA3J1bnNxAH4ADgAAAQd0ABdncm9vdnkubGFuZy5Hcm9vdnlTaGVsbHQAEEdyb292eVNoZWxsLmphdmF0AB9ydW5TY3JpcHRPck1haW5PclRlc3RPclJ1bm5hYmxlc3EAfgAOAAAB+3EAfgAvcQB+ADBxAH4ALXNxAH4ADgAAAeZxAH4AL3EAfgAwcQB+AC1zcQB+AA4AAACrcQB+AC9xAH4AMHEAfgAtc3EAfgAO/////3QAHWdyb292eS5sYW5nLkdyb292eVNoZWxsJHJ1biQwcHQABGNhbGxzcQB+AA4AAAAvcQB+ACRxAH4AJXQAC2RlZmF1bHRDYWxsc3EAfgAOAAAAdHEAfgAocQB+AClxAH4AN3NxAH4ADgAAAJBxAH4AKHEAfgApcQB+ADdzcQB+AA4AAAPndAAqZ3Jvb3Z5LnVpLkNvbnNvbGUkX3J1blNjcmlwdEltcGxfY2xvc3VyZTE2dAAOQ29uc29sZS5ncm9vdnl0AAZkb0NhbGxzcQB+AA7/////cQB+AD1xAH4APnEAfgA/c3EAfgAO/////nQAJHN1bi5yZWZsZWN0Lk5hdGl2ZU1ldGhvZEFjY2Vzc29ySW1wbHQAHU5hdGl2ZU1ldGhvZEFjY2Vzc29ySW1wbC5qYXZhdAAHaW52b2tlMHNxAH4ADgAAAD5xAH4AQnEAfgBDcQB+AB5zcQB+AA4AAAArdAAoc3VuLnJlZmxlY3QuRGVsZWdhdGluZ01ldGhvZEFjY2Vzc29ySW1wbHQAIURlbGVnYXRpbmdNZXRob2RBY2Nlc3NvckltcGwuamF2YXEAfgAec3EAfgAOAAAB8nQAGGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZHQAC01ldGhvZC5qYXZhcQB+AB5zcQB+AA4AAABidAArb3JnLmNvZGVoYXVzLmdyb292eS5yZWZsZWN0aW9uLkNhY2hlZE1ldGhvZHQAEUNhY2hlZE1ldGhvZC5qYXZhcQB+AB5zcQB+AA4AAAFFdAAWZ3Jvb3Z5LmxhbmcuTWV0YU1ldGhvZHQAD01ldGFNZXRob2QuamF2YXQADmRvTWV0aG9kSW52b2tlc3EAfgAOAAABCHQANm9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5tZXRhY2xhc3MuQ2xvc3VyZU1ldGFDbGFzc3QAFUNsb3N1cmVNZXRhQ2xhc3MuamF2YXQADGludm9rZU1ldGhvZHNxAH4ADgAABAp0ABlncm9vdnkubGFuZy5NZXRhQ2xhc3NJbXBsdAASTWV0YUNsYXNzSW1wbC5qYXZhcQB+AFZzcQB+AA4AAAGidAATZ3Jvb3Z5LmxhbmcuQ2xvc3VyZXQADENsb3N1cmUuamF2YXEAfgA3c3EAfgAOAAABnHEAfgBbcQB+AFxxAH4AN3NxAH4ADgAAAfNxAH4AW3EAfgBccQB+AC1zcQB+AA4AAALsdAAQamF2YS5sYW5nLlRocmVhZHQAC1RocmVhZC5qYXZhcQB+AC1zcgAmamF2YS51dGlsLkNvbGxlY3Rpb25zJFVubW9kaWZpYWJsZUxpc3T8DyUxteyOEAIAAUwABGxpc3RxAH4ACXhyACxqYXZhLnV0aWwuQ29sbGVjdGlvbnMkVW5tb2RpZmlhYmxlQ29sbGVjdGlvbhlCAIDLXvceAgABTAABY3QAFkxqYXZhL3V0aWwvQ29sbGVjdGlvbjt4cHNyABNqYXZhLnV0aWwuQXJyYXlMaXN0eIHSHZnHYZ0DAAFJAARzaXpleHAAAAAAdwQAAAAAeHEAfgBneHBw'