commit 3b9e1522bc20ead42f40870f9dabb72b1545c7df
author Googler <noreply@google.com> Mon Mar 26 11:03:30 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Mar 26 11:04:52 2018 -0700
tree f1e8168727d0c42b464344bf707e01cfe3c63682
parent ee5bf489c45bd41e63acecad349f13b594729f51

Simplified ActionContextConsumer by having it operate on a new class which holds a variety of strategy/context maps.

PiperOrigin-RevId: 190491357

src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 37fd188..0e93ff2 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
-import com.google.devtools.build.lib.actions.ActionContext;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
 import com.google.devtools.build.lib.actions.ActionKeyContext;
@@ -44,6 +43,7 @@
 import com.google.devtools.build.lib.exec.BlazeExecutor;
 import com.google.devtools.build.lib.exec.ExecutionOptions;
 import com.google.devtools.build.lib.exec.SingleBuildFileCache;
+import com.google.devtools.build.lib.exec.SpawnActionContextMaps;
 import com.google.devtools.build.lib.exec.local.LocalEnvProvider;
 import com.google.devtools.build.lib.exec.local.LocalExecutionOptions;
 import com.google.devtools.build.lib.exec.local.LocalSpawnRunner;
@@ -134,16 +134,17 @@
             bus,
             BlazeClock.instance(),
             optionsParser,
-            ImmutableList.<ActionContext>of(),
-            ImmutableMap.<String, SpawnActionContext>of(
-                "",
-                new StandaloneSpawnStrategy(
-                    execRoot,
-                    new LocalSpawnRunner(
+            SpawnActionContextMaps.createStub(
+                ImmutableList.of(),
+                ImmutableMap.<String, SpawnActionContext>of(
+                    "",
+                    new StandaloneSpawnStrategy(
                         execRoot,
-                        localExecutionOptions,
-                        resourceManager,
-                        LocalEnvProvider.UNMODIFIED))),
+                        new LocalSpawnRunner(
+                            execRoot,
+                            localExecutionOptions,
+                            resourceManager,
+                            LocalEnvProvider.UNMODIFIED)))),
             ImmutableList.<ActionContextProvider>of());
 
     executor.getExecRoot().createDirectoryAndParents();
@@ -170,14 +171,14 @@
   @Test
   public void testBinTrueExecutesFine() throws Exception {
     Spawn spawn = createSpawn(getTrueCommand());
-    executor.getSpawnActionContext(spawn.getMnemonic()).exec(spawn, createContext());
+    executor.getSpawnActionContext(spawn.getMnemonic(), spawn).exec(spawn, createContext());
 
     assertThat(out()).isEmpty();
     assertThat(err()).isEmpty();
   }
 
   private List<SpawnResult> run(Spawn spawn) throws Exception {
-    return executor.getSpawnActionContext(spawn.getMnemonic()).exec(spawn, createContext());
+    return executor.getSpawnActionContext(spawn.getMnemonic(), spawn).exec(spawn, createContext());
   }
 
   private ActionExecutionContext createContext() {