SQSCANNER-29 Exit code should not be 0 when script fails due to ERROR: Unrecognized option

2 files changed, 22 insertions, 1 deletions

diff --git a/src/main/java/org/sonarsource/scanner/cli/Cli.java b/src/main/java/org/sonarsource/scanner/cli/Cli.java
index 9019c6a..784f6c1 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Cli.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Cli.java
@@ -62,6 +62,7 @@ class Cli {
 
       } else if ("-h".equals(arg) || "--help".equals(arg)) {
         printUsage();
+        exit.exit(Exit.SUCCESS);
 
       } else if ("-v".equals(arg) || "--version".equals(arg)) {
         displayVersionOnly = true;
@@ -120,6 +121,7 @@ class Cli {
   private void printError(String message) {
     logger.error(message);
     printUsage();
+    exit.exit(Exit.ERROR);
   }
 
   private void printUsage() {
@@ -133,6 +135,5 @@ class Cli {
     logger.info(" -v,--version          Display version information");
     logger.info(" -X,--debug            Produce execution debug output");
     logger.info(" -i,--interactive      Run interactively");
-    exit.exit(Exit.SUCCESS);
   }
 }
diff --git a/src/test/java/org/sonarsource/scanner/cli/CliTest.java b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
index 6bac2d0..840f35b 100644
--- a/src/test/java/org/sonarsource/scanner/cli/CliTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class CliTest {
   Exit exit = mock(Exit.class);
@@ -77,4 +78,23 @@ public class CliTest {
     assertThat(cli.isDisplayStackTrace()).isFalse();
     assertThat(cli.properties().get("sonar.verbose")).isNull();
   }
+
+  @Test
+  public void should_show_usage() {
+    logs = mock(Logs.class);
+    cli = new Cli(exit, logs);
+    cli.parse(new String[] {"-h"});
+    verify(logs).info("usage: sonar-scanner [options]");
+    verify(exit).exit(Exit.SUCCESS);
+  }
+
+  @Test
+  public void should_show_usage_on_bad_syntax() {
+    logs = mock(Logs.class);
+    cli = new Cli(exit, logs);
+    cli.parse(new String[] {"-w"});
+    verify(logs).error("Unrecognized option: -w");
+    verify(logs).info("usage: sonar-scanner [options]");
+    verify(exit).exit(Exit.ERROR);
+  }
 }