Simplify uses of EventCollector.

--
MOS_MIGRATED_REVID=106389517

5 files changed, 13 insertions, 6 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 581d8ed7fa..509083ae86 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
@@ -40,6 +40,13 @@ public class EventCollector extends AbstractEventHandler implements Iterable<Eve
   }
 
   /**
+   * This collector will collect all events.
+   */
+  public EventCollector() {
+    this(EventKind.ALL_EVENTS, new ArrayList<Event>());
+  }
+
+  /**
    * This collector will collect all events that match the event mask.
    */
   public EventCollector(EventKind... mask) {
diff --git a/src/test/java/com/google/devtools/build/lib/events/EventCollectorTest.java b/src/test/java/com/google/devtools/build/lib/events/EventCollectorTest.java
index df9d72cb9e..be5a67dbf3 100644
--- a/src/test/java/com/google/devtools/build/lib/events/EventCollectorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/events/EventCollectorTest.java
@@ -36,7 +36,7 @@ public class EventCollectorTest extends EventTestTemplate {
   @Test
   public void usesPassedInCollection() {
     Collection<Event> events = new ArrayList<>();
-    EventCollector collector = new EventCollector(EventKind.ERRORS_AND_WARNINGS, events);
+    EventCollector collector = new EventCollector(EventKind.ALL_EVENTS, events);
     collector.handle(event);
     Event onlyEvent = events.iterator().next();
     assertEquals(event.getMessage(), onlyEvent.getMessage());
@@ -50,7 +50,7 @@ public class EventCollectorTest extends EventTestTemplate {
 
   @Test
   public void collectsEvents() {
-    EventCollector collector = new EventCollector(EventKind.ERRORS_AND_WARNINGS);
+    EventCollector collector = new EventCollector();
     collector.handle(event);
     Iterator<Event> collectedEventIt = collector.iterator();
     Event onlyEvent = collectedEventIt.next();
diff --git a/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java b/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
index 73e040d00c..e14fc6c6df 100644
--- a/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/events/ReporterTest.java
@@ -50,7 +50,7 @@ public class ReporterTest extends EventTestTemplate {
   @Test
   public void reporterShowOutput() {
     reporter.setOutputFilter(OutputFilter.RegexOutputFilter.forRegex("naughty"));
-    EventCollector collector = new EventCollector(EventKind.ALL_EVENTS);
+    EventCollector collector = new EventCollector();
     reporter.addHandler(collector);
     Event interesting = new Event(EventKind.WARNING, null, "show-me", "naughty");
 
@@ -63,7 +63,7 @@ public class ReporterTest extends EventTestTemplate {
   @Test
   public void reporterCollectsEvents() {
     ImmutableList<Event> want = ImmutableList.of(Event.warn("xyz"), Event.error("err"));
-    EventCollector collector = new EventCollector(EventKind.ALL_EVENTS);
+    EventCollector collector = new EventCollector();
     reporter.addHandler(collector);
     for (Event e : want) {
       reporter.handle(e);
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
index aa554b49e5..aea1db5f50 100644
--- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java
@@ -136,7 +136,7 @@ public class MemoizingEvaluatorTest {
 
   @Before
   public void initializeReporter() {
-    eventCollector = new EventCollector(EventKind.ALL_EVENTS);
+    eventCollector = new EventCollector();
     reporter = new Reporter(eventCollector);
     tester.resetPlayedEvents();
   }
diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
index bf306e4d5a..4a2f8ed317 100644
--- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -89,7 +89,7 @@ public class ParallelEvaluatorTest {
 
   @Before
   public void initializeReporter() {
-    eventCollector = new EventCollector(EventKind.ALL_EVENTS);
+    eventCollector = new EventCollector();
     reporter = new Reporter(eventCollector);
   }