commit 5afd9ee197e0c9a7ef8d040cc2c2e68cc16aa8eb
author ruperts <ruperts@google.com> Thu Sep 28 19:47:49 2017 -0400
committer John Cater <jcater@google.com> Fri Sep 29 12:14:29 2017 -0400
tree 2c303c96077275401678dab0d2c66737c24f53dc
parent 910cb542086996f561092f9f16edeabb0af09fd5

Fix various linter errors

RELNOTES: None.
PiperOrigin-RevId: 170418147

src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java

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 2fc80f5..0b35f98 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 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 @@
 
     @Override
     public void execute(ActionExecutionContext actionExecutionContext) {
+
     }
 
-    @Override protected String computeKey() { return "action"; }
+    @Override protected String computeKey() {
+      return "action";
+    }
 
     @Override
     public String getMnemonic() {

src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java

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 9c39d84..f5c1a96 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 @@
       // 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 @@
     }
 
     try {
-      for (Artifact artifact: getOutputs()) {
+      for (Artifact artifact : getOutputs()) {
         FileSystemUtils.touchFile(artifact.getPath());
       }
     } catch (IOException e) {
@@ -131,7 +131,9 @@
   }
 
   @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 {

src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 7e2400d..bae2bef 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -190,6 +190,7 @@
     }
   }
 
+  /** A dummy WorkspaceStatusAction. */
   @Immutable
   public static final class DummyWorkspaceStatusAction extends WorkspaceStatusAction {
     private final String key;
@@ -254,6 +255,7 @@
     }
   }
 
+  /** A WorkspaceStatusAction.Context that has no stable keys and no volatile keys. */
   @ExecutionStrategy(contextType = WorkspaceStatusAction.Context.class)
   public static class DummyWorkspaceStatusActionContext implements WorkspaceStatusAction.Context {
     @Override
@@ -304,6 +306,7 @@
 
   public static final AnalysisEnvironment STUB_ANALYSIS_ENVIRONMENT = new StubAnalysisEnvironment();
 
+  /** An AnalysisEnvironment with stubbed-out methods. */
   public static class StubAnalysisEnvironment implements AnalysisEnvironment {
     @Override
     public void registerAction(ActionAnalysisMetadata... action) {

src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index 15d0b04..d39d857 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -422,6 +422,7 @@
     }
   }
 
+  /** In-memory {@link ActionCache} backed by a HashMap */
   protected static class InMemoryActionCache implements ActionCache {
 
     private final Map<String, Entry> actionCache = new HashMap<>();