Some cleanup changes.

--
MOS_MIGRATED_REVID=87821306

4 files changed, 48 insertions, 42 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
index e62a3b86af..2860751a18 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/InstrumentedFilesCollector.java
@@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.test;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisEnvironment;
@@ -203,7 +202,7 @@ public final class InstrumentedFilesCollector {
     for (String attr : getSourceAttributes()) {
       if (ruleContext.getRule().isAttrDefined(attr, Type.LABEL_LIST) ||
           ruleContext.getRule().isAttrDefined(attr, Type.LABEL)) {
-        Iterables.addAll(prerequisites, ruleContext.getPrerequisites(attr, Mode.DONT_CHECK));
+        prerequisites.addAll(ruleContext.getPrerequisites(attr, Mode.DONT_CHECK));
       }
     }
     return prerequisites;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestLogHelper.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestLogHelper.java
index 462c24ce6c..4690af6924 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestLogHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestLogHelper.java
@@ -66,11 +66,8 @@ public class TestLogHelper {
       ByteStreams.copy(input, filteringOutputStream);
 
       if (!filteringOutputStream.foundHeader()) {
-        InputStream inputAgain = testOutput.getInputStream();
-        try {
+        try (InputStream inputAgain = testOutput.getInputStream()) {
           ByteStreams.copy(inputAgain, out);
-        } finally {
-          inputAgain.close();
         }
       }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java
index 4905e15293..103ba62624 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestStrategy.java
@@ -375,11 +375,8 @@ public abstract class TestStrategy implements TestActionContext {
         Thread.currentThread().interrupt();
       }
       if (!headerFilter.foundHeader()) {
-        InputStream input = testLogPath.getInputStream();
-        try {
+        try (InputStream input = testLogPath.getInputStream()) {
           ByteStreams.copy(input, outErr.getOutputStream());
-        } finally {
-          input.close();
         }
       }
     }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestXmlOutputParser.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestXmlOutputParser.java
index 8d660ec467..b911004edf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestXmlOutputParser.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestXmlOutputParser.java
@@ -230,24 +230,29 @@ class TestXmlOutputParser {
           // they can be too big to fit in the memory. We add failure and error
           // elements to the output without a message, so that there is a
           // difference between passed and failed test cases.
-          if (childElementName.equals("testsuite")) {
-            builder.addChild(parseTestSuite(parser, childElementName));
-          } else if (childElementName.equals("testcase")) {
-            builder.addChild(parseTestCase(parser));
-          } else if (childElementName.equals("failure")) {
-            failures += 1;
-            skipCompleteElement(parser);
-          } else if (childElementName.equals("error")) {
-            errors += 1;
-            skipCompleteElement(parser);
-          } else if (childElementName.equals("testdecorator")) {
-            builder.addChild(parseTestDecorator(parser));
-          } else {
-
-            // Unknown element encountered. Since the schema of the input file
-            // is a bit hazy, just skip it and go merrily on our way. Ignorance
-            // is bliss.
-            skipCompleteElement(parser);
+          switch (childElementName) {
+            case "testsuite":
+              builder.addChild(parseTestSuite(parser, childElementName));
+              break;
+            case "testcase":
+              builder.addChild(parseTestCase(parser));
+              break;
+            case "failure":
+              failures += 1;
+              skipCompleteElement(parser);
+              break;
+            case "error":
+              errors += 1;
+              skipCompleteElement(parser);
+              break;
+            case "testdecorator":
+              builder.addChild(parseTestDecorator(parser));
+              break;
+            default:
+              // Unknown element encountered. Since the schema of the input file
+              // is a bit hazy, just skip it and go merrily on our way. Ignorance
+              // is bliss.
+              skipCompleteElement(parser);
           }
           break;
 
@@ -296,20 +301,28 @@ class TestXmlOutputParser {
       String name = parser.getAttributeLocalName(i).intern();
       String value = parser.getAttributeValue(i);
 
-      if (name.equals("name")) {
-        builder.setName(value);
-      } else if (name.equals("classname")) {
-        builder.setClassName(value);
-      } else if (name.equals("time")) {
-        builder.setRunDurationMillis(parseTime(value));
-      } else if (name.equals("result")) {
-        builder.setResult(value);
-      } else if (name.equals("status")) {
-        if (value.equals("notrun")) {
-          builder.setRun(false);
-        } else if (value.equals("run")) {
-          builder.setRun(true);
-        }
+      switch (name) {
+        case "name":
+          builder.setName(value);
+          break;
+        case "classname":
+          builder.setClassName(value);
+          break;
+        case "time":
+          builder.setRunDurationMillis(parseTime(value));
+          break;
+        case "result":
+          builder.setResult(value);
+          break;
+        case "status":
+          if (value.equals("notrun")) {
+            builder.setRun(false);
+          } else if (value.equals("run")) {
+            builder.setRun(true);
+          }
+          break;
+        default:
+          // fall through
       }
     }