diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-04-07 13:06:23 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-04-07 13:06:23 +0200 |
commit | 4092b61575fdfe7f2def7bfac9d8f017ae5bca22 (patch) | |
tree | a11fb3088096b4147974ba57bcbb99180ef9daeb /sonar-runner-batch | |
parent | b7f6de88556c006cd2bdafb6941ddb69162aaed8 (diff) | |
download | sonar-scanner-cli-4092b61575fdfe7f2def7bfac9d8f017ae5bca22.tar.gz sonar-scanner-cli-4092b61575fdfe7f2def7bfac9d8f017ae5bca22.zip |
Enable IsolatedLauncherTest
Diffstat (limited to 'sonar-runner-batch')
-rw-r--r-- | sonar-runner-batch/src/main/java/org/sonar/runner/batch/IsolatedLauncher.java | 4 | ||||
-rw-r--r-- | sonar-runner-batch/src/test/java/org/sonar/runner/batch/IsolatedLauncherTest.java | 62 |
2 files changed, 64 insertions, 2 deletions
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 115ca74..c541b1e 100644 --- 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 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(); + } +} |