diff options
Diffstat (limited to 'src/test/java/com/google/devtools')
3 files changed, 15 insertions, 15 deletions
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 1d0cd9be99..7b09b6b3f5 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 @@ -16,8 +16,6 @@ package com.google.devtools.build.lib.actions.util; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.actions.ActionContext; import com.google.devtools.build.lib.actions.Executor; -import com.google.devtools.build.lib.actions.Spawn; -import com.google.devtools.build.lib.actions.SpawnActionContext; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.clock.Clock; import com.google.devtools.build.lib.events.ExtendedEventHandler; @@ -84,11 +82,6 @@ public final class DummyExecutor implements Executor { } @Override - public SpawnActionContext getSpawnActionContext(Spawn spawn) { - throw new UnsupportedOperationException(); - } - - @Override public OptionsClassProvider getOptions() { throw new UnsupportedOperationException(); } diff --git a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java index 0f0a02363d..7c89da42ef 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java @@ -19,6 +19,7 @@ import static com.google.devtools.build.lib.testutil.TestConstants.WORKSPACE_NAM import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.same; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; @@ -135,7 +136,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { .build(); when(spawnActionContext.exec(any(), any())).thenReturn(ImmutableList.of(expectedSpawnResult)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = @@ -221,7 +223,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { .thenThrow(new SpawnExecException("test failed", failSpawnResult, false)) .thenReturn(ImmutableList.of(passSpawnResult)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = @@ -306,7 +309,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { .build(); when(spawnActionContext.exec(any(), any())).thenReturn(ImmutableList.of(expectedSpawnResult)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = @@ -383,7 +387,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { .build(); when(spawnActionContext.exec(any(), any())).thenReturn(ImmutableList.of(expectedSpawnResult)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = @@ -485,7 +490,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { expectedSpawnResult, /*forciblyRunRemotely=*/ false, /*catastrophe=*/ false)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = @@ -563,7 +569,8 @@ public final class StandaloneTestStrategyTest extends BuildViewTestCase { SpawnResult expectedSpawnResult = new SpawnResult.Builder().setStatus(Status.SUCCESS).setRunnerName("test").build(); when(spawnActionContext.exec(any(), any())).thenReturn(ImmutableList.of(expectedSpawnResult)); - when(actionExecutionContext.getSpawnActionContext(any())).thenReturn(spawnActionContext); + when(actionExecutionContext.getContext(same(SpawnActionContext.class))) + .thenReturn(spawnActionContext); // actual StandaloneTestStrategy execution List<SpawnResult> spawnResults = 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 d4ecd6ceb9..da31f120d2 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 @@ -172,14 +172,14 @@ public class StandaloneSpawnStrategyTest { @Test public void testBinTrueExecutesFine() throws Exception { Spawn spawn = createSpawn(getTrueCommand()); - executor.getSpawnActionContext(spawn).exec(spawn, createContext()); + executor.getContext(SpawnActionContext.class).exec(spawn, createContext()); assertThat(out()).isEmpty(); assertThat(err()).isEmpty(); } private List<SpawnResult> run(Spawn spawn) throws Exception { - return executor.getSpawnActionContext(spawn).exec(spawn, createContext()); + return executor.getContext(SpawnActionContext.class).exec(spawn, createContext()); } private ActionExecutionContext createContext() { |