Delete the defaultMultipleValue field from options and refactor the logic for retrieving

the default values of options.

The field defaultMultipleValue was introduced in commit 51a491b89a9cd5f15c9a093a5693bc37e696e6e1 to allow defining a
default value for options that set allowMultiple. However due to the limitations of
the optionsParser end up being not useful since we cannot guarantee that an option
that allows multiple has a converter that returns a list of values.
Thus this CL deletes code that may confuse even more and clarifies the mechanism
that the options currently use to obtain their default values.

--
MOS_MIGRATED_REVID=120317261

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
index 96845a1ff6..a6ca76ed3d 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
@@ -105,22 +105,6 @@ public class OptionsParserTest {
     public String boom;
   }
 
-  /**
-   * Example with multiple default values
-   */
-  public static class ExampleMultiple extends OptionsBase {
-    @Option(name = "multiple",
-        defaultValue = "",
-        defaultMultipleValue = {"a", "b"},
-        allowMultiple = true)
-    public List<String> multiple;
-
-    @Option(name = "emptyMultiple",
-        defaultValue = "",
-        allowMultiple = true)
-    public List<String> emptyMultiple;
-  }
-
   public static class StringConverter implements Converter<String> {
     @Override
     public String convert(String input) {
@@ -239,22 +223,6 @@ public class OptionsParserTest {
     assertNull(boom.boom);
   }
 
-  @Test
-  public void parseWithMultipleDefaultValues() throws OptionsParsingException {
-    OptionsParser parser = newOptionsParser(ExampleMultiple.class);
-    parser.parse();
-    ExampleMultiple multiple = parser.getOptions(ExampleMultiple.class);
-    assertThat(multiple.multiple).containsExactly("a", "b");
-  }
-
-  @Test
-  public void parseWithEmptyMultipleDefaultValues() throws OptionsParsingException {
-    OptionsParser parser = newOptionsParser(ExampleMultiple.class);
-    parser.parse();
-    ExampleMultiple multiple = parser.getOptions(ExampleMultiple.class);
-    assertThat(multiple.emptyMultiple).isEmpty();
-  }
-
   public static class CategoryTest extends OptionsBase {
     @Option(name = "swiss_bank_account_number",
             category = "undocumented", // Not printed in usage messages!