diff options
Diffstat (limited to 'src/test/java/com/google/devtools/common/options')
-rw-r--r-- | src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/common/options/OptionsParserTest.java | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java b/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java index 2467b83eae..eb1ae0d6a6 100644 --- a/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionDefinitionTest.java @@ -114,7 +114,7 @@ public class OptionDefinitionTest { // Do a bunch of potentially repeat operations on this option that need to know information // about the converter and default value. Also verify that the values are as expected. - boolean isBoolean = mockOptionDef.isBooleanField(); + boolean isBoolean = mockOptionDef.usesBooleanValueSyntax(); assertThat(isBoolean).isFalse(); Converter<?> converter = mockOptionDef.getConverter(); @@ -150,7 +150,7 @@ public class OptionDefinitionTest { // Do a bunch of potentially repeat operations on this option that need to know information // about the converter and default value. Also verify that the values are as expected. - boolean isBoolean = mockOptionDef.isBooleanField(); + boolean isBoolean = mockOptionDef.usesBooleanValueSyntax(); assertThat(isBoolean).isFalse(); Converter<?> converter = mockOptionDef.getConverter(); 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 c947bea398..3d2b601655 100644 --- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java +++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java @@ -1512,24 +1512,24 @@ public class OptionsParserTest { assertThat(result).isNotNull(); assertThat(result).hasSize(3); - assertThat(result.get(0).getName()).isEqualTo("alpha"); + assertThat(result.get(0).getOptionDefinition().getOptionName()).isEqualTo("alpha"); assertThat(result.get(0).isDocumented()).isTrue(); assertThat(result.get(0).isHidden()).isFalse(); - assertThat(result.get(0).getUnparsedValue()).isEqualTo("one"); + assertThat(result.get(0).getUnconvertedValue()).isEqualTo("one"); assertThat(result.get(0).getSource()).isEqualTo("source"); assertThat(result.get(0).getPriority()).isEqualTo(OptionPriority.COMMAND_LINE); - assertThat(result.get(1).getName()).isEqualTo("gamma"); + assertThat(result.get(1).getOptionDefinition().getOptionName()).isEqualTo("gamma"); assertThat(result.get(1).isDocumented()).isFalse(); assertThat(result.get(1).isHidden()).isFalse(); - assertThat(result.get(1).getUnparsedValue()).isEqualTo("two"); + assertThat(result.get(1).getUnconvertedValue()).isEqualTo("two"); assertThat(result.get(1).getSource()).isEqualTo("source"); assertThat(result.get(1).getPriority()).isEqualTo(OptionPriority.COMMAND_LINE); - assertThat(result.get(2).getName()).isEqualTo("echo"); + assertThat(result.get(2).getOptionDefinition().getOptionName()).isEqualTo("echo"); assertThat(result.get(2).isDocumented()).isFalse(); assertThat(result.get(2).isHidden()).isTrue(); - assertThat(result.get(2).getUnparsedValue()).isEqualTo("three"); + assertThat(result.get(2).getUnconvertedValue()).isEqualTo("three"); assertThat(result.get(2).getSource()).isEqualTo("source"); assertThat(result.get(2).getPriority()).isEqualTo(OptionPriority.COMMAND_LINE); } @@ -1543,15 +1543,15 @@ public class OptionsParserTest { assertThat(result).isNotNull(); assertThat(result).hasSize(2); - assertThat(result.get(0).getName()).isEqualTo("alpha"); + assertThat(result.get(0).getOptionDefinition().getOptionName()).isEqualTo("alpha"); assertThat(result.get(0).isDocumented()).isTrue(); - assertThat(result.get(0).getUnparsedValue()).isEqualTo("one"); + assertThat(result.get(0).getUnconvertedValue()).isEqualTo("one"); assertThat(result.get(0).getSource()).isEqualTo("source"); assertThat(result.get(0).getPriority()).isEqualTo(OptionPriority.COMMAND_LINE); - assertThat(result.get(1).getName()).isEqualTo("gamma"); + assertThat(result.get(1).getOptionDefinition().getOptionName()).isEqualTo("gamma"); assertThat(result.get(1).isDocumented()).isFalse(); - assertThat(result.get(1).getUnparsedValue()).isEqualTo("two"); + assertThat(result.get(1).getUnconvertedValue()).isEqualTo("two"); assertThat(result.get(1).getSource()).isEqualTo("source"); assertThat(result.get(1).getPriority()).isEqualTo(OptionPriority.COMMAND_LINE); } |