From 949b7b5300afb224078ccffcfd09782415a38309 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <aehlig@google.com>
Date: Mon, 27 Feb 2017 13:56:15 +0000
Subject: Clean up event bus

...now that the ExtendedEventHandler can serve the same purpose.

--
PiperOrigin-RevId: 148640618
MOS_MIGRATED_REVID=148640618
---
 .../com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java | 1 -
 .../google/devtools/build/lib/analysis/util/BuildViewTestCase.java    | 1 -
 .../google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java    | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/test/java/com')

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 98a91b8378..d877c41fdb 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -331,7 +331,6 @@ public abstract class AnalysisTestCase extends FoundationTestCase {
     LoadingResult loadingResult =
         loadingPhaseRunner.execute(
             reporter,
-            eventBus,
             ImmutableList.copyOf(labels),
             PathFragment.EMPTY_FRAGMENT,
             loadingOptions,
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 5d475a20be..42b0ca0dc0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -1486,7 +1486,6 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     LoadingResult loadingResult =
         runner.execute(
             reporter,
-            eventBus,
             targets,
             PathFragment.EMPTY_FRAGMENT,
             loadingOptions,
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index bd06f06a22..9b1b4dc214 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -38,6 +38,7 @@ import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventKind;
+import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.PackageFactory;
@@ -671,8 +672,7 @@ public class LoadingPhaseRunnerTest {
         eventBus.register(listener);
         result =
             loadingPhaseRunner.execute(
-                storedErrors,
-                eventBus,
+                new Reporter(eventBus, storedErrors),
                 ImmutableList.copyOf(patterns),
                 PathFragment.EMPTY_FRAGMENT,
                 options,
-- 
cgit v1.2.3