commit 5f3e30c046c6e5680d50cba4a71f45d2ab665444
author Francois-Rene Rideau <tunes@google.com> Fri Apr 10 19:08:39 2015 +0000
committer Lukacs Berki <lberki@google.com> Mon Apr 13 11:47:11 2015 +0000
tree 63fd5727af1f18acb941b277f14c2186f62e7488
parent e1861aefd163ccb03e0f34f5706563c5d32e66a5

Simplify Skylark tests

Use the new EvaluationContext infrastructure to simplify Skylark tests
(said infrastructure is originally based on code from these tests).

Merge AbstractEvaluationTestCase and AbstractParserTestCase into
a non-abstract class EvaluationTestCase that uses EvaluationContext.
Cleanup the EventCollectionApparatus it uses.
Refactor all Skylark tests to use this new infrastructure.
Fix EvaluationTest and MethodLibraryTest to actually and correctly
run tests in both modes.

Fix small bugs in the main code base discovered by actually running the
code in both modes, and make error messages identical when possible.

--
MOS_MIGRATED_REVID=90828053

src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index db47743..9f4cd83 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -632,7 +632,7 @@
       return toCollection(o, loc);
     } else {
       throw new EvalException(loc,
-          "type '" + getDataTypeName(o) + "' is not an iterable");
+          "type '" + getDataTypeName(o) + "' is not iterable");
     }
   }