separate class and method within MissingMethodException message

eric-milles · eric-milles · commit 2e2e407253d5 · 2025-05-26T14:11:44.000-05:00
diff --git a/src/main/java/groovy/lang/MissingMethodException.java b/src/main/java/groovy/lang/MissingMethodException.java
@@ -54,16 +54,19 @@ public Object[] getArguments() {
 
     @Override
     public String getMessage() {
-        return "No signature of method: "
-                + (isStatic ? "static " : "")
+        Class<?> type = getType();
+        Object[] args = getArguments();
+        return "No signature of "
+                + (isStatic() ? "static " : "")
+                + "method: "
+                + getMethod()
+                + " for class: "
                 + (type != null ? type.getName() : "<unknown>")
-                + "."
-                + method
-                + "() is applicable for argument types: ("
-                + FormatHelper.toTypeString(arguments, 80)
+                + " is applicable for argument types: ("
+                + FormatHelper.toTypeString(args, 80)
                 + ") values: "
-                + FormatHelper.toArrayString(arguments, 80, true)
-                + (type != null ? MethodRankHelper.getMethodSuggestionString(method, type, arguments) : "");
+                + FormatHelper.toArrayString(args, 80, true)
+                + (type != null ? MethodRankHelper.getMethodSuggestionString(getMethod(), type, args) : "");
     }
 
     /**
diff --git a/src/spec/test/typing/StaticCompilationIntroTest.groovy b/src/spec/test/typing/StaticCompilationIntroTest.groovy
@@ -18,9 +18,12 @@
  */
 package typing
 
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Test
 
-class StaticCompilationIntroTest extends GroovyTestCase {
+import static groovy.test.GroovyAssert.assertScript
+import static groovy.test.GroovyAssert.shouldFail
+
+final class StaticCompilationIntroTest {
 
     private static String TYPESAFE_PROGRAM = '''
         // tag::intro_typesafe[]
@@ -66,31 +69,27 @@ class StaticCompilationIntroTest extends GroovyTestCase {
 
     private static final String RUN = '''
         test()
-'''
+    '''
 
     private static final String RUNTIME_MAGIC = '''
         // tag::intro_typesafe_magic[]
         Computer.metaClass.compute = { String str -> new Date() }
         // end::intro_typesafe_magic[]
     '''
 
+    @Test
     void testTypeSafeProgram() {
-        def shell = new GroovyShell()
-        shell.evaluate(TYPESAFE_PROGRAM+RUN)
+        assertScript(TYPESAFE_PROGRAM+RUN)
     }
 
+    @Test
     void testTypeSafeProgramBroken() {
-        def shell = new GroovyShell()
-        try {
-            shell.evaluate(TYPESAFE_PROGRAM+RUNTIME_MAGIC+RUN)
-            assert false
-        } catch (MissingMethodException e) {
-            assert e.message.contains('No signature of method: Computer.compute() is applicable for argument types: (Date)')
-        }
+        def e = shouldFail(MissingMethodException, TYPESAFE_PROGRAM+RUNTIME_MAGIC+RUN)
+        assert e.message.contains('No signature of method: compute for class: Computer is applicable for argument types: (Date)')
     }
 
+    @Test
     void testTypeSafeProgramFixedWithCompileStatic() {
-        def shell = new GroovyShell()
-        shell.evaluate(TYPESAFE_COMPILESTATIC_PROGRAM+RUNTIME_MAGIC+RUN)
+        assertScript(TYPESAFE_COMPILESTATIC_PROGRAM+RUNTIME_MAGIC+RUN)
     }
 }
diff --git a/src/test/groovy/bugs/Groovy3645.groovy b/src/test/groovy/bugs/Groovy3645.groovy
@@ -18,20 +18,20 @@
  */
 package bugs
 
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Test
 
-class Groovy3645Bug extends GroovyTestCase {
+import static groovy.test.GroovyAssert.shouldFail
+
+final class Groovy3645 {
+    @Test
     void testMethodCallOnSuperInAStaticMethod() {
-        try{
-            assertScript """
-                class Foo3645 {
-                    static main(args) {
-                        super.bar()
-                    }
+        def err = shouldFail MissingMethodException, '''
+            class Foo3645 {
+                static main(args) {
+                    super.bar()
                 }
-            """
-        } catch(MissingMethodException ex) {
-            assertTrue ex.message.contains("No signature of method: static java.lang.Object.bar()")
-        }
+            }
+        '''
+        assert err.message.contains('No signature of static method: bar for class: java.lang.Object')
     }
 }
diff --git a/src/test/groovy/bugs/Groovy4857.groovy b/src/test/groovy/bugs/Groovy4857.groovy
@@ -18,36 +18,35 @@
  */
 package bugs
 
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Test
 
-class Groovy4857Bug extends GroovyTestCase {
+import static groovy.test.GroovyAssert.shouldFail
+
+final class Groovy4857 {
+
+    @Test
     void testMissingMethodNotUnsupportedOperation() {
-        try {
-            new GroovyShell().evaluate """
-                interface A { def getValue() }
+        def err = shouldFail MissingMethodException, '''
+            interface A { def getValue() }
 
-                class B { }
+            class B { }
 
-                def test = [ getValue: { 'getValue() called' } ] as A
+            def test = [ getValue: { 'getValue() called' } ] as A
 
-                def b = new B()
+            def b = new B()
 
-                b.call(test)
-            """
-            fail('The compilation should have failed with No signature of method: B.call()')
-        } catch (e) {
-            assert e.message.contains('No signature of method: B.call()')
-            assert e.class.name == 'groovy.lang.MissingMethodException'
-        }
+            b.call(test)
+        '''
+        assert err.message.contains('No signature of method: call for class: B')
     }
 
+    @Test
     void testTrygveAmundsensExample() {
-        def val = new GroovyShell().evaluate """
+        def val = new GroovyShell().evaluate '''
             [run: {}] as Runnable
-        """
+        '''
 
         assert val.toString()
         assert val instanceof Runnable
     }
 }
-
diff --git a/src/test/groovy/bugs/Groovy6072.groovy b/src/test/groovy/bugs/Groovy6072.groovy
@@ -18,16 +18,19 @@
  */
 package bugs
 
-import groovy.test.GroovyTestCase
+import org.junit.jupiter.api.Test
 
-class Groovy6072Bug extends GroovyTestCase {
+import static groovy.test.GroovyAssert.shouldFail
+
+final class Groovy6072 {
+    @Test
     void testShouldNotChangeBinExpToClassExp() {
-        assertScript '''import groovy.transform.ASTTest
+        def err = shouldFail MissingMethodException, '''
+            import groovy.transform.ASTTest
             import org.codehaus.groovy.ast.expr.BinaryExpression
 
             class OhNo {}
 
-            try {
             @ASTTest(phase=CANONICALIZATION, value={
                 def right = node.rightExpression
                 assert right instanceof BinaryExpression
@@ -39,10 +42,7 @@ class Groovy6072Bug extends GroovyTestCase {
                 assert right instanceof BinaryExpression
             })
             def expr2 = OhNo | []
-            } catch (MissingMethodException ex) {
-                assert ex.message.contains('or()')
-                // alright, what we wanted to test has gone
-            }
         '''
+        assert err.message.contains('No signature of static method: or for class: OhNo')
     }
 }
diff --git a/src/test/groovy/bugs/Groovy8678.groovy b/src/test/groovy/bugs/Groovy8678.groovy
@@ -18,7 +18,7 @@
  */
 package bugs
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
 import static groovy.test.GroovyAssert.shouldFail
@@ -79,87 +79,86 @@ final class Groovy8678 {
     @Test
     void testMissingPropertyOrMethod() {
         def x = new WithMethods()
-        def throwable = shouldFail () -> x.'42'
-        assert throwable.class == MissingPropertyException.class
+
+        def throwable = shouldFail(MissingPropertyException) { x.'42' }
         assert throwable.message.startsWith('No such property: 42 for class: bugs.Groovy8678$WithMethods')
-        throwable = shouldFail () -> x.'42d'
-        assert throwable.class == MissingPropertyException.class
+
+        throwable = shouldFail(MissingPropertyException) { x.'42d' }
         assert throwable.message.startsWith('No such property: 42d for class: bugs.Groovy8678$WithMethods')
-        throwable = shouldFail () -> x.'84'()
-        assert throwable.class == MissingMethodException.class
-        assert throwable.message.startsWith('No signature of method: bugs.Groovy8678$WithMethods.84() is applicable for argument types: () values: []')
-        throwable = shouldFail () -> x.'84f'()
-        assert throwable.class == MissingMethodException.class
-        assert throwable.message.startsWith('No signature of method: bugs.Groovy8678$WithMethods.84f() is applicable for argument types: () values: []')
+
+        throwable = shouldFail(MissingMethodException) { x.'84'() }
+        assert throwable.message.startsWith('No signature of method: 84 for class: bugs.Groovy8678$WithMethods is applicable for argument types: () values: []')
+
+        throwable = shouldFail(MissingMethodException) { x.'84f'() }
+        assert throwable.message.startsWith('No signature of method: 84f for class: bugs.Groovy8678$WithMethods is applicable for argument types: () values: []')
     }
 
     @Test
-    @SuppressWarnings("all")
     void testCompilationFailure() {
         shouldNotCompile('\'42\'', '\'FortyTwo\'', '42',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: WithMethods.call() is applicable for argument types: (BigDecimal) values: [0.42]'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: WithMethods is applicable for argument types: (BigDecimal) values: [0.42]'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.42\''))
         shouldNotCompile('\'42\'', '\'FortyTwo\'', '42()',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: java.math.BigDecimal.call() is applicable for argument types: () values: []'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: java.math.BigDecimal is applicable for argument types: () values: []'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.42\''))
         shouldNotCompile('\'42d\'', '\'FortyTwo\'', '42d',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: WithMethods.call() is applicable for argument types: (Double) values: [0.42]'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: WithMethods is applicable for argument types: (Double) values: [0.42]'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.42d\''))
         shouldNotCompile('\'42d\'', '\'FortyTwo\'', '42d()',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: java.lang.Double.call() is applicable for argument types: () values: []'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: java.lang.Double is applicable for argument types: () values: []'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.42d\''))
         shouldNotCompile('get84', '\'EightyFour\'', '84',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: WithMethods.call() is applicable for argument types: (BigDecimal) values: [0.84]'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: WithMethods is applicable for argument types: (BigDecimal) values: [0.84]'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.84\''))
         shouldNotCompile('get84', '\'EightyFour\'', '84()',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: java.math.BigDecimal.call() is applicable for argument types: () values: []'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: java.math.BigDecimal is applicable for argument types: () values: []'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.84\''))
         shouldNotCompile('get84f', '\'EightyFourEff\'', '84f',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: WithMethods.call() is applicable for argument types: (Float) values: [0.84]'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: WithMethods is applicable for argument types: (Float) values: [0.84]'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.84f\''))
         shouldNotCompile('get84f', '\'EightyFourEff\'', '84f()',
                 // after GROOVY-8678
-                cls -> cls == MissingMethodException.class,
-                msg -> msg.startsWith('No signature of method: java.lang.Float.call() is applicable for argument types: () values: []'))
+                MissingMethodException,
+                msg -> msg.startsWith('No signature of method: call for class: java.lang.Float is applicable for argument types: () values: []'))
                 // before GROOVY-8678
-                // cls -> cls == MultipleCompilationErrorsException.class,
+                // MultipleCompilationErrorsException,
                 // msg -> msg.contains('Unexpected input: \'x.84f\''))
     }
 
     private static void shouldNotCompile(String methodName,
                                  String returnValue,
                                  String expression,
-                                 Closure<Class<? extends Exception>> exceptionAssertion,
+                                 Class<? extends Exception> exceptionType,
                                  Closure<String> messageAssertion) {
-        def throwable = shouldFail """
+        def throwable = shouldFail exceptionType, """
             class WithMethods {
                 def ${methodName}() {
                     ${returnValue}
@@ -168,7 +167,6 @@ final class Groovy8678 {
             def x = new WithMethods()
             x.${expression}
         """.stripIndent()
-        assert exceptionAssertion(throwable.class)
         assert messageAssertion(throwable.message)
     }
 
diff --git a/src/test/groovy/bugs/Groovy9779.groovy b/src/test/groovy/bugs/Groovy9779.groovy
@@ -18,14 +18,13 @@
  */
 package bugs
 
-import groovy.transform.CompileStatic
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
 import static groovy.test.GroovyAssert.shouldFail
 
-@CompileStatic
 final class Groovy9779 {
+
     @Test
     void testCallOperatorOnDynamicProperties1() {
         assertScript '''
@@ -73,7 +72,7 @@ final class Groovy9779 {
             }
             C.x()
         '''
-        assert err.message.contains('No signature of method: B.call() is applicable')
+        assert err.message.contains('No signature of method: call for class: B is applicable')
     }
 
     @Test // don't chain call properties together
@@ -90,7 +89,7 @@ final class Groovy9779 {
             }
             assert new C() + 1 == 42
         '''
-        assert err.message.contains('No signature of method: C.plus() is applicable')
+        assert err.message.contains('No signature of method: plus for class: C is applicable')
     }
 
     @Test
diff --git a/src/test/groovy/bugs/MethodClosureTest.groovy b/src/test/groovy/bugs/MethodClosureTest.groovy
@@ -19,7 +19,7 @@
 package bugs
 
 import org.codehaus.groovy.runtime.MethodClosure
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 import static groovy.test.GroovyAssert.assertScript
 import static groovy.test.GroovyAssert.shouldFail
diff --git a/src/test/groovy/groovy/ThisAndSuperTest.groovy b/src/test/groovy/groovy/ThisAndSuperTest.groovy
diff --git a/src/test/groovy/groovy/util/BuilderSupportTest.groovy b/src/test/groovy/groovy/util/BuilderSupportTest.groovy
diff --git a/src/test/groovy/org/codehaus/groovy/transform/NewifyTransformBlackBoxTest.groovy b/src/test/groovy/org/codehaus/groovy/transform/NewifyTransformBlackBoxTest.groovy
