2 files changed, 11 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
index f20157a782..3387fac8c0 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.LinkedList;
 import java.util.List;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -40,15 +39,8 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class ParserTest extends EvaluationTestCase {
 
-  Environment buildEnvironment;
-
-  @Before
-  public final void createBuildEnvironment() throws Exception  {
-    buildEnvironment = newBuildEnvironment();
-  }
-
   private BuildFileAST parseFileWithComments(String... input) {
-    return BuildFileAST.parseBuildString(buildEnvironment.getEventHandler(), input);
+    return BuildFileAST.parseBuildString(getEventHandler(), input);
   }
 
   /** Parses build code (not Skylark) */
@@ -59,7 +51,9 @@ public class ParserTest extends EvaluationTestCase {
 
   /** Parses Skylark code */
   private List<Statement> parseFileForSkylark(String... input) {
-    return env.parseFile(input);
+    BuildFileAST ast = BuildFileAST.parseSkylarkString(getEventHandler(), input);
+    ast = ast.validate(new ValidationEnvironment(env), getEventHandler());
+    return ast.getStatements();
   }
 
   private static String getText(String text, ASTNode node) {
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index 8d72a031cf..b344607e18 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -25,6 +25,7 @@ import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.util.EventCollectionApparatus;
 import com.google.devtools.build.lib.syntax.BazelLibrary;
+import com.google.devtools.build.lib.syntax.BuildFileAST;
 import com.google.devtools.build.lib.syntax.Environment;
 import com.google.devtools.build.lib.syntax.Environment.Phase;
 import com.google.devtools.build.lib.syntax.EvalException;
@@ -34,6 +35,7 @@ import com.google.devtools.build.lib.syntax.Parser;
 import com.google.devtools.build.lib.syntax.ParserInputSource;
 import com.google.devtools.build.lib.syntax.SkylarkUtils;
 import com.google.devtools.build.lib.syntax.Statement;
+import com.google.devtools.build.lib.syntax.ValidationEnvironment;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.testutil.TestMode;
 import java.util.LinkedList;
@@ -133,7 +135,9 @@ public class EvaluationTestCase {
   }
 
   protected List<Statement> parseFile(String... input) {
-    return env.parseFile(input);
+    BuildFileAST ast = BuildFileAST.parseSkylarkString(getEventHandler(), input);
+    ast = ast.validate(new ValidationEnvironment(env), getEventHandler());
+    return ast.getStatements();
   }
 
   /** Parses an Expression from string without a supporting file */
@@ -431,10 +435,9 @@ public class EvaluationTestCase {
   }
 
   /**
-   * A simple decorator that allows the execution of setup actions before running
-   * a {@code Testable}
+   * A simple decorator that allows the execution of setup actions before running a {@code Testable}
    */
-  class TestableDecorator implements Testable {
+  static class TestableDecorator implements Testable {
     private final SetupActions setup;
     private final Testable decorated;