Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bs-137] "spring help" prints "Unexpected error" (when it isn't)

Browse Source 
[#50523561]
This commit is contained in:
Dave Syer 2013-05-24 16:44:05 +01:00
parent 750b193fe4
commit 25f68404f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java
View File

@ -84,8 +84,9 @@ public class SpringBootstrapCli {
Set<BootstrapCliException.Option> options = NO_EXCEPTION_OPTIONS;
if (ex instanceof BootstrapCliException) {
options = ((BootstrapCliException) ex).getOptions();
} else {
errorMessage(ex.getMessage());
}
errorMessage(ex.getMessage());
if (options.contains(BootstrapCliException.Option.SHOW_USAGE)) {
showUsage();
}

3
spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java
View File

@ -124,8 +124,7 @@ public class SpringBootstrapCliTests {
public void handlesNoSuchOptionException() throws Exception {
int status = this.cli.runAndHandleErrors("--missing");
assertThat(status, equalTo(1));
assertThat(this.calls,
equalTo((Set<Call>) EnumSet.of(Call.ERROR_MESSAGE, Call.SHOW_USAGE)));
assertThat(this.calls, equalTo((Set<Call>) EnumSet.of(Call.SHOW_USAGE)));
}
@Test