aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools
diff options
context:
space:
mode:
authorGravatar apell <apell@google.com>2017-11-02 14:57:44 -0400
committerGravatar John Cater <jcater@google.com>2017-11-03 09:53:09 -0400
commit1ce985a704357c35d6691a80d94ca55372593b16 (patch)
tree23cfdb48ae86a27bd5b1dda310b349d17d6c6d20 /src/test/java/com/google/devtools
parent92d672d2be050547a0027f5bdefb8c69fe36c0a4 (diff)
Remove unused LegacyParamsFilePreProcessor. Removed test cases from OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest.
RELNOTES: None. PiperOrigin-RevId: 174359569
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r--src/test/java/com/google/devtools/common/options/OptionsParserTest.java313
1 files changed, 0 insertions, 313 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 49e9d9d9a9..25ce6dd0cd 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsParserTest.java
@@ -25,15 +25,9 @@ import com.google.devtools.common.options.Converters.CommaSeparatedOptionListCon
import com.google.devtools.common.options.OptionPriority.PriorityCategory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -228,313 +222,6 @@ public class OptionsParserTest {
}
@Test
- public void parseWithParamsFile() throws OptionsParsingException, IOException {
- // TODO(bazel-team): Switch to an in memory file system, here and below.
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--baz=oops --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("defaultFoo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("oops");
- }
-
- @Test
- public void parseWithEmptyParamsFile() throws OptionsParsingException, IOException {
- // TODO(bazel-team): Switch to an in memory file system, here and below.
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of(""),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("defaultFoo");
- assertThat(foo.bar).isEqualTo(42);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFileWithEmptyStringValues() throws Exception {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--baz", "", "--foo", ""),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEmpty();
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEmpty();
- }
-
- @Test
- public void parseWithParamsFileWithEmptyString() throws OptionsParsingException, IOException {
- // TODO(bazel-team): Switch to an in memory file system, here and below.
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--baz --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("defaultFoo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEmpty();
- }
-
- @Test
- public void parseWithParamsFileWithEmptyStringAtEnd()
- throws OptionsParsingException, IOException {
- // TODO(bazel-team): Switch to an in memory file system, here and below.
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--bar",
- "17",
- " --baz",
- ""),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("defaultFoo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEmpty();
- }
-
- @Test
- public void parseWithParamsFileWithQuotedSpaces() throws OptionsParsingException, IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo=\"fuzzy\nfoo\" --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("\"fuzzy\nfoo\"");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFileWithEscapedSpaces() throws OptionsParsingException, IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo=fuzzy\\ foo --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("fuzzy\\ foo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFileWithEscapedQuotes() throws OptionsParsingException, IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo=\"fuzzy\\\"foo\" --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("\"fuzzy\\\"foo\"");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFileSingleQuotesUnescaping()
- throws OptionsParsingException, IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo", "'fuzzy '\\''foo'", "--bar", "17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("fuzzy 'foo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFilePartiallyQuotedNoUnescaping()
- throws OptionsParsingException, IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo", "'fuzzy 'foo", "--bar", "17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("'fuzzy 'foo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("defaultBaz");
- }
-
- @Test
- public void parseWithParamsFileUnmatchedQuote() throws IOException {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--foo=\"fuzzy foo --bar 17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- try {
- parser.parse("@" + params);
- fail();
- } catch (OptionsParsingException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo(
- String.format(
- ParamsFilePreProcessor.ERROR_MESSAGE_FORMAT,
- params,
- String.format(ParamsFilePreProcessor.UNFINISHED_QUOTE_MESSAGE_FORMAT, "\"", 6)));
- }
- }
-
- @Test
- public void parseWithParamsFileWithMultilineStringValues() throws Exception {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of(
- "--baz",
- "'hello\nworld'",
- "--foo",
- "hello\\",
- "world",
- "--nodoc",
- "\"hello",
- "world\""),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("hello\\\nworld");
- assertThat(foo.nodoc).isEqualTo("\"hello\nworld\"");
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("hello\nworld");
- }
-
- @Test
- public void parseWithParamsFileWithMultilineStringValuesCRLF() throws Exception {
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of(
- "--baz\r\n'hello\nworld'\r\n--foo\r\nhello\\\r\nworld\r\n\r\n"
- + "--nodoc\r\n\"hello\r\nworld\""),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("hello\nworld");
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("hello\\\nworld");
- assertThat(foo.nodoc).isEqualTo("\"hello\nworld\"");
- }
-
- @Test
- public void parseWithParamsFileMultiline() throws OptionsParsingException, IOException {
- // TODO(bazel-team): Switch to an in memory file system.
- Path params = Files.createTempDirectory("foo").resolve("params");
- Files.write(
- params,
- ImmutableList.of("--baz", "oops", "--bar", "17"),
- StandardCharsets.UTF_8,
- StandardOpenOption.CREATE);
-
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- parser.parse("@" + params);
- ExampleFoo foo = parser.getOptions(ExampleFoo.class);
- assertThat(foo.foo).isEqualTo("defaultFoo");
- assertThat(foo.bar).isEqualTo(17);
- ExampleBaz baz = parser.getOptions(ExampleBaz.class);
- assertThat(baz.baz).isEqualTo("oops");
- }
-
- @Test
- public void parsingFailsWithMissingParamsFile() {
- OptionsParser parser = newOptionsParser(ExampleFoo.class, ExampleBaz.class);
- parser.enableParamsFileSupport(new LegacyParamsFilePreProcessor(FileSystems.getDefault()));
- List<String> unknownOpts = asList("@does/not/exist");
- try {
- parser.parse(unknownOpts);
- fail();
- } catch (OptionsParsingException e) {
- assertThat(e.getInvalidArgument()).isEqualTo("@does/not/exist");
- assertThat(parser.getOptions(ExampleFoo.class)).isNotNull();
- assertThat(parser.getOptions(ExampleBaz.class)).isNotNull();
- }
- }
-
- @Test
public void parseWithOptionsInheritance() throws OptionsParsingException {
OptionsParser parser = newOptionsParser(ExampleBazSubclass.class);
parser.parse("--baz_subclass=cat", "--baz=dog");