Assert the specific type of event, not just the existence of any event.

Also remove a bunch of custom uses of EventCollector, and use the (already
existing) EventCollectionApparatus instead.

--
MOS_MIGRATED_REVID=106047665

1 files changed, 10 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/events/EventCollector.java b/src/main/java/com/google/devtools/build/lib/events/EventCollector.java
index 9efd0d9e44..b45bca2bb3 100644
--- a/src/main/java/com/google/devtools/build/lib/events/EventCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/events/EventCollector.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.events;
 
+import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 import java.util.ArrayList;
@@ -64,6 +65,15 @@ public class EventCollector extends AbstractEventHandler implements Iterable<Eve
     return collected.iterator();
   }
 
+  public Iterable<Event> filtered(final EventKind eventKind) {
+    return Iterables.filter(collected, new Predicate<Event>() {
+      @Override
+      public boolean apply(Event event) {
+        return event.getKind() == eventKind;
+      }
+    });
+  }
+
   /**
    * Returns the number of events collected.
    */