Fix various linter errors

RELNOTES: None.
PiperOrigin-RevId: 170418147

2 files changed, 12 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 2fc80f5bde..0b35f98ab8 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -235,8 +235,9 @@ public final class ActionsTestUtil {
         public Label getLabel() {
           return NULL_LABEL;
         }
-  };
+      };
 
+  /** An unchecked exception class for action conflicts. */
   public static class UncheckedActionConflictException extends RuntimeException {
     public UncheckedActionConflictException(ActionConflictException e) {
       super(e);
@@ -266,9 +267,12 @@ public final class ActionsTestUtil {
 
     @Override
     public void execute(ActionExecutionContext actionExecutionContext) {
+
     }
 
-    @Override protected String computeKey() { return "action"; }
+    @Override protected String computeKey() {
+      return "action";
+    }
 
     @Override
     public String getMnemonic() {
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
index 9c39d84a29..f5c1a965a1 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java
@@ -97,8 +97,8 @@ public class TestAction extends AbstractAction {
       // used by tests to specify artifacts that may or may not be missing.
       // This is used, e.g., to test Blaze behavior when action has missing
       // input artifacts but still is successfully executed.
-      if (!artifact.getPath().exists() &&
-          !artifact.getExecPath().getBaseName().endsWith(".optional")) {
+      if (!artifact.getPath().exists()
+          && !artifact.getExecPath().getBaseName().endsWith(".optional")) {
         throw new IllegalStateException("action's input file does not exist: "
             + artifact.getPath());
       }
@@ -114,7 +114,7 @@ public class TestAction extends AbstractAction {
     }
 
     try {
-      for (Artifact artifact: getOutputs()) {
+      for (Artifact artifact : getOutputs()) {
         FileSystemUtils.touchFile(artifact.getPath());
       }
     } catch (IOException e) {
@@ -131,7 +131,9 @@ public class TestAction extends AbstractAction {
   }
 
   @Override
-  public String getMnemonic() { return "Test"; }
+  public String getMnemonic() {
+    return "Test";
+  }
 
   /** No-op action that has exactly one output, and can be a middleman action. */
   public static class DummyAction extends TestAction {