commit 76023b9180d7a18defc526126a943fab684971dc
author Francois-Rene Rideau <tunes@google.com> Fri Apr 17 15:31:59 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Apr 17 15:43:19 2015 +0000
tree 0b65fe1803ebfb3eeff439a2d354987889044bd7
parent a8628bfffa72994759e4ac8bb45f317c4f33c05d

More skylark function cleanups

--
MOS_MIGRATED_REVID=91407816

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

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
index 038fb9a..26697d4 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
@@ -221,17 +221,17 @@
 
   @Test
   public void testSumFunction() throws Exception {
-    Function sum = new AbstractFunction("sum") {
-        @Override
-        public Object call(List<Object> args, Map<String, Object> kwargs,
-            FuncallExpression ast, Environment env) {
-          int sum = 0;
-          for (Object arg : args) {
-            sum += (Integer) arg;
-          }
-          return sum;
+    BaseFunction sum = new BaseFunction("sum") {
+      @Override
+      public Object call(List<Object> args, Map<String, Object> kwargs,
+          FuncallExpression ast, Environment env) {
+        int sum = 0;
+        for (Object arg : args) {
+          sum += (Integer) arg;
         }
-      };
+        return sum;
+      }
+    };
 
     update(sum.getName(), sum);
     assertEquals(21, eval("sum(1, 2, 3, 4, 5, 6)"));
@@ -250,16 +250,16 @@
   @Test
   public void testKeywordArgs() throws Exception {
 
-    // This function returns the map of keyword-argument keys or values,
-    Function kwargs = new AbstractFunction("kwargs") {
-        @Override
-        public Object call(List<Object> args,
-                           final Map<String, Object> kwargs,
-                           FuncallExpression ast,
-                           Environment env) {
-          return kwargs;
-        }
-      };
+    // This function returns the map of keyword arguments passed to it.
+    BaseFunction kwargs = new BaseFunction("kwargs") {
+      @Override
+      public Object call(List<Object> args,
+          final Map<String, Object> kwargs,
+          FuncallExpression ast,
+          Environment env) {
+        return kwargs;
+      }
+    };
 
     update(kwargs.getName(), kwargs);
 
@@ -558,7 +558,26 @@
 
   @Test
   public void testDictKeysTooManyArgs() throws Exception {
-    checkEvalError("Invalid number of arguments (expected 0)", "{'a': 1}.keys('abc')");
-    checkEvalError("Invalid number of arguments (expected 0)", "{'a': 1}.keys(arg='abc')");
+    checkEvalError("Invalid number of arguments (expected 0)",
+        "{'a': 1}.keys('abc')");
+  }
+
+  @Test
+  public void testDictKeysTooManyKeyArgs() throws Exception {
+    checkEvalError("Invalid number of arguments (expected 0)",
+        "{'a': 1}.keys(arg='abc')");
+  }
+
+  @Test
+  public void testDictKeysDuplicateKeyArgs() throws Exception {
+    checkEvalError("duplicate keywords 'arg', 'k' in call to keys",
+        "{'a': 1}.keys(arg='abc', arg='def', k=1, k=2)");
+  }
+
+  @Test
+  public void testArgBothPosKey() throws Exception {
+    checkEvalError("replace(this, old, new, maxsplit = null) got multiple values "
+        + "for keyword argument 'new'",
+        "'banana'.replace('a', 'o', old=3, new=4)");
   }
 }