Automatic code cleanup.
PiperOrigin-RevId: 450868709
Change-Id: I85923c0afd22239133db8a63048ac3ad96cc3bcb
diff --git a/src/test/java/com/google/devtools/build/lib/worker/TestUtils.java b/src/test/java/com/google/devtools/build/lib/worker/TestUtils.java
index b4398b4..f5140b8 100644
--- a/src/test/java/com/google/devtools/build/lib/worker/TestUtils.java
+++ b/src/test/java/com/google/devtools/build/lib/worker/TestUtils.java
@@ -76,6 +76,50 @@
args);
}
+ static WorkerKey createWorkerKey(
+ FileSystem fileSystem, String mnemonic, boolean proxied, String... args) {
+ return createWorkerKey(
+ WorkerProtocolFormat.PROTO,
+ fileSystem,
+ mnemonic,
+ proxied,
+ /* sandboxed= */ false,
+ /* dynamic= */ false,
+ args);
+ }
+
+ static WorkerKey createWorkerKey(WorkerProtocolFormat protocolFormat, FileSystem fs) {
+ return createWorkerKey(protocolFormat, fs, false);
+ }
+
+ static WorkerKey createWorkerKey(
+ WorkerProtocolFormat protocolFormat, FileSystem fs, boolean dynamic) {
+ return createWorkerKey(
+ protocolFormat,
+ fs,
+ /* mnemonic= */ "dummy",
+ /* proxied= */ true,
+ /* sandboxed= */ true,
+ dynamic,
+ /* args...= */ "arg1",
+ "arg2",
+ "arg3");
+ }
+
+ static WorkerKey createWorkerKey(
+ FileSystem fs, boolean multiplex, boolean sandboxed, boolean dynamic) {
+ return createWorkerKey(
+ WorkerProtocolFormat.PROTO,
+ fs,
+ /* mnemonic= */ "dummy",
+ multiplex,
+ sandboxed,
+ dynamic,
+ /* args...= */ "arg1",
+ "arg2",
+ "arg3");
+ }
+
/**
* Creates a worker key based on a set of options. The {@code extraRequirements} are added to the
* {@link Spawn} execution info with the value "1". The "supports-workers" and
@@ -135,50 +179,6 @@
protocolFormat);
}
- static WorkerKey createWorkerKey(
- FileSystem fileSystem, String mnemonic, boolean proxied, String... args) {
- return createWorkerKey(
- WorkerProtocolFormat.PROTO,
- fileSystem,
- mnemonic,
- proxied,
- /* sandboxed= */ false,
- /* dynamic= */ false,
- args);
- }
-
- static WorkerKey createWorkerKey(WorkerProtocolFormat protocolFormat, FileSystem fs) {
- return createWorkerKey(protocolFormat, fs, false);
- }
-
- static WorkerKey createWorkerKey(
- WorkerProtocolFormat protocolFormat, FileSystem fs, boolean dynamic) {
- return createWorkerKey(
- protocolFormat,
- fs,
- /* mnemonic= */ "dummy",
- /* proxied= */ true,
- /* sandboxed= */ true,
- dynamic,
- /* args...= */ "arg1",
- "arg2",
- "arg3");
- }
-
- static WorkerKey createWorkerKey(
- FileSystem fs, boolean multiplex, boolean sandboxed, boolean dynamic) {
- return createWorkerKey(
- WorkerProtocolFormat.PROTO,
- fs,
- /* mnemonic= */ "dummy",
- multiplex,
- sandboxed,
- dynamic,
- /* args...= */ "arg1",
- "arg2",
- "arg3");
- }
-
/** A worker that uses a fake subprocess for I/O. */
static class TestWorker extends SingleplexWorker {
private final FakeSubprocess fakeSubprocess;