minor items

Author: eric-milles

src/test/groovy/groovy/ClosureMissingMethodTest.groovy

@@ -20,110 +20,106 @@ package groovy
 
 import org.junit.jupiter.api.Test
 
-import static org.junit.jupiter.api.Assertions.fail
+import static groovy.test.GroovyAssert.assertScript
+import static groovy.test.GroovyAssert.shouldFail
 
-
-class ClosureMissingMethodTest {
+final class ClosureMissingMethodTest {
 
     @Test
     void testInScript() {
-        GroovyShell shell = new GroovyShell()
-        shell.evaluate("""
-          int count = 0
-
-          foo = {
-            count++
-            bar()
-          }
-          baz = {
-            foo()
-          }
-
-          try {
-              baz()
-              fail()
-          } catch (org.codehaus.groovy.runtime.InvokerInvocationException iie) {
-              assert iie.cause.method == 'bar'
-              assert count == 1
-          } catch (MissingMethodException mme) {
-              assert mme.method == 'bar'
-              assert count == 1
-          }
-      """);
+        assertScript '''
+            int count = 0
+
+            def foo = {
+                ++count
+                bar()
+            }
+            def baz = {
+                foo()
+            }
+
+            try {
+                baz()
+                assert false
+            } catch (org.codehaus.groovy.runtime.InvokerInvocationException iie) {
+                assert iie.cause.method == 'bar'
+                assert count == 1
+            } catch (MissingMethodException mme) {
+                assert mme.method == 'bar'
+                assert count == 1
+            }
+        '''
     }
 
     @Test
     void testInMethod() {
         int count = 0
 
         def foo = {
-            count++
+            ++count
             bar()
         }
         def baz = {
             foo()
         }
 
-        try {
+        def mme = shouldFail(MissingMethodException) {
             baz()
-            fail()
-        } catch (MissingMethodException mme) {
-            assert mme.method == 'bar'
-            assert count == 1
         }
+        assert mme.method == 'bar'
+        assert count == 1
     }
 
     @Test
     void testWithMetaClassInScript() {
-        GroovyShell shell = new GroovyShell()
-        shell.evaluate("""
-          int count = 0
-
-          foo = {
-            count++
-            bar()
-          }
-          baz = {
-            foo()
-          }
-          mc = new ExpandoMetaClass(baz.getClass())
-          mc.initialize()
-          baz.metaClass = mc
-
-          try {
-              baz()
-              fail()
-          } catch (org.codehaus.groovy.runtime.InvokerInvocationException iie) {
-              assert iie.cause.method == 'bar'
-              assert count == 1
-          } catch (MissingMethodException mme) {
-              assert mme.method == 'bar'
-              assert count == 1
-          }
-      """);
+        assertScript '''
+            int count = 0
+
+            def foo = {
+                ++count
+                bar()
+            }
+            def baz = {
+                foo()
+            }
+
+            def emc = new ExpandoMetaClass(baz.getClass())
+            emc.initialize()
+            baz.metaClass = emc
+
+            try {
+                baz()
+                assert false
+            } catch (org.codehaus.groovy.runtime.InvokerInvocationException iie) {
+                assert iie.cause.method == 'bar'
+                assert count == 1
+            } catch (MissingMethodException mme) {
+                assert mme.method == 'bar'
+                assert count == 1
+            }
+        '''
     }
 
     @Test
     void testWithMetaClassInMethod() {
         int count = 0
 
         def foo = {
-            count++
+            ++count
             bar()
         }
         def baz = {
             foo()
         }
-        MetaClass mc = new ExpandoMetaClass(baz.getClass())
-        mc.initialize()
-        baz.metaClass = mc
 
-        try {
+        def emc = new ExpandoMetaClass(baz.getClass())
+        emc.initialize()
+        baz.metaClass = emc
+
+        def mme = shouldFail(MissingMethodException) {
             baz()
-            fail()
-        } catch (MissingMethodException mme) {
-            assert mme.method == 'bar'
-            assert count == 1
         }
+        assert mme.method == 'bar'
+        assert count == 1
     }
 }