commit a95884e5b989577e58d111e72ee50e16ebf1045b
author cparsons <cparsons@google.com> Wed Mar 21 11:06:13 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Mar 21 11:08:19 2018 -0700
tree d9fac959c9c450d5eca8cf67d818955d398e2de2
parent baba6a72f1f03dda9b63895d253d346cadd6574a

Change error messaging of @SkylarkCallable invocations to match @SkylarkSignature more closely.

Also clarify the method representation in these error messages is for the attempted method *call*, not the actual method signature.

RELNOTES: None.
PiperOrigin-RevId: 189935148

src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 8bb82f1..d49d0d5 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -937,13 +937,14 @@
         .update("mock", new Mock())
         .setUp("")
         .testIfExactError(
-            "parameter 'named' has no default value, in method with_params(int, bool) of 'Mock'",
+            "parameter 'named' has no default value, in method call "
+                + "with_params(int, bool) of 'Mock'",
             "mock.with_params(1, True)");
     new SkylarkTest()
         .update("mock", new Mock())
         .setUp("")
         .testIfExactError(
-            "parameter 'named' has no default value, in method with_params(int, bool, bool) "
+            "parameter 'named' has no default value, in method call with_params(int, bool, bool) "
                 + "of 'Mock'",
             "mock.with_params(1, True, True)");
     new SkylarkTest()
@@ -962,14 +963,14 @@
         .update("mock", new Mock())
         .setUp("")
         .testIfExactError(
-            "unexpected keyword 'n', in method with_params(int, bool, bool named, "
+            "unexpected keyword 'n', in method call with_params(int, bool, bool named, "
                 + "bool posOrNamed, int n) of 'Mock'",
             "mock.with_params(1, True, named=True, posOrNamed=True, n=2)");
     new SkylarkTest()
         .update("mock", new Mock())
         .setUp("")
         .testIfExactError(
-            "parameter 'nonNoneable' cannot be None, in method with_params(int, bool, bool, "
+            "parameter 'nonNoneable' cannot be None, in method call with_params(int, bool, bool, "
                 + "bool named, bool optionalNamed, NoneType nonNoneable) of 'Mock'",
             "mock.with_params(1, True, True, named=True, optionalNamed=False, nonNoneable=None)");
 
@@ -977,8 +978,9 @@
         .update("mock", new Mock())
         .setUp("")
         .testIfExactError(
-            "Cannot convert parameter 'multi' to type string or int or sequence of ints or"
-                + " NoneType, in method with_params(int, bool, bool named, bool multi) of 'Mock'",
+            "expected value of type 'string or int or sequence of ints or NoneType' for parameter"
+                + " 'multi', in method call with_params(int, bool, bool named, bool multi)"
+                + " of 'Mock'",
             "mock.with_params(1, True, named=True, multi=False)");
 
     // We do not enforce list item parameter type constraints.