Improve tests

diff --git a/it/src/test/java/com/sonar/runner/it/JavaTest.java b/it/src/test/java/com/sonar/runner/it/JavaTest.java
index c93e3ccb3cd400afd18b1aefce8bb294e2826ad5..c9d3210594353e9f5c237b6146b9e004bb823296 100644 (file)
--- a/it/src/test/java/com/sonar/runner/it/JavaTest.java
+++ b/it/src/test/java/com/sonar/runner/it/JavaTest.java
@@ -220,9 +220,7 @@ public class JavaTest extends ScannerTestCase {
         "\"sonar.projectDescription\" : \"This is a Java sample\"," +
         "\"sonar.projectVersion\" : \"1.2.3\"," +
         "\"sonar.sources\" : \"src\" }");
-    String logs = orchestrator.executeBuild(build).getLogs();
-    System.out.println(logs);
-
+    orchestrator.executeBuild(build);
   }
 
   @Test

diff --git a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
index 506e01d2ccffd198848c3dbf91bf807292745a75..66e61e8a29050262c85605451d90e899b2025309 100644 (file)
--- a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java
@@ -37,6 +37,7 @@ import org.apache.commons.lang.SystemUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 
 public class ConfTest {
@@ -44,6 +45,9 @@ public class ConfTest {
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
 
+  @Rule
+  public ExpectedException exception = ExpectedException.none();
+
   Map<String, String> env = new HashMap<>();
   Properties args = new Properties();
   Logs logs = new Logs(System.out, System.err);
@@ -131,6 +135,14 @@ public class ConfTest {
     assertThat(props.getProperty("sonar.key2")).isEqualTo("v3");
   }
 
+  @Test
+  public void shouldFailWithInvalidEnvironmentProperties() throws IOException {
+    env.put("SONARQUBE_SCANNER_PARAMS", "{sonar.key1: \"v1\", \"sonar.key2\" : \"v2\"}");
+    exception.expect(IllegalStateException.class);
+    exception.expectMessage("JSON");
+    conf.properties();
+  }
+
   @Test
   public void shouldSupportDeepModuleConfigurationInRoot() throws Exception {
     Path projectHome = Paths.get(getClass().getResource("ConfTest/shouldSupportDeepModuleConfigurationInRoot/project").toURI());