diff options
author | 2016-11-23 16:50:23 +0000 | |
---|---|---|
committer | 2016-11-23 17:02:29 +0000 | |
commit | 2c52dab02f37bb85ac8790823d613f8b6ae5358f (patch) | |
tree | 2ded4485b98c9b9f6f42bf2d53ab9801a607b438 /src/test/java/com/google/devtools/build/lib/syntax/util | |
parent | f36b4061b4c3c731bd90e34b9fe7648a50542d8c (diff) |
Remove Environment.parseFile
--
MOS_MIGRATED_REVID=140037282
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/syntax/util')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java | 11 |
1 files changed, 7 insertions, 4 deletions
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; |