diff options
Diffstat (limited to 'src/test/java')
5 files changed, 55 insertions, 56 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java index e9731210d3..43f6e65ecd 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java @@ -27,7 +27,7 @@ import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.actions.SpawnResult.Status; import com.google.devtools.build.lib.exec.SpawnCache.CacheHandle; -import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionPolicy; +import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; import com.google.devtools.build.lib.exec.util.SpawnBuilder; import com.google.devtools.build.lib.testutil.Suite; import com.google.devtools.build.lib.testutil.TestSpec; @@ -72,7 +72,7 @@ public class AbstractSpawnStrategyTest { when(actionExecutionContext.getExecRoot()).thenReturn(fs.getPath("/execroot")); SpawnResult spawnResult = new SpawnResult.Builder().setStatus(Status.SUCCESS).setRunnerName("test").build(); - when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionPolicy.class))) + when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionContext.class))) .thenReturn(spawnResult); List<SpawnResult> spawnResults = @@ -81,7 +81,7 @@ public class AbstractSpawnStrategyTest { assertThat(spawnResults).containsExactly(spawnResult); // Must only be called exactly once. - verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionPolicy.class)); + verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionContext.class)); } @Test @@ -94,8 +94,7 @@ public class AbstractSpawnStrategyTest { .setExitCode(1) .setRunnerName("test") .build(); - when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionPolicy.class))) - .thenReturn(result); + when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionContext.class))).thenReturn(result); try { // Ignoring the List<SpawnResult> return value. @@ -105,7 +104,7 @@ public class AbstractSpawnStrategyTest { assertThat(e.getSpawnResult()).isSameAs(result); } // Must only be called exactly once. - verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionPolicy.class)); + verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionContext.class)); } @Test @@ -113,7 +112,7 @@ public class AbstractSpawnStrategyTest { SpawnCache cache = mock(SpawnCache.class); SpawnResult spawnResult = new SpawnResult.Builder().setStatus(Status.SUCCESS).setRunnerName("test").build(); - when(cache.lookup(any(Spawn.class), any(SpawnExecutionPolicy.class))) + when(cache.lookup(any(Spawn.class), any(SpawnExecutionContext.class))) .thenReturn(SpawnCache.success(spawnResult)); when(actionExecutionContext.getContext(eq(SpawnCache.class))).thenReturn(cache); when(actionExecutionContext.getExecRoot()).thenReturn(fs.getPath("/execroot")); @@ -121,7 +120,7 @@ public class AbstractSpawnStrategyTest { List<SpawnResult> spawnResults = new TestedSpawnStrategy(execRoot, spawnRunner).exec(SIMPLE_SPAWN, actionExecutionContext); assertThat(spawnResults).containsExactly(spawnResult); - verify(spawnRunner, never()).exec(any(Spawn.class), any(SpawnExecutionPolicy.class)); + verify(spawnRunner, never()).exec(any(Spawn.class), any(SpawnExecutionContext.class)); } @SuppressWarnings("unchecked") @@ -129,7 +128,7 @@ public class AbstractSpawnStrategyTest { public void testCacheMiss() throws Exception { SpawnCache cache = mock(SpawnCache.class); CacheHandle entry = mock(CacheHandle.class); - when(cache.lookup(any(Spawn.class), any(SpawnExecutionPolicy.class))).thenReturn(entry); + when(cache.lookup(any(Spawn.class), any(SpawnExecutionContext.class))).thenReturn(entry); when(entry.hasResult()).thenReturn(false); when(entry.willStore()).thenReturn(true); @@ -137,7 +136,7 @@ public class AbstractSpawnStrategyTest { when(actionExecutionContext.getExecRoot()).thenReturn(fs.getPath("/execroot")); SpawnResult spawnResult = new SpawnResult.Builder().setStatus(Status.SUCCESS).setRunnerName("test").build(); - when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionPolicy.class))) + when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionContext.class))) .thenReturn(spawnResult); List<SpawnResult> spawnResults = @@ -146,7 +145,7 @@ public class AbstractSpawnStrategyTest { assertThat(spawnResults).containsExactly(spawnResult); // Must only be called exactly once. - verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionPolicy.class)); + verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionContext.class)); verify(entry).store(eq(spawnResult), any(Collection.class)); } @@ -155,7 +154,7 @@ public class AbstractSpawnStrategyTest { public void testCacheMissWithNonZeroExit() throws Exception { SpawnCache cache = mock(SpawnCache.class); CacheHandle entry = mock(CacheHandle.class); - when(cache.lookup(any(Spawn.class), any(SpawnExecutionPolicy.class))).thenReturn(entry); + when(cache.lookup(any(Spawn.class), any(SpawnExecutionContext.class))).thenReturn(entry); when(entry.hasResult()).thenReturn(false); when(entry.willStore()).thenReturn(true); @@ -167,7 +166,7 @@ public class AbstractSpawnStrategyTest { .setExitCode(1) .setRunnerName("test") .build(); - when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionPolicy.class))).thenReturn(result); + when(spawnRunner.exec(any(Spawn.class), any(SpawnExecutionContext.class))).thenReturn(result); try { // Ignoring the List<SpawnResult> return value. @@ -177,7 +176,7 @@ public class AbstractSpawnStrategyTest { assertThat(e.getSpawnResult()).isSameAs(result); } // Must only be called exactly once. - verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionPolicy.class)); + verify(spawnRunner).exec(any(Spawn.class), any(SpawnExecutionContext.class)); verify(entry).store(eq(result), any(Collection.class)); } } diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java index 11312c8b2a..dea067dd79 100644 --- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java @@ -38,7 +38,7 @@ import com.google.devtools.build.lib.actions.ResourceSet; import com.google.devtools.build.lib.actions.Spawn; import com.google.devtools.build.lib.actions.SpawnResult; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; -import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionPolicy; +import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; import com.google.devtools.build.lib.exec.util.SpawnBuilder; import com.google.devtools.build.lib.shell.JavaSubprocessFactory; import com.google.devtools.build.lib.shell.Subprocess; @@ -185,7 +185,7 @@ public class LocalSpawnRunnerTest { } } - private final class SpawnExecutionPolicyForTesting implements SpawnExecutionPolicy { + private final class SpawnExecutionContextForTesting implements SpawnExecutionContext { private final List<ProgressStatus> reportedStatus = new ArrayList<>(); private final TreeMap<PathFragment, ActionInput> inputMapping = new TreeMap<>(); @@ -194,7 +194,7 @@ public class LocalSpawnRunnerTest { private boolean lockOutputFilesCalled; private FileOutErr fileOutErr; - public SpawnExecutionPolicyForTesting(FileOutErr fileOutErr) { + public SpawnExecutionContextForTesting(FileOutErr fileOutErr) { this.fileOutErr = fileOutErr; } @@ -311,7 +311,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 123 * 1000L; assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); @@ -365,7 +365,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 123 * 1000L; assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); @@ -410,7 +410,7 @@ public class LocalSpawnRunnerTest { assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); verify(factory).create(any(SubprocessBuilder.class)); assertThat(result.status()).isEqualTo(SpawnResult.Status.NON_ZERO_EXIT); @@ -456,7 +456,7 @@ public class LocalSpawnRunnerTest { assertThat(fs.getPath("/out").createDirectory()).isTrue(); assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); verify(factory).create(any(SubprocessBuilder.class)); assertThat(result.status()).isEqualTo(SpawnResult.Status.EXECUTION_FAILED); @@ -490,7 +490,7 @@ public class LocalSpawnRunnerTest { assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); FileOutErr fileOutErr = new FileOutErr(); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); SpawnResult reply = runner.exec(SIMPLE_SPAWN, policy); assertThat(reply.status()).isEqualTo(SpawnResult.Status.EXECUTION_DENIED); assertThat(reply.exitCode()).isEqualTo(-1); @@ -539,7 +539,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); try { runner.exec(SIMPLE_SPAWN, policy); @@ -570,7 +570,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 123 * 1000L; assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); runner.exec(SIMPLE_SPAWN, policy); @@ -596,7 +596,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 123 * 1000L; Spawn spawn = new SpawnBuilder("/bin/echo", "Hi!") @@ -626,7 +626,7 @@ public class LocalSpawnRunnerTest { localEnvProvider); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 123 * 1000L; assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); @@ -664,7 +664,7 @@ public class LocalSpawnRunnerTest { LocalEnvProvider.UNMODIFIED); FileOutErr fileOutErr = new FileOutErr(fs.getPath("/out/stdout"), fs.getPath("/out/stderr")); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); policy.timeoutMillis = 321 * 1000L; assertThat(fs.getPath("/execroot").createDirectory()).isTrue(); SpawnResult result = runner.exec(SIMPLE_SPAWN, policy); @@ -795,7 +795,7 @@ public class LocalSpawnRunnerTest { .build(); FileOutErr fileOutErr = new FileOutErr(); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); SpawnResult spawnResult = runner.exec(spawn, policy); @@ -856,7 +856,7 @@ public class LocalSpawnRunnerTest { .build(); FileOutErr fileOutErr = new FileOutErr(); - SpawnExecutionPolicyForTesting policy = new SpawnExecutionPolicyForTesting(fileOutErr); + SpawnExecutionContextForTesting policy = new SpawnExecutionContextForTesting(fileOutErr); SpawnResult spawnResult = runner.exec(spawn, policy); diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java index 3bc5b37b1e..1e52b0bbbe 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteExecutionClientTest.java @@ -42,7 +42,7 @@ import com.google.devtools.build.lib.clock.JavaClock; import com.google.devtools.build.lib.exec.SpawnExecException; import com.google.devtools.build.lib.exec.SpawnInputExpander; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; -import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionPolicy; +import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; import com.google.devtools.build.lib.exec.util.FakeOwner; import com.google.devtools.build.lib.remote.util.DigestUtil; import com.google.devtools.build.lib.remote.util.TracingMetadataUtils; @@ -128,8 +128,8 @@ public class GrpcRemoteExecutionClientTest { private FileOutErr outErr; private Server fakeServer; - private final SpawnExecutionPolicy simplePolicy = - new SpawnExecutionPolicy() { + private final SpawnExecutionContext simplePolicy = + new SpawnExecutionContext() { @Override public int getId() { return 0; diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java index 0374e3dc38..5304562f99 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java @@ -42,7 +42,7 @@ import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.exec.SpawnCache.CacheHandle; import com.google.devtools.build.lib.exec.SpawnInputExpander; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; -import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionPolicy; +import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; import com.google.devtools.build.lib.exec.util.FakeOwner; import com.google.devtools.build.lib.remote.TreeNodeRepository.TreeNode; import com.google.devtools.build.lib.remote.util.DigestUtil; @@ -95,8 +95,8 @@ public class RemoteSpawnCacheTest { private StoredEventHandler eventHandler = new StoredEventHandler(); - private final SpawnExecutionPolicy simplePolicy = - new SpawnExecutionPolicy() { + private final SpawnExecutionContext simplePolicy = + new SpawnExecutionContext() { @Override public int getId() { return 0; diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java index e16f8e4874..ebf3f5a0d0 100644 --- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java +++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java @@ -47,7 +47,7 @@ import com.google.devtools.build.lib.exec.SpawnExecException; import com.google.devtools.build.lib.exec.SpawnInputExpander; import com.google.devtools.build.lib.exec.SpawnRunner; import com.google.devtools.build.lib.exec.SpawnRunner.ProgressStatus; -import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionPolicy; +import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext; import com.google.devtools.build.lib.exec.util.FakeOwner; import com.google.devtools.build.lib.remote.util.DigestUtil; import com.google.devtools.build.lib.remote.util.DigestUtil.ActionKey; @@ -161,7 +161,7 @@ public class RemoteSpawnRunnerTest { /*outputs=*/ ImmutableList.<ActionInput>of(), ResourceSet.ZERO); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); runner.exec(spawn, policy); @@ -219,7 +219,7 @@ public class RemoteSpawnRunnerTest { /*outputs=*/ ImmutableList.<ActionInput>of(), ResourceSet.ZERO); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); runner.exec(spawn, policy); @@ -261,7 +261,7 @@ public class RemoteSpawnRunnerTest { logDir)); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = Mockito.mock(SpawnResult.class); when(res.exitCode()).thenReturn(1); @@ -292,7 +292,7 @@ public class RemoteSpawnRunnerTest { when(cache.getCachedActionResult(any(ActionKey.class))).thenReturn(failedAction); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); RemoteSpawnRunner runner = spy( @@ -345,7 +345,7 @@ public class RemoteSpawnRunnerTest { logDir); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); when(cache.getCachedActionResult(any(ActionKey.class))) .thenThrow(new IOException("cache down")); @@ -402,7 +402,7 @@ public class RemoteSpawnRunnerTest { logDir); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); when(cache.getCachedActionResult(any(ActionKey.class))).thenReturn(null); @@ -442,7 +442,7 @@ public class RemoteSpawnRunnerTest { logDir); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); when(cache.getCachedActionResult(any(ActionKey.class))).thenThrow(new IOException()); @@ -482,7 +482,7 @@ public class RemoteSpawnRunnerTest { when(executor.executeRemotely(any(ExecuteRequest.class))).thenThrow(new IOException()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); IOException err = new IOException("local execution error"); when(localRunner.exec(eq(spawn), eq(policy))).thenThrow(err); @@ -524,7 +524,7 @@ public class RemoteSpawnRunnerTest { .build()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.NON_ZERO_EXIT); @@ -564,7 +564,7 @@ public class RemoteSpawnRunnerTest { "", 1, new ExecutionStatusException(resp.getStatus(), resp))); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.TIMEOUT); @@ -602,7 +602,7 @@ public class RemoteSpawnRunnerTest { .build()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.NON_ZERO_EXIT); @@ -642,7 +642,7 @@ public class RemoteSpawnRunnerTest { .build()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.SUCCESS); @@ -686,7 +686,7 @@ public class RemoteSpawnRunnerTest { Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.NON_ZERO_EXIT); @@ -733,7 +733,7 @@ public class RemoteSpawnRunnerTest { Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.TIMEOUT); @@ -781,7 +781,7 @@ public class RemoteSpawnRunnerTest { Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.TIMEOUT); @@ -818,7 +818,7 @@ public class RemoteSpawnRunnerTest { Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); SpawnResult res = runner.exec(spawn, policy); assertThat(res.status()).isEqualTo(Status.NON_ZERO_EXIT); @@ -855,7 +855,7 @@ public class RemoteSpawnRunnerTest { when(executor.executeRemotely(any(ExecuteRequest.class))).thenThrow(new IOException()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); try { runner.exec(spawn, policy); @@ -891,7 +891,7 @@ public class RemoteSpawnRunnerTest { when(cache.getCachedActionResult(any(ActionKey.class))).thenThrow(new IOException()); Spawn spawn = newSimpleSpawn(); - SpawnExecutionPolicy policy = new FakeSpawnExecutionPolicy(spawn); + SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn); try { runner.exec(spawn, policy); @@ -914,14 +914,14 @@ public class RemoteSpawnRunnerTest { } // TODO(buchgr): Extract a common class to be used for testing. - class FakeSpawnExecutionPolicy implements SpawnExecutionPolicy { + class FakeSpawnExecutionContext implements SpawnExecutionContext { private final ArtifactExpander artifactExpander = (artifact, output) -> output.add(artifact); private final Spawn spawn; - FakeSpawnExecutionPolicy(Spawn spawn) { + FakeSpawnExecutionContext(Spawn spawn) { this.spawn = spawn; } |