3 files changed, 21 insertions, 7 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 38aad5ce28..00b1fccff6 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -87,7 +87,8 @@ public final class ActionsTestUtil {
     return new ActionExecutionContext(
         executor,
         new SingleBuildFileCache(execRoot.getPathString(), execRoot.getFileSystem()),
-        metadataHandler, fileOutErr,
+        metadataHandler,
+        fileOutErr,
         actionGraph == null
             ? null
             : ActionInputHelper.actionGraphArtifactExpander(actionGraph));
@@ -102,7 +103,11 @@ public final class ActionsTestUtil {
         metadataHandler, fileOutErr,
         new BlockingSkyFunctionEnvironment(buildDriver,
             executor == null ? null : executor.getEventHandler()));
+  }
 
+  public static ActionExecutionContext createContext(EventHandler eventHandler) {
+    DummyExecutor dummyExecutor = new DummyExecutor(eventHandler);
+    return new ActionExecutionContext(dummyExecutor, null, null, null, null);
   }
 
 
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java b/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java
index ee6f4dafa9..606fe159e9 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/DummyExecutor.java
@@ -25,15 +25,23 @@ import com.google.devtools.common.options.OptionsClassProvider;
  * A dummy implementation of Executor.
  */
 public final class DummyExecutor implements Executor {
+
   private final Path inputDir;
+  private final EventHandler eventHandler; 
 
-  /**
-   * @param inputDir
-   */
   public DummyExecutor(Path inputDir) {
-    this.inputDir = inputDir;
+    this(inputDir, null);
+  }
+
+  public DummyExecutor(EventHandler eventHandler) {
+    this(null, eventHandler);
   }
 
+  public DummyExecutor(Path inputDir, EventHandler eventHandler) {
+    this.inputDir = inputDir;
+    this.eventHandler = eventHandler;
+  }
+  
   @Override
   public Path getExecRoot() {
     return inputDir;
@@ -56,7 +64,7 @@ public final class DummyExecutor implements Executor {
 
   @Override
   public EventHandler getEventHandler() {
-    throw new UnsupportedOperationException();
+    return eventHandler;
   }
 
   @Override
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index a369cf55b7..552ca78853 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -1569,7 +1569,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
       BaselineCoverageAction baselineAction =
           (BaselineCoverageAction) getGeneratingAction(baselineCoverage);
       ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      baselineAction.newDeterministicWriter(null, null).writeOutputFile(bytes);
+      baselineAction.newDeterministicWriter(ActionsTestUtil.createContext(reporter))
+          .writeOutputFile(bytes);
 
       for (String line : new String(bytes.toByteArray(), StandardCharsets.UTF_8).split("\n")) {
         if (line.startsWith("SF:")) {