commit 1832ed39aaa3898342530377f4c6f8f6583f85d3
author cparsons <cparsons@google.com> Tue Nov 13 14:15:32 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Nov 13 14:17:05 2018 -0800
tree b4f9bab3c118e0e2662498f5beac84d856d6c494
parent 507aa360fb542fef3e4f42828b46ab75a2a8316a

Create infrastructure for convenient control of Starlark Params by semantic flag

Also migrate ~3 examples of parameter control to use the new infrastructure, as a manner of demonstration.

RELNOTES: None.
PiperOrigin-RevId: 221332133

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 60dc76f..7579775 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -771,15 +771,14 @@
   public void testRuleUnknownKeyword() throws Exception {
     registerDummyUserDefinedFunction();
     checkErrorContains(
-        "unexpected keyword 'bad_keyword' in call to " + "rule(implementation: function, ",
+        "unexpected keyword 'bad_keyword', in call to rule(function, string bad_keyword)",
         "rule(impl, bad_keyword = 'some text')");
   }
 
   @Test
   public void testRuleImplementationMissing() throws Exception {
     checkErrorContains(
-        "missing mandatory positional argument 'implementation' while calling "
-            + "rule(implementation",
+        "parameter 'implementation' has no default value, in call to rule(dict attrs)",
         "rule(attrs = {})");
   }
 
@@ -787,8 +786,8 @@
   public void testRuleBadTypeForAdd() throws Exception {
     registerDummyUserDefinedFunction();
     checkErrorContains(
-        "expected dict or NoneType for 'attrs' while calling rule but got string instead: "
-            + "some text",
+        "expected value of type 'dict or NoneType' for parameter 'attrs', "
+            + "in call to rule(function, string attrs)",
         "rule(impl, attrs = 'some text')");
   }
 
@@ -804,7 +803,7 @@
   public void testRuleBadTypeForDoc() throws Exception {
     registerDummyUserDefinedFunction();
     checkErrorContains(
-        "expected string for 'doc' while calling rule but got int instead",
+        "expected value of type 'string' for parameter 'doc', in call to rule(function, int doc)",
         "rule(impl, doc = 1)");
   }
 
@@ -1416,7 +1415,7 @@
   @Test
   public void declaredProvidersBadTypeForDoc() throws Exception {
     checkErrorContains(
-        "expected string for 'doc' while calling provider but got int instead",
+        "expected value of type 'string' for parameter 'doc', in call to provider(int doc)",
         "provider(doc = 1)");
   }
 
@@ -1559,7 +1558,7 @@
   public void aspectBadTypeForDoc() throws Exception {
     registerDummyUserDefinedFunction();
     checkErrorContains(
-        "expected string for 'doc' while calling aspect but got int instead",
+        "expected value of type 'string' for parameter 'doc', in call to aspect(function, int doc)",
         "aspect(impl, doc = 1)");
   }