commit a96b2d2f3783bd9170d95d9843837f847edefae9
author michajlo <michajlo@google.com> Wed Feb 26 14:54:50 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 26 14:56:14 2020 -0800
tree df22b486bf5bc0728259eaf840d6c375fd69e2da
parent 20c276801ee66a73b73facd5c75ae8b38eabb00d

Pass (Extended)EventHandler to PackageValidator

Allows issuing warnings, etc, for situations that don't warrany failing
validation, yet.

RELNOTES: None
PiperOrigin-RevId: 297458061

src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 0532850..1759139 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -32,6 +32,8 @@
 import com.google.devtools.build.lib.clock.BlazeClock;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
+import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.packages.BuildFileNotFoundException;
 import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
@@ -175,12 +177,13 @@
             inv -> {
               Package pkg = inv.getArgument(0, Package.class);
               if (pkg.getName().equals("pkg")) {
+                inv.getArgument(1, ExtendedEventHandler.class).handle(Event.warn("warning event"));
                 throw new InvalidPackageException(pkg.getPackageIdentifier(), "no good");
               }
               return null;
             })
         .when(mockPackageValidator)
-        .validate(any(Package.class));
+        .validate(any(Package.class), any(ExtendedEventHandler.class));
 
     invalidatePackages();
 
@@ -198,6 +201,7 @@
         .hasExceptionThat()
         .hasMessageThat()
         .contains("no such package 'pkg': no good");
+    assertContainsEvent("warning event");
   }
 
   @Test