Use EventHandler rather than Reporter where possible in

PackageFactoryTest and PackageFactoryApparatus.

--
MOS_MIGRATED_REVID=104094984

1 files changed, 26 insertions, 23 deletions

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 92ee12a613..46ddbd016b 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
@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMap;
 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.EventHandler;
 import com.google.devtools.build.lib.packages.CachingPackageLocator;
 import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.GlobCache;
@@ -44,20 +44,13 @@ import java.io.IOException;
  */
 public class PackageFactoryApparatus {
 
-  private final Reporter reporter;
-  private final CachingPackageLocator locator;
-
+  private final EventHandler eventHandler;
   private final PackageFactory factory;
 
   public PackageFactoryApparatus(
-      Reporter reporter, PackageFactory.EnvironmentExtension... environmentExtensions) {
-    this.reporter = reporter;
+      EventHandler eventHandler, PackageFactory.EnvironmentExtension... environmentExtensions) {
+    this.eventHandler = eventHandler;
     RuleClassProvider ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
-
-    // This is used only in globbing and will cause us to always traverse
-    // subdirectories.
-    this.locator = createEmptyLocator();
-
     factory = new PackageFactory(ruleClassProvider, null,
         ImmutableList.copyOf(environmentExtensions));
   }
@@ -69,8 +62,10 @@ public class PackageFactoryApparatus {
     return factory;
   }
 
-  public CachingPackageLocator getPackageLocator() {
-    return locator;
+  private CachingPackageLocator getPackageLocator() {
+    // This is used only in globbing and will cause us to always traverse
+    // subdirectories.
+    return createEmptyLocator();
   }
 
   /**
@@ -78,19 +73,22 @@ public class PackageFactoryApparatus {
    */
   public Package createPackage(String packageName, Path buildFile)
       throws Exception {
-    return createPackage(packageName, buildFile, reporter);
+    return createPackage(packageName, buildFile, eventHandler);
   }
 
   /**
-   * Parses and evaluates {@code buildFile} with custom {@code reporter} and returns the resulting
+   * Parses and evaluates {@code buildFile} with custom {@code eventHandler} and returns the resulting
    * {@link Package} instance.
    */
-  public Package createPackage(String packageName, Path buildFile,
-      Reporter reporter)
+  public Package createPackage(String packageName, Path buildFile, EventHandler reporter)
       throws Exception {
     try {
-      Package pkg = factory.createPackageForTesting(
-          PackageIdentifier.createInDefaultRepo(packageName), buildFile, locator, reporter);
+      Package pkg =
+          factory.createPackageForTesting(
+              PackageIdentifier.createInDefaultRepo(packageName),
+              buildFile,
+              getPackageLocator(),
+              reporter);
       return pkg;
     } catch (InterruptedException e) {
       throw new IllegalStateException(e);
@@ -102,7 +100,7 @@ public class PackageFactoryApparatus {
    */
   public BuildFileAST ast(Path buildFile) throws IOException {
     ParserInputSource inputSource = ParserInputSource.create(buildFile);
-    return BuildFileAST.parseBuildFile(inputSource, reporter, /*parsePython=*/ false);
+    return BuildFileAST.parseBuildFile(inputSource, eventHandler, /*parsePython=*/ false);
   }
 
   /**
@@ -111,8 +109,13 @@ public class PackageFactoryApparatus {
   public Pair<Package, GlobCache> evalAndReturnGlobCache(String packageName, Path buildFile,
       BuildFileAST buildFileAST) throws InterruptedException {
     PackageIdentifier packageId = PackageIdentifier.createInDefaultRepo(packageName);
-    GlobCache globCache = new GlobCache(
-        buildFile.getParentDirectory(), packageId, locator, null, TestUtils.getPool());
+    GlobCache globCache =
+        new GlobCache(
+            buildFile.getParentDirectory(),
+            packageId,
+            getPackageLocator(),
+            null,
+            TestUtils.getPool());
     LegacyGlobber globber = new LegacyGlobber(globCache);
     Package externalPkg =
         Package.newExternalPackageBuilder(
@@ -132,7 +135,7 @@ public class PackageFactoryApparatus {
             ImmutableMap.<PathFragment, Extension>of(),
             ImmutableList.<Label>of());
     Package result = resultBuilder.build();
-    Event.replayEventsOn(reporter, result.getEvents());
+    Event.replayEventsOn(eventHandler, result.getEvents());
     return Pair.of(result, globCache);
   }