aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/sonarsource/scanner/cli/CliTest.java4
-rw-r--r--src/test/java/org/sonarsource/scanner/cli/MainTest.java18
2 files changed, 11 insertions, 11 deletions
diff --git a/src/test/java/org/sonarsource/scanner/cli/CliTest.java b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
index 8072be5..c843ff6 100644
--- a/src/test/java/org/sonarsource/scanner/cli/CliTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/CliTest.java
@@ -53,7 +53,7 @@ public class CliTest {
cli = new Cli(exit, logs);
cli.parse(new String[] {"-D"});
verify(logs).error("Missing argument for option -D/--define");
- verify(exit).exit(Exit.ERROR);
+ verify(exit).exit(Exit.INTERNAL_ERROR);
}
@Test
@@ -142,7 +142,7 @@ public class CliTest {
cli.parse(new String[] {"-w"});
verify(logs).error("Unrecognized option: -w");
verify(logs).info("usage: sonar-scanner [options]");
- verify(exit).exit(Exit.ERROR);
+ verify(exit).exit(Exit.INTERNAL_ERROR);
}
@Test
diff --git a/src/test/java/org/sonarsource/scanner/cli/MainTest.java b/src/test/java/org/sonarsource/scanner/cli/MainTest.java
index e8f19a6..7090196 100644
--- a/src/test/java/org/sonarsource/scanner/cli/MainTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/MainTest.java
@@ -88,7 +88,7 @@ public class MainTest {
Main main = new Main(exit, cli, conf, scannerFactory, logs);
main.execute();
- verify(exit).exit(Exit.ERROR);
+ verify(exit).exit(Exit.INTERNAL_ERROR);
verify(logs).error("Error during SonarQube Scanner execution", e);
}
@@ -106,14 +106,14 @@ public class MainTest {
verify(runner).start();
verify(runner, never()).execute(any());
- verify(exit).exit(Exit.ERROR);
+ verify(exit).exit(Exit.INTERNAL_ERROR);
verify(logs).error("Error during SonarQube Scanner execution", e);
}
@Test
public void show_error_MessageException() {
Exception e = createException(true);
- testException(e, false, false);
+ testException(e, false, false, Exit.USER_ERROR);
verify(logs).error("Error during SonarQube Scanner execution");
verify(logs).error("Caused by: NPE");
@@ -123,7 +123,7 @@ public class MainTest {
@Test
public void show_error_MessageException_embedded() {
Exception e = createException(true);
- testException(e, false, true);
+ testException(e, false, true, Exit.USER_ERROR);
verify(logs).error("Error during SonarQube Scanner execution");
verify(logs).error("Caused by: NPE");
@@ -132,7 +132,7 @@ public class MainTest {
@Test
public void show_error_MessageException_debug() {
Exception e = createException(true);
- testException(e, true, false);
+ testException(e, true, false, Exit.USER_ERROR);
verify(logs).error("Error during SonarQube Scanner execution");
verify(logs).error("my message");
@@ -142,7 +142,7 @@ public class MainTest {
@Test
public void show_error_MessageException_debug_embedded() {
Exception e = createException(true);
- testException(e, true, true);
+ testException(e, true, true, Exit.USER_ERROR);
verify(logs).error("Error during SonarQube Scanner execution");
verify(logs).error("my message");
@@ -152,13 +152,13 @@ public class MainTest {
@Test
public void show_error_debug() {
Exception e = createException(false);
- testException(e, true, false);
+ testException(e, true, false, Exit.INTERNAL_ERROR);
verify(logs).error("Error during SonarQube Scanner execution", e);
verify(logs, never()).error("Re-run SonarQube Scanner using the -X switch to enable full debug logging.");
}
- private void testException(Exception e, boolean debugEnabled, boolean isEmbedded) {
+ private void testException(Exception e, boolean debugEnabled, boolean isEmbedded, int expectedExitCode) {
when(cli.isDebugEnabled()).thenReturn(debugEnabled);
when(cli.isEmbedded()).thenReturn(isEmbedded);
@@ -169,7 +169,7 @@ public class MainTest {
Main main = new Main(exit, cli, conf, scannerFactory, logs);
main.execute();
- verify(exit).exit(Exit.ERROR);
+ verify(exit).exit(expectedExitCode);
}
private Exception createException(boolean messageException) {