diff options
author | 2017-12-20 18:17:28 -0800 | |
---|---|---|
committer | 2017-12-20 18:18:47 -0800 | |
commit | c3de468305734dc4b0e7222fdd8dd6eb1b661c34 (patch) | |
tree | 4fd1cc39e30cb306454a8736b64e2df2e036f4ff /src/test/java/com | |
parent | 16c36c3f15574a40e34e697f92fe86a4e44e9851 (diff) |
Move compulsory ProcessWrapperUtil parameters into its builder() method, to be consistent with LinuxSandboxUtil.
RELNOTES: None.
PiperOrigin-RevId: 179758847
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperUtilTest.java | 37 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java | 9 |
2 files changed, 4 insertions, 42 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperUtilTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperUtilTest.java index 043e3e38ef..7dc1bff177 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperUtilTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/ProcessWrapperUtilTest.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.runtime; import static com.google.common.truth.Truth.assertThat; -import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows; import com.google.common.collect.ImmutableList; import java.time.Duration; @@ -28,33 +27,6 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public final class ProcessWrapperUtilTest { - @Test - public void testProcessWrapperCommandLineBuilder_ProcessWrapperPathIsRequired() { - ImmutableList<String> commandArguments = ImmutableList.of("echo", "hello, world"); - - Exception e = - expectThrows( - IllegalStateException.class, - () -> - ProcessWrapperUtil.commandLineBuilder() - .setCommandArguments(commandArguments) - .build()); - assertThat(e).hasMessageThat().contains("processWrapperPath"); - } - - @Test - public void testProcessWrapperCommandLineBuilder_CommandAgumentsAreRequired() { - String processWrapperPath = "process-wrapper"; - - Exception e = - expectThrows( - IllegalStateException.class, - () -> - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(processWrapperPath) - .build()); - assertThat(e).hasMessageThat().contains("commandArguments"); - } @Test public void testProcessWrapperCommandLineBuilder_BuildsWithoutOptionalArguments() { @@ -66,10 +38,7 @@ public final class ProcessWrapperUtilTest { ImmutableList.<String>builder().add(processWrapperPath).addAll(commandArguments).build(); List<String> commandLine = - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(processWrapperPath) - .setCommandArguments(commandArguments) - .build(); + ProcessWrapperUtil.commandLineBuilder(processWrapperPath, commandArguments).build(); assertThat(commandLine).containsExactlyElementsIn(expectedCommandLine).inOrder(); } @@ -98,9 +67,7 @@ public final class ProcessWrapperUtilTest { .build(); List<String> commandLine = - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(processWrapperPath) - .setCommandArguments(commandArguments) + ProcessWrapperUtil.commandLineBuilder(processWrapperPath, commandArguments) .setTimeout(timeout) .setKillDelay(killDelay) .setStdoutPath(stdoutPath) diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java index 5028138479..40dd37598c 100644 --- a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java +++ b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java @@ -56,10 +56,7 @@ public final class CommandUsingProcessWrapperTest { ImmutableList<String> commandArguments = ImmutableList.of("echo", "even drones can fly away"); List<String> fullCommandLine = - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(getProcessWrapperPath()) - .setCommandArguments(commandArguments) - .build(); + ProcessWrapperUtil.commandLineBuilder(getProcessWrapperPath(), commandArguments).build(); Command command = new Command(fullCommandLine.toArray(new String[0])); CommandResult commandResult = command.execute(); @@ -80,9 +77,7 @@ public final class CommandUsingProcessWrapperTest { String statisticsFilePath = outputDir.getAbsolutePath() + "/" + "stats.out"; List<String> fullCommandLine = - ProcessWrapperUtil.commandLineBuilder() - .setProcessWrapperPath(getProcessWrapperPath()) - .setCommandArguments(commandArguments) + ProcessWrapperUtil.commandLineBuilder(getProcessWrapperPath(), commandArguments) .setStatisticsPath(statisticsFilePath) .build(); |