Clean up tests to use EventCollectionApparatus more widely.

--
MOS_MIGRATED_REVID=106382513

1 files changed, 8 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 b45bca2bb3..581d8ed7fa 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
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.events;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
 import java.util.ArrayList;
@@ -39,6 +40,13 @@ public class EventCollector extends AbstractEventHandler implements Iterable<Eve
   }
 
   /**
+   * This collector will collect all events that match the event mask.
+   */
+  public EventCollector(EventKind... mask) {
+    this(ImmutableSet.copyOf(mask), new ArrayList<Event>());
+  }
+
+  /**
    * This collector will save the Event instances in the provided
    * collection.
    */