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/ParserTest.java | |
parent | f36b4061b4c3c731bd90e34b9fe7648a50542d8c (diff) |
Remove Environment.parseFile
--
MOS_MIGRATED_REVID=140037282
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java | 14 |
1 files changed, 4 insertions, 10 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) { |