Clean up the test runner code a bit.

Small steps towards #1150.

--
MOS_MIGRATED_REVID=125158135

1 files changed, 6 insertions, 7 deletions

diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Options.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Options.java
index d421774a3c..13e6e574c4 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Options.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Options.java
@@ -15,9 +15,9 @@
 package com.google.testing.junit.runner.junit4;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -44,8 +44,8 @@ class JUnit4Options {
    * object representing the parsed arguments.
    */
   static JUnit4Options parse(Map<String, String> envVars, List<String> args) {
-    ImmutableList.Builder<String> unparsedArgsBuilder = ImmutableList.builder();
-    Map<String, String> optionsMap = Maps.newHashMap();
+    List<String> unparsedArgs = new ArrayList<>();
+    Map<String, String> optionsMap = new HashMap<>();
 
     optionsMap.put(TEST_INCLUDE_FILTER_OPTION, null);
     optionsMap.put(TEST_EXCLUDE_FILTER_OPTION, null);
@@ -68,7 +68,7 @@ class JUnit4Options {
         optionsMap.put(arg, it.next());
         continue;
       }
-      unparsedArgsBuilder.add(arg);
+      unparsedArgs.add(arg);
     }
     // If TESTBRIDGE_TEST_ONLY is set in the environment, forward it to the
     // --test_filter flag.
@@ -77,10 +77,9 @@ class JUnit4Options {
       optionsMap.put(TEST_INCLUDE_FILTER_OPTION, testFilter);
     }
 
-    ImmutableList<String> unparsedArgs = unparsedArgsBuilder.build();
     return new JUnit4Options(optionsMap.get(TEST_INCLUDE_FILTER_OPTION),
                              optionsMap.get(TEST_EXCLUDE_FILTER_OPTION),
-                             unparsedArgs.toArray(new String[unparsedArgs.size()]));
+                             unparsedArgs.toArray(new String[0]));
   }
 
   private final String testIncludeFilter;