aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2017-07-17 14:46:02 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-07-18 09:47:36 +0200
commit90ed84c0d9b48b7474b7cba3994561ecec9fe858 (patch)
tree7a602ea9291503c5a2cc05a4912067d783353428 /src/test
parent88518522a18df5788736be6151fc67992efe2aad (diff)
Remove ParseFailureListener in favor of posting to EventBus directly
We now have the ExtendedEventHandler, which is available in all the relevant code paths, so we just post the event directly. PiperOrigin-RevId: 162200923
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
index 904a97f6b7..10f8779909 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
@@ -91,14 +91,13 @@ public abstract class AbstractTargetPatternEvaluatorTest extends PackageLoadingT
protected Pair<Set<Label>, Boolean> parseListKeepGoing(String... patterns)
throws TargetParsingException, InterruptedException {
- ResolvedTargets<Target> result = parseTargetPatternList(parser, parsingListener,
- Arrays.asList(patterns), true);
+ ResolvedTargets<Target> result =
+ parseTargetPatternList(parser, parsingListener, Arrays.asList(patterns), true);
return Pair.of(targetsToLabels(result.getTargets()), result.hasError());
}
/** Event handler that records all parsing errors. */
- protected static final class RecordingParsingListener extends DelegatingEventHandler
- implements ParseFailureListener {
+ protected static final class RecordingParsingListener extends DelegatingEventHandler {
protected final List<Pair<String, String>> events = new ArrayList<>();
private RecordingParsingListener(ExtendedEventHandler delegate) {
@@ -106,8 +105,12 @@ public abstract class AbstractTargetPatternEvaluatorTest extends PackageLoadingT
}
@Override
- public void parsingError(String targetPattern, String message) {
- events.add(Pair.of(targetPattern, message));
+ public void post(Postable post) {
+ super.post(post);
+ if (post instanceof ParsingFailedEvent) {
+ ParsingFailedEvent e = (ParsingFailedEvent) post;
+ events.add(Pair.of(e.getPattern(), e.getMessage()));
+ }
}
protected void assertEmpty() {