Skip to content

fix boolean flag in subcommand (#1331) #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
czpilar wants to merge 1 commit into from
+158 −60
Closed

fix boolean flag in subcommand (#1331) #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...shell-core/src/main/java/org/springframework/shell/core/command/DefaultCommandParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public ParsedInput parse(String input) {
}
List<String> subCommands = firstNonCommandWordIndex == 1 ? Collections.emptyList()
: words.subList(1, firstNonCommandWordIndex);
String fullCommandName = firstNonCommandWordIndex == 1 ? commandName : prefix;

// add command and sub commands
for (String subCommand : subCommands) {
Expand Down Expand Up @@ -116,12 +117,12 @@ public ParsedInput parse(String input) {
}
else { // use next word as option value
if (nextWord == null || isOption(nextWord) || isArgumentSeparator(nextWord)) {
if (!isBooleanOption(commandName, currentWord)) {
if (!isBooleanOption(fullCommandName, currentWord)) {
throw new IllegalArgumentException("Option '" + currentWord + "' requires a value");
}
nextWord = "true";
}
else if (isBooleanOption(commandName, currentWord) && !isBooleanValue(nextWord)) {
else if (isBooleanOption(fullCommandName, currentWord) && !isBooleanValue(nextWord)) {
nextWord = "true";
}
else {
Expand Down
213 changes: 155 additions & 58 deletions ...-core/src/test/java/org/springframework/shell/core/command/DefaultCommandParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,62 +272,112 @@ static Stream<Arguments> parseWithQuotedArgumentData() {

@ParameterizedTest
@MethodSource("parseWithBooleanOptionData")
void testParseWithBooleanOption(String input, String longName, char shortName, Class<?> type,
void testParseWithBooleanOption(String input, String commandName, String longName, char shortName, Class<?> type,
String expectedValue) {
// given
Command command = createCommand("mycommand", "My test command");
Command command = createCommand(commandName, "My test command");
command.getOptions().add(CommandOption.with().longName(longName).shortName(shortName).type(type).build());
commandRegistry.registerCommand(command);

// when
ParsedInput parsedInput = parser.parse(input);
String commandWithSubcommands = String
.join(" ", parsedInput.commandName(), String.join(" ", parsedInput.subCommands()))
.trim();

// then
assertEquals("mycommand", parsedInput.commandName());
assertEquals(commandName, commandWithSubcommands);
assertEquals(1, parsedInput.options().size());
assertEquals(longName, parsedInput.options().get(0).longName());
assertEquals(shortName, parsedInput.options().get(0).shortName());
assertEquals(expectedValue, parsedInput.options().get(0).value());
}

static Stream<Arguments> parseWithBooleanOptionData() {
return Stream.of(Arguments.of("mycommand --option=true", "option", ' ', boolean.class, "true"),
Arguments.of("mycommand --option=false", "option", ' ', boolean.class, "false"),
Arguments.of("mycommand --option true", "option", ' ', boolean.class, "true"),
Arguments.of("mycommand --option false", "option", ' ', boolean.class, "false"),
Arguments.of("mycommand --option", "option", ' ', boolean.class, "true"),

Arguments.of("mycommand -on=true", "", 'o', boolean.class, "true"),
Arguments.of("mycommand -o=false", "", 'o', boolean.class, "false"),
Arguments.of("mycommand -o true", "", 'o', boolean.class, "true"),
Arguments.of("mycommand -o false", "", 'o', boolean.class, "false"),
Arguments.of("mycommand -o", "", 'o', boolean.class, "true"),

Arguments.of("mycommand --option=true", "option", ' ', Boolean.class, "true"),
Arguments.of("mycommand --option=false", "option", ' ', Boolean.class, "false"),
Arguments.of("mycommand --option true", "option", ' ', Boolean.class, "true"),
Arguments.of("mycommand --option false", "option", ' ', Boolean.class, "false"),
Arguments.of("mycommand --option", "option", ' ', Boolean.class, "true"),

Arguments.of("mycommand -on=true", "", 'o', Boolean.class, "true"),
Arguments.of("mycommand -o=false", "", 'o', Boolean.class, "false"),
Arguments.of("mycommand -o true", "", 'o', Boolean.class, "true"),
Arguments.of("mycommand -o false", "", 'o', Boolean.class, "false"),
Arguments.of("mycommand -o", "", 'o', Boolean.class, "true"));
return Stream.of(Arguments.of("mycommand --option=true", "mycommand", "option", ' ', boolean.class, "true"),
Arguments.of("mycommand --option=false", "mycommand", "option", ' ', boolean.class, "false"),
Arguments.of("mycommand --option true", "mycommand", "option", ' ', boolean.class, "true"),
Arguments.of("mycommand --option false", "mycommand", "option", ' ', boolean.class, "false"),
Arguments.of("mycommand --option", "mycommand", "option", ' ', boolean.class, "true"),

Arguments.of("mycommand -on=true", "mycommand", "", 'o', boolean.class, "true"),
Arguments.of("mycommand -o=false", "mycommand", "", 'o', boolean.class, "false"),
Arguments.of("mycommand -o true", "mycommand", "", 'o', boolean.class, "true"),
Arguments.of("mycommand -o false", "mycommand", "", 'o', boolean.class, "false"),
Arguments.of("mycommand -o", "mycommand", "", 'o', boolean.class, "true"),

Arguments.of("mycommand --option=true", "mycommand", "option", ' ', Boolean.class, "true"),
Arguments.of("mycommand --option=false", "mycommand", "option", ' ', Boolean.class, "false"),
Arguments.of("mycommand --option true", "mycommand", "option", ' ', Boolean.class, "true"),
Arguments.of("mycommand --option false", "mycommand", "option", ' ', Boolean.class, "false"),
Arguments.of("mycommand --option", "mycommand", "option", ' ', Boolean.class, "true"),

Arguments.of("mycommand -on=true", "mycommand", "", 'o', Boolean.class, "true"),
Arguments.of("mycommand -o=false", "mycommand", "", 'o', Boolean.class, "false"),
Arguments.of("mycommand -o true", "mycommand", "", 'o', Boolean.class, "true"),
Arguments.of("mycommand -o false", "mycommand", "", 'o', Boolean.class, "false"),
Arguments.of("mycommand -o", "mycommand", "", 'o', Boolean.class, "true"),

Arguments.of("thecommand mysubcommand --option=true", "thecommand mysubcommand", "option", ' ',
boolean.class, "true"),
Arguments.of("thecommand mysubcommand --option=false", "thecommand mysubcommand", "option", ' ',
boolean.class, "false"),
Arguments.of("thecommand mysubcommand --option true", "thecommand mysubcommand", "option", ' ',
boolean.class, "true"),
Arguments.of("thecommand mysubcommand --option false", "thecommand mysubcommand", "option", ' ',
boolean.class, "false"),
Arguments.of("thecommand mysubcommand --option", "thecommand mysubcommand", "option", ' ',
boolean.class, "true"),

Arguments.of("thecommand mysubcommand -on=true", "thecommand mysubcommand", "", 'o', boolean.class,
"true"),
Arguments.of("thecommand mysubcommand -o=false", "thecommand mysubcommand", "", 'o', boolean.class,
"false"),
Arguments.of("thecommand mysubcommand -o true", "thecommand mysubcommand", "", 'o', boolean.class,
"true"),
Arguments.of("thecommand mysubcommand -o false", "thecommand mysubcommand", "", 'o', boolean.class,
"false"),
Arguments.of("thecommand mysubcommand -o", "thecommand mysubcommand", "", 'o', boolean.class, "true"),

Arguments.of("thecommand mysubcommand --option=true", "thecommand mysubcommand", "option", ' ',
Boolean.class, "true"),
Arguments.of("thecommand mysubcommand --option=false", "thecommand mysubcommand", "option", ' ',
Boolean.class, "false"),
Arguments.of("thecommand mysubcommand --option true", "thecommand mysubcommand", "option", ' ',
Boolean.class, "true"),
Arguments.of("thecommand mysubcommand --option false", "thecommand mysubcommand", "option", ' ',
Boolean.class, "false"),
Arguments.of("thecommand mysubcommand --option", "thecommand mysubcommand", "option", ' ',
Boolean.class, "true"),

Arguments.of("thecommand mysubcommand -on=true", "thecommand mysubcommand", "", 'o', Boolean.class,
"true"),
Arguments.of("thecommand mysubcommand -o=false", "thecommand mysubcommand", "", 'o', Boolean.class,
"false"),
Arguments.of("thecommand mysubcommand -o true", "thecommand mysubcommand", "", 'o', Boolean.class,
"true"),
Arguments.of("thecommand mysubcommand -o false", "thecommand mysubcommand", "", 'o', Boolean.class,
"false"),
Arguments.of("thecommand mysubcommand -o", "thecommand mysubcommand", "", 'o', Boolean.class, "true"));
}

@ParameterizedTest
@MethodSource("parseWithBooleanOptionAndArgumentData")
void testParseWithBooleanOptionAndArgument(String input, String expectedValue, int expectedArguments,
String expectedArgumentValue) {
void testParseWithBooleanOptionAndArgument(String input, String commandName, String expectedValue,
int expectedArguments, String expectedArgumentValue) {
// given
Command command = createCommand("mycommand", "My test command");
Command command = createCommand(commandName, "My test command");
command.getOptions().add(CommandOption.with().longName("option").type(boolean.class).build());
commandRegistry.registerCommand(command);

// when
ParsedInput parsedInput = parser.parse(input);
String commandWithSubcommands = String
.join(" ", parsedInput.commandName(), String.join(" ", parsedInput.subCommands()))
.trim();

// then
assertEquals("mycommand", parsedInput.commandName());
assertEquals(commandName, commandWithSubcommands);
assertEquals(1, parsedInput.options().size());
assertEquals(expectedValue, parsedInput.options().get(0).value());
assertEquals(expectedArguments, parsedInput.arguments().size());
Expand All @@ -337,34 +387,81 @@ void testParseWithBooleanOptionAndArgument(String input, String expectedValue, i
}

static Stream<Arguments> parseWithBooleanOptionAndArgumentData() {
return Stream.of(Arguments.of("mycommand --option=false", "false", 0, null),
Arguments.of("mycommand --option=true", "true", 0, null),
Arguments.of("mycommand --option false", "false", 0, null),
Arguments.of("mycommand --option true", "true", 0, null),
Arguments.of("mycommand --option", "true", 0, null),

Arguments.of("mycommand --option=false argument", "false", 1, "argument"),
Arguments.of("mycommand --option=true argument", "true", 1, "argument"),
Arguments.of("mycommand --option false argument", "false", 1, "argument"),
Arguments.of("mycommand --option true argument", "true", 1, "argument"),
Arguments.of("mycommand --option argument", "true", 1, "argument"),

Arguments.of("mycommand argument --option=false", "false", 1, "argument"),
Arguments.of("mycommand argument --option=true", "true", 1, "argument"),
Arguments.of("mycommand argument --option false", "false", 1, "argument"),
Arguments.of("mycommand argument --option true", "true", 1, "argument"),
Arguments.of("mycommand argument --option", "true", 1, "argument"),

Arguments.of("mycommand --option=false true", "false", 1, "true"),
Arguments.of("mycommand --option=true true", "true", 1, "true"),
Arguments.of("mycommand --option false false", "false", 1, "false"),
Arguments.of("mycommand --option true false", "true", 1, "false"),

Arguments.of("mycommand false --option=false", "false", 1, "false"),
Arguments.of("mycommand false --option=true", "true", 1, "false"),
Arguments.of("mycommand true --option false", "false", 1, "true"),
Arguments.of("mycommand true --option true", "true", 1, "true"),
Arguments.of("mycommand true --option", "true", 1, "true"));
return Stream.of(Arguments.of("mycommand --option=false", "mycommand", "false", 0, null),
Arguments.of("mycommand --option=true", "mycommand", "true", 0, null),
Arguments.of("mycommand --option false", "mycommand", "false", 0, null),
Arguments.of("mycommand --option true", "mycommand", "true", 0, null),
Arguments.of("mycommand --option", "mycommand", "true", 0, null),

Arguments.of("mycommand --option=false argument", "mycommand", "false", 1, "argument"),
Arguments.of("mycommand --option=true argument", "mycommand", "true", 1, "argument"),
Arguments.of("mycommand --option false argument", "mycommand", "false", 1, "argument"),
Arguments.of("mycommand --option true argument", "mycommand", "true", 1, "argument"),
Arguments.of("mycommand --option argument", "mycommand", "true", 1, "argument"),

Arguments.of("mycommand argument --option=false", "mycommand", "false", 1, "argument"),
Arguments.of("mycommand argument --option=true", "mycommand", "true", 1, "argument"),
Arguments.of("mycommand argument --option false", "mycommand", "false", 1, "argument"),
Arguments.of("mycommand argument --option true", "mycommand", "true", 1, "argument"),
Arguments.of("mycommand argument --option", "mycommand", "true", 1, "argument"),

Arguments.of("mycommand --option=false true", "mycommand", "false", 1, "true"),
Arguments.of("mycommand --option=true true", "mycommand", "true", 1, "true"),
Arguments.of("mycommand --option false false", "mycommand", "false", 1, "false"),
Arguments.of("mycommand --option true false", "mycommand", "true", 1, "false"),

Arguments.of("mycommand false --option=false", "mycommand", "false", 1, "false"),
Arguments.of("mycommand false --option=true", "mycommand", "true", 1, "false"),
Arguments.of("mycommand true --option false", "mycommand", "false", 1, "true"),
Arguments.of("mycommand true --option true", "mycommand", "true", 1, "true"),
Arguments.of("mycommand true --option", "mycommand", "true", 1, "true"),

Arguments.of("thecommand mysubcommand --option=false", "thecommand mysubcommand", "false", 0, null),
Arguments.of("thecommand mysubcommand --option=true", "thecommand mysubcommand", "true", 0, null),
Arguments.of("thecommand mysubcommand --option false", "thecommand mysubcommand", "false", 0, null),
Arguments.of("thecommand mysubcommand --option true", "thecommand mysubcommand", "true", 0, null),
Arguments.of("thecommand mysubcommand --option", "thecommand mysubcommand", "true", 0, null),

Arguments.of("thecommand mysubcommand --option=false argument", "thecommand mysubcommand", "false", 1,
"argument"),
Arguments.of("thecommand mysubcommand --option=true argument", "thecommand mysubcommand", "true", 1,
"argument"),
Arguments.of("thecommand mysubcommand --option false argument", "thecommand mysubcommand", "false", 1,
"argument"),
Arguments.of("thecommand mysubcommand --option true argument", "thecommand mysubcommand", "true", 1,
"argument"),
Arguments.of("thecommand mysubcommand --option argument", "thecommand mysubcommand", "true", 1,
"argument"),

Arguments.of("thecommand mysubcommand argument --option=false", "thecommand mysubcommand", "false", 1,
"argument"),
Arguments.of("thecommand mysubcommand argument --option=true", "thecommand mysubcommand", "true", 1,
"argument"),
Arguments.of("thecommand mysubcommand argument --option false", "thecommand mysubcommand", "false", 1,
"argument"),
Arguments.of("thecommand mysubcommand argument --option true", "thecommand mysubcommand", "true", 1,
"argument"),
Arguments.of("thecommand mysubcommand argument --option", "thecommand mysubcommand", "true", 1,
"argument"),

Arguments.of("thecommand mysubcommand --option=false true", "thecommand mysubcommand", "false", 1,
"true"),
Arguments.of("thecommand mysubcommand --option=true true", "thecommand mysubcommand", "true", 1,
"true"),
Arguments.of("thecommand mysubcommand --option false false", "thecommand mysubcommand", "false", 1,
"false"),
Arguments.of("thecommand mysubcommand --option true false", "thecommand mysubcommand", "true", 1,
"false"),

Arguments.of("thecommand mysubcommand false --option=false", "thecommand mysubcommand", "false", 1,
"false"),
Arguments.of("thecommand mysubcommand false --option=true", "thecommand mysubcommand", "true", 1,
"false"),
Arguments.of("thecommand mysubcommand true --option false", "thecommand mysubcommand", "false", 1,
"true"),
Arguments.of("thecommand mysubcommand true --option true", "thecommand mysubcommand", "true", 1,
"true"),
Arguments.of("thecommand mysubcommand true --option", "thecommand mysubcommand", "true", 1, "true"));
}

@ParameterizedTest
Expand Down
Loading