diff options
author | Jon Brandvein <brandjon@google.com> | 2016-07-28 15:01:26 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-07-29 10:09:37 +0000 |
commit | ee8b7aaff277b913d50f3083768564c1d7124c87 (patch) | |
tree | e937f445fe5bdf1d68eb4afa5cd6894abfdb51f2 /src/test/java/com/google/devtools/build/lib | |
parent | 36dbde86be67d3e43e0691c772e52542a31284e3 (diff) |
Fix private symbols, clean up load parsing
--
MOS_MIGRATED_REVID=128699330
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java | 20 |
1 files changed, 18 insertions, 2 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 235eb3936d..9ae4e22587 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 @@ -1129,7 +1129,7 @@ public class ParserTest extends EvaluationTestCase { private void invalidImportTest(String importString, String expectedMsg) { setFailFast(false); parseFileForSkylark("load('" + importString + "', 'fun_test')\n"); - assertContainsError(expectedMsg); + assertContainsError(expectedMsg); } @Test @@ -1244,6 +1244,11 @@ public class ParserTest extends EvaluationTestCase { LoadStatement stmt = (LoadStatement) statements.get(0); assertEquals("/foo/bar/file", stmt.getImport().getImportString()); assertThat(stmt.getSymbols()).hasSize(1); + Identifier sym = stmt.getSymbols().get(0); + int startOffset = sym.getLocation().getStartOffset(); + int endOffset = sym.getLocation().getEndOffset(); + assertThat(startOffset).named("getStartOffset()").isEqualTo(22); + assertThat(endOffset).named("getEndOffset()").isEqualTo(startOffset + 10); } @Test @@ -1287,7 +1292,18 @@ public class ParserTest extends EvaluationTestCase { @Test public void testLoadAlias() throws Exception { - runLoadAliasTestForSymbols("my_alias = 'lawl'", "my_alias"); + List<Statement> statements = parseFileForSkylark( + "load('/foo/bar/file', my_alias = 'lawl')\n"); + LoadStatement stmt = (LoadStatement) statements.get(0); + ImmutableList<Identifier> actualSymbols = stmt.getSymbols(); + + assertThat(actualSymbols).hasSize(1); + Identifier sym = actualSymbols.get(0); + assertThat(sym.getName()).isEqualTo("my_alias"); + int startOffset = sym.getLocation().getStartOffset(); + int endOffset = sym.getLocation().getEndOffset(); + assertThat(startOffset).named("getStartOffset()").isEqualTo(22); + assertThat(endOffset).named("getEndOffset()").isEqualTo(startOffset + 8); } @Test |