Change assertNoEvents to assertNoWarningsOrErrors with corresponding semantics.

The plan is to make EventCollectionApparatus collect all events, so the assert
methods all need to specify the subset that they apply to.

--
MOS_MIGRATED_REVID=106291708

5 files changed, 17 insertions, 40 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java b/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
index d64b9a4604..d2fdc5a7c1 100644
--- a/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/events/util/EventCollectionApparatus.java
@@ -47,7 +47,7 @@ public class EventCollectionApparatus {
   }
 
   public EventCollectionApparatus() {
-    this(EventKind.ERRORS_AND_WARNINGS);
+    this(EventKind.ERRORS_WARNINGS_AND_INFO);
   }
 
   public void clear() {
@@ -82,6 +82,10 @@ public class EventCollectionApparatus {
     return eventCollector;
   }
 
+  public Iterable<Event> infos() {
+    return eventCollector.filtered(EventKind.INFO);
+  }
+
   public Iterable<Event> errors() {
     return eventCollector.filtered(EventKind.ERROR);
   }
@@ -100,13 +104,11 @@ public class EventCollectionApparatus {
 
   /**
    * Utility method: Asserts that the {@link #collector()} has not collected
-   * any events.
-   *
-   * @throws IllegalStateException If the apparatus has not yet been
-   *    initialized by calling {@link #reporter()} or {@link #collector()}.
+   * any warnings or errors.
    */
-  public void assertNoEvents() {
-    MoreAsserts.assertNoEvents(eventCollector);
+  public void assertNoWarningsOrErrors() {
+    MoreAsserts.assertNoEvents(warnings());
+    MoreAsserts.assertNoEvents(errors());
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/packages/InputFileTest.java b/src/test/java/com/google/devtools/build/lib/packages/InputFileTest.java
index e56a2128ee..72c077ed44 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/InputFileTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/InputFileTest.java
@@ -52,7 +52,7 @@ public class InputFileTest {
             "        outs = [], ",
             "        srcs = ['x', 'subdir/y'])");
     pkg = packages.createPackage("pkg", buildfile);
-    events.assertNoEvents();
+    events.assertNoWarningsOrErrors();
 
     this.pathX = scratch.file("pkg/x", "blah");
     this.pathY = scratch.file("pkg/subdir/y", "blah blah");
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java
index 86e0bddd3b..3252239cd3 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/BuildFileASTTest.java
@@ -16,16 +16,13 @@ package com.google.devtools.build.lib.syntax;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.events.EventCollector;
-import com.google.devtools.build.lib.packages.CachingPackageLocator;
 import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
 import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
 import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
+import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.vfs.Path;
 
@@ -43,13 +40,6 @@ public class BuildFileASTTest extends EvaluationTestCase {
 
   private Scratch scratch = new Scratch();
 
-  private class ScratchPathPackageLocator implements CachingPackageLocator {
-    @Override
-    public Path getBuildFileForPackage(PackageIdentifier packageName) {
-      return scratch.resolve(packageName.getPackageFragment()).getRelative("BUILD");
-    }
-  }
-
   @Override
   public Environment newEnvironment() throws Exception {
     return newBuildEnvironment();
@@ -148,21 +138,6 @@ public class BuildFileASTTest extends EvaluationTestCase {
     assertTrue(buildFileAST.containsErrors());
   }
 
-  /**
-   * If the specified EventCollector does contain an event which has
-   * 'expectedEvent' as a substring, the matching event is
-   * returned. Otherwise this will return null.
-   */
-  public static Event findEvent(EventCollector eventCollector,
-                                String expectedEvent) {
-    for (Event event : eventCollector) {
-      if (event.getMessage().contains(expectedEvent)) {
-        return event;
-      }
-    }
-    return null;
-  }
-
   @Test
   public void testWithSyntaxErrorsDoesNotPrintDollarError() throws Exception {
     setFailFast(false);
@@ -177,8 +152,8 @@ public class BuildFileASTTest extends EvaluationTestCase {
     assertTrue(buildFile.containsErrors());
     assertContainsError("syntax error at '+': expected expression");
     assertFalse(buildFile.exec(env, getEventHandler()));
-    assertNull(findEvent(getEventCollector(), "$error$"));
+    MoreAsserts.assertDoesNotContainEvent(getEventCollector(), "$error$");
     // This message should not be printed anymore.
-    assertNull(findEvent(getEventCollector(), "contains syntax error(s)"));
+    MoreAsserts.assertDoesNotContainEvent(getEventCollector(), "contains syntax error(s)");
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
index 0f7473596d..f491b44f6a 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
@@ -377,7 +377,7 @@ public class ValidationTest extends EvaluationTestCase {
 
   private void parse(String... lines) {
     parseFile(lines);
-    assertNoEvents();
+    assertNoWarningsOrErrors();
   }
 
   private void checkError(String errorMsg, String... lines) {
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index 6e668a36cf..d598726099 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -189,8 +189,8 @@ public class EvaluationTestCase {
     return this;
   }
 
-  public EvaluationTestCase assertNoEvents() {
-    eventCollectionApparatus.assertNoEvents();
+  public EvaluationTestCase assertNoWarningsOrErrors() {
+    eventCollectionApparatus.assertNoWarningsOrErrors();
     return this;
   }
 
@@ -217,7 +217,7 @@ public class EvaluationTestCase {
   }
 
   public EvaluationTestCase clearEvents() {
-    eventCollectionApparatus.collector().clear();
+    eventCollectionApparatus.clear();
     return this;
   }