Continued TestStrategy refactoring.

More renaming and some reformatting to make StandaloneTestStrategy more
closely resemble the internal implementation of TestStrategy.

--
PiperOrigin-RevId: 142254302
MOS_MIGRATED_REVID=142254302

1 files changed, 5 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
index cf073065a0..29a23fe66e 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerTestStrategy.java
@@ -77,28 +77,23 @@ public class WorkerTestStrategy extends StandaloneTestStrategy {
   }
 
   @Override
-  protected TestResultData execute(
+  protected TestResultData executeTest(
+      TestRunnerAction action,
       ActionExecutionContext actionExecutionContext,
       Map<String, String> environment,
-      TestRunnerAction action,
       Path execRoot,
       Path runfilesDir)
       throws ExecException, InterruptedException, IOException {
     List<String> startupArgs = getStartUpArgs(action);
 
     return execInWorker(
-        actionExecutionContext,
-        environment,
-        action,
-        startupArgs,
-        execRoot,
-        maxRetries);
+        action, actionExecutionContext, environment, startupArgs, execRoot, maxRetries);
   }
 
   private TestResultData execInWorker(
+      TestRunnerAction action,
       ActionExecutionContext actionExecutionContext,
       Map<String, String> environment,
-      TestRunnerAction action,
       List<String> startupArgs,
       Path execRoot,
       int retriesLeft)
@@ -177,12 +172,7 @@ public class WorkerTestStrategy extends StandaloneTestStrategy {
                         + e
                         + "), invalidating and retrying with new worker..."));
         return execInWorker(
-            actionExecutionContext,
-            environment,
-            action,
-            startupArgs,
-            execRoot,
-            retriesLeft - 1);
+            action, actionExecutionContext, environment, startupArgs, execRoot, retriesLeft - 1);
       } else {
         throw new TestExecException(e.getMessage());
       }