diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/syntax/ParserTest.java | 18 |
1 files changed, 9 insertions, 9 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 b7614507b8..e90f2421aa 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 @@ -1013,15 +1013,15 @@ public class ParserTest extends EvaluationTestCase { List<Statement> statements = parseFileForSkylark("load('" + importString + "', 'fun_test')\n"); LoadStatement stmt = (LoadStatement) statements.get(0); - SkylarkImport imp = SkylarkImports.create(stmt.getImport()); + SkylarkImport imp = SkylarkImports.create(stmt.getImport().getValue()); assertThat(imp.getImportString()).named("getImportString()").isEqualTo("/some/skylark/file"); assertThat(imp.hasAbsolutePath()).named("hasAbsolutePath()").isTrue(); assertThat(imp.getAbsolutePath()).named("getAbsolutePath()") .isEqualTo(new PathFragment("/some/skylark/file.bzl")); - int startOffset = stmt.getImportLocation().getStartOffset(); - int endOffset = stmt.getImportLocation().getEndOffset(); + int startOffset = stmt.getImport().getLocation().getStartOffset(); + int endOffset = stmt.getImport().getLocation().getEndOffset(); assertThat(startOffset).named("getStartOffset()").isEqualTo(5); assertThat(endOffset).named("getEndOffset()") .isEqualTo(startOffset + importString.length() + 2); @@ -1032,7 +1032,7 @@ public class ParserTest extends EvaluationTestCase { List<Statement> statements = parseFileForSkylark("load('" + importString + "', 'fun_test')\n"); LoadStatement stmt = (LoadStatement) statements.get(0); - SkylarkImport imp = SkylarkImports.create(stmt.getImport()); + SkylarkImport imp = SkylarkImports.create(stmt.getImport().getValue()); assertThat(imp.getImportString()).named("getImportString()").isEqualTo(importString); assertThat(imp.hasAbsolutePath()).named("hasAbsolutePath()").isFalse(); @@ -1041,8 +1041,8 @@ public class ParserTest extends EvaluationTestCase { assertThat(imp.getLabel(containingFileLabel)).named("containingFileLabel()") .isEqualTo(Label.parseAbsoluteUnchecked(expectedLabelString)); - int startOffset = stmt.getImportLocation().getStartOffset(); - int endOffset = stmt.getImportLocation().getEndOffset(); + int startOffset = stmt.getImport().getLocation().getStartOffset(); + int endOffset = stmt.getImport().getLocation().getEndOffset(); assertThat(startOffset).named("getStartOffset()").isEqualTo(5); assertThat(endOffset).named("getEndOffset()") .isEqualTo(startOffset + importString.length() + 2); @@ -1165,7 +1165,7 @@ public class ParserTest extends EvaluationTestCase { List<Statement> statements = parseFileForSkylark( "load('/foo/bar/file', 'fun_test')\n"); LoadStatement stmt = (LoadStatement) statements.get(0); - assertEquals("/foo/bar/file", stmt.getImport()); + assertEquals("/foo/bar/file", stmt.getImport().getValue()); assertThat(stmt.getSymbols()).hasSize(1); Identifier sym = stmt.getSymbols().get(0); int startOffset = sym.getLocation().getStartOffset(); @@ -1179,7 +1179,7 @@ public class ParserTest extends EvaluationTestCase { List<Statement> statements = parseFileForSkylark( "load('/foo/bar/file', 'fun_test',)\n"); LoadStatement stmt = (LoadStatement) statements.get(0); - assertEquals("/foo/bar/file", stmt.getImport()); + assertEquals("/foo/bar/file", stmt.getImport().getValue()); assertThat(stmt.getSymbols()).hasSize(1); } @@ -1188,7 +1188,7 @@ public class ParserTest extends EvaluationTestCase { List<Statement> statements = parseFileForSkylark( "load('file', 'foo', 'bar')\n"); LoadStatement stmt = (LoadStatement) statements.get(0); - assertEquals("file", stmt.getImport()); + assertEquals("file", stmt.getImport().getValue()); assertThat(stmt.getSymbols()).hasSize(2); } |