Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tests for completion continuation

Browse Source
This commit is contained in:
Eric Bottard
2014-02-17 16:57:25 +01:00
parent d11cae8ab2
commit e5adb8bc06
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/shell/core/SimpleParser.java
View File

@@ -783,15 +783,18 @@ public class SimpleParser implements Parser {
for (String key : option.key()) {
if (key.equals(lastOptionKey)) {
List<Completion> allValues = new ArrayList<Completion>();
String suffix = " ";
// We'll append the closing delimiter to proposals
String suffix = "" + tokenizer.getLastValueDelimiter();
if (!suffix.endsWith(" ")) {
suffix += " ";
}
// Let's use a Converter if one is available
for (Converter<?> candidate : converters) {
if (candidate.supports(parameterType, option.optionContext())) {
// Found a usable converter
boolean addSpace = candidate.getAllPossibleValues(allValues, parameterType,
boolean allComplete = candidate.getAllPossibleValues(allValues, parameterType,
lastOptionValue, option.optionContext(), methodTarget);
if (!addSpace) {
if (!allComplete) {
suffix = "";
}
break;

53
src/test/java/org/springframework/shell/core/SimpleParserTests.java
View File

@@ -324,6 +324,50 @@ public class SimpleParserTests {
// assertThat(SimpleParser.isMatch("hello ", "hellothere", true), is(nullValue()));
}
@Test
public void testValueCompletionsThatCanContinue() {
parser.add(new MyCommands());
parser.add(new StringCompletions(Arrays.asList("abd", "def"), false));
// With space as delimiter
buffer = "bar --option1 ";
offset = parser.completeAdvanced(buffer, buffer.length(), candidates);
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 abd")))));
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 def")))));
// With quotes as delimiter
buffer = "bar --option1 \"";
candidates.clear();
offset = parser.completeAdvanced(buffer, buffer.length(), candidates);
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 \"abd")))));
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 \"def")))));
}
@Test
public void testValueCompletionsThatCannotContinue() {
parser.add(new MyCommands());
parser.add(new StringCompletions(Arrays.asList("abd", "def"), true));
// With space as delimiter
buffer = "bar --option1 ";
offset = parser.completeAdvanced(buffer, buffer.length(), candidates);
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 abd ")))));
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 def ")))));
// With quotes as delimiter
buffer = "bar --option1 \"";
candidates.clear();
offset = parser.completeAdvanced(buffer, buffer.length(), candidates);
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 \"abd\" ")))));
assertThat(candidates, hasItem(completionThat(is(equalTo("bar --option1 \"def\" ")))));
}
/**
* Return a matcher that asserts that a completion, when added to {@link #buffer} at the given {@link #offset},
* indeed matches the provided matcher.
@@ -408,8 +452,15 @@ public class SimpleParserTests {
private final List<String> completions;
private final boolean canContinue;
public StringCompletions(List<String> completions) {
this(completions, false);
}
public StringCompletions(List<String> completions, boolean canContinue) {
this.completions = completions;
this.canContinue = canContinue;
}
public boolean supports(Class<?> type, String optionContext) {
@@ -425,7 +476,7 @@ public class SimpleParserTests {
for (String s : this.completions) {
completions.add(new Completion(s));
}
return false;
return canContinue;
}
}