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

1 files changed, 3 insertions, 28 deletions

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)");
   }
 }