Enable IsolatedLauncherTest

diff --git a/sonar-runner-batch/src/main/java/org/sonar/runner/batch/IsolatedLauncher.java b/sonar-runner-batch/src/main/java/org/sonar/runner/batch/IsolatedLauncher.java
index 115ca74c827232f1cebe7b69253e17945823e79e..c541b1ec55796afa16edfa5b95829453c3be0428 100644 (file)
--- a/sonar-runner-batch/src/main/java/org/sonar/runner/batch/IsolatedLauncher.java
+++ b/sonar-runner-batch/src/main/java/org/sonar/runner/batch/IsolatedLauncher.java
@@ -41,9 +41,9 @@ import java.util.Properties;
 public class IsolatedLauncher {
 
   public void execute(Properties properties, List<Object> extensions) {
-    String task = properties.getProperty("sonar.task");
     ProjectReactor projectReactor = null;
-    if (task == null || "scan".equals(task)) {
+    String task = properties.getProperty("sonar.task", "scan");
+    if ("scan".equals(task)) {
       Properties propsClone = new Properties();
       propsClone.putAll(properties);
       projectReactor = new ProjectReactorBuilder(propsClone).build();

diff --git a/sonar-runner-batch/src/test/java/org/sonar/runner/batch/IsolatedLauncherTest.java b/sonar-runner-batch/src/test/java/org/sonar/runner/batch/IsolatedLauncherTest.java
new file mode 100644 (file)
index 0000000..31c6174
--- /dev/null
+++ b/sonar-runner-batch/src/test/java/org/sonar/runner/batch/IsolatedLauncherTest.java
@@ -0,0 +1,62 @@
+/*
+ * Sonar Runner - Batch
+ * Copyright (C) 2011 SonarSource
+ * dev@sonar.codehaus.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.runner.batch;
+
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+public class IsolatedLauncherTest {
+
+  Properties props = new Properties();
+  IsolatedLauncher launcher = new IsolatedLauncher();
+
+  @Test
+  public void testGetSqlLevel() throws Exception {
+    assertThat(IsolatedLauncher.getSqlLevel(props)).isEqualTo("WARN");
+
+    props.setProperty("sonar.showSql", "true");
+    assertThat(IsolatedLauncher.getSqlLevel(props)).isEqualTo("DEBUG");
+
+    props.setProperty("sonar.showSql", "false");
+    assertThat(IsolatedLauncher.getSqlLevel(props)).isEqualTo("WARN");
+  }
+
+  @Test
+  public void testGetSqlResultsLevel() throws Exception {
+    assertThat(IsolatedLauncher.getSqlResultsLevel(props)).isEqualTo("WARN");
+
+    props.setProperty("sonar.showSqlResults", "true");
+    assertThat(IsolatedLauncher.getSqlResultsLevel(props)).isEqualTo("DEBUG");
+
+    props.setProperty("sonar.showSqlResults", "false");
+    assertThat(IsolatedLauncher.getSqlResultsLevel(props)).isEqualTo("WARN");
+  }
+
+  @Test
+  public void shouldDetermineVerboseMode() {
+    assertThat(launcher.isDebug(props)).isFalse();
+
+    props.setProperty("sonar.verbose", "true");
+    assertThat(launcher.isDebug(props)).isTrue();
+  }
+}