aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com
diff options
context:
space:
mode:
authorGravatar Klaus Aehlig <aehlig@google.com>2017-02-27 13:56:15 +0000
committerGravatar Yue Gan <yueg@google.com>2017-02-27 15:10:45 +0000
commit949b7b5300afb224078ccffcfd09782415a38309 (patch)
treed93fe2b0c59bc1f65d7c12fb0e73c2100b047c83 /src/test/java/com
parent5f27712d09a501c8d5da20b43484490076b749f2 (diff)
Clean up event bus
...now that the ExtendedEventHandler can serve the same purpose. -- PiperOrigin-RevId: 148640618 MOS_MIGRATED_REVID=148640618
Diffstat (limited to 'src/test/java/com')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java1
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java4
3 files changed, 2 insertions, 4 deletions
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,