commit 0f7ba34748579faea70e42dfdf60a9625a88f425
author Francois-Rene Rideau <tunes@google.com> Mon Aug 31 16:16:21 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Aug 31 19:21:24 2015 +0000
tree 3f67a3c68e08f0a2dcfcf13b5d31b411dc97a70f
parent 6c29d57b6ddef8a6e7ac39b09e9338f616e78e4d

Move global objects to Runtime

Move away global constants and global namespaces out of Environment
and into a new file Runtime.

--
MOS_MIGRATED_REVID=101940218

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 6b107a1..cf23858 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
@@ -48,15 +48,14 @@
    */
   protected ModalTestCase newTest() {
     return new BuildTest();
-    
   }
 
   @Test
   public void testExprs() throws Exception {
     newTest()
-        .testStatement("'%sx' % 'foo' + 'bar'", "fooxbar")
-        .testStatement("('%sx' % 'foo') + 'bar'", "fooxbar")
-        .testStatement("'%sx' % ('foo' + 'bar')", "foobarx")
+        .testStatement("'%sx' % 'foo' + 'bar1'", "fooxbar1")
+        .testStatement("('%sx' % 'foo') + 'bar2'", "fooxbar2")
+        .testStatement("'%sx' % ('foo' + 'bar3')", "foobar3x")
         .testStatement("123 + 456", 579)
         .testStatement("456 - 123", 333)
         .testStatement("8 % 3", 2)
@@ -90,10 +89,10 @@
         .testStatement("0 or 0 and 3", 0)
         .testStatement("1 or 0 and 3", 1)
 
-        .testStatement("None and 1", Environment.NONE)
+        .testStatement("None and 1", Runtime.NONE)
         .testStatement("\"\" or 9", 9)
         .testStatement("\"abc\" or 9", "abc")
-        
+
         // check that 'foo' is not evaluated
         .testStatement("8 or foo", 8)
         .testStatement("0 and foo", 0);