diff options
3 files changed, 9 insertions, 22 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/select/AbstractAttributeMapperTest.java b/src/test/java/com/google/devtools/build/lib/analysis/select/AbstractAttributeMapperTest.java index 5bfb3291a7..bdbc4c01ff 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/select/AbstractAttributeMapperTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/select/AbstractAttributeMapperTest.java @@ -55,7 +55,7 @@ public class AbstractAttributeMapperTest extends FoundationTestCase { protected Rule createRule(String pkgPath, String ruleName, String... ruleDef) throws Exception { Scratch scratch = new Scratch(); EventCollectionApparatus events = new EventCollectionApparatus(); - PackageFactoryApparatus packages = new PackageFactoryApparatus(events, scratch); + PackageFactoryApparatus packages = new PackageFactoryApparatus(events.reporter()); Path buildFile = scratch.file(pkgPath + "/BUILD", ruleDef); pkg = packages.createPackage(pkgPath, buildFile); diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java index c5f5c7993e..4ee94dd925 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java @@ -41,7 +41,7 @@ public class ExportsFilesTest { private Scratch scratch = new Scratch("/workspace"); private EventCollectionApparatus events = new EventCollectionApparatus(); - private PackageFactoryApparatus packages = new PackageFactoryApparatus(events, scratch); + private PackageFactoryApparatus packages = new PackageFactoryApparatus(events.reporter()); private Package pkg() throws Exception { Path buildFile = scratch.file("pkg/BUILD", diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java index 164ebe3858..92ee12a613 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.Reporter; -import com.google.devtools.build.lib.events.util.EventCollectionApparatus; import com.google.devtools.build.lib.packages.CachingPackageLocator; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.GlobCache; @@ -32,7 +31,6 @@ import com.google.devtools.build.lib.packages.RuleClassProvider; import com.google.devtools.build.lib.syntax.BuildFileAST; import com.google.devtools.build.lib.syntax.Environment.Extension; import com.google.devtools.build.lib.syntax.ParserInputSource; -import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.util.Pair; @@ -46,16 +44,14 @@ import java.io.IOException; */ public class PackageFactoryApparatus { - private final EventCollectionApparatus events; - private final Scratch scratch; + private final Reporter reporter; private final CachingPackageLocator locator; private final PackageFactory factory; - public PackageFactoryApparatus(EventCollectionApparatus events, Scratch scratch, - PackageFactory.EnvironmentExtension... environmentExtensions) { - this.events = events; - this.scratch = scratch; + public PackageFactoryApparatus( + Reporter reporter, PackageFactory.EnvironmentExtension... environmentExtensions) { + this.reporter = reporter; RuleClassProvider ruleClassProvider = TestRuleClassProvider.getRuleClassProvider(); // This is used only in globbing and will cause us to always traverse @@ -82,7 +78,7 @@ public class PackageFactoryApparatus { */ public Package createPackage(String packageName, Path buildFile) throws Exception { - return createPackage(packageName, buildFile, events.reporter()); + return createPackage(packageName, buildFile, reporter); } /** @@ -106,16 +102,7 @@ public class PackageFactoryApparatus { */ public BuildFileAST ast(Path buildFile) throws IOException { ParserInputSource inputSource = ParserInputSource.create(buildFile); - return BuildFileAST.parseBuildFile(inputSource, events.reporter(), /*parsePython=*/false); - } - - /** - * Parses the {@code lines} into a {@link BuildFileAST}. - */ - public BuildFileAST ast(String fileName, String... lines) - throws IOException { - Path file = scratch.file(fileName, lines); - return ast(file); + return BuildFileAST.parseBuildFile(inputSource, reporter, /*parsePython=*/ false); } /** @@ -145,7 +132,7 @@ public class PackageFactoryApparatus { ImmutableMap.<PathFragment, Extension>of(), ImmutableList.<Label>of()); Package result = resultBuilder.build(); - Event.replayEventsOn(events.reporter(), result.getEvents()); + Event.replayEventsOn(reporter, result.getEvents()); return Pair.of(result, globCache); } |