Browse Source

Fix typo in name of method, add tests

tags/2.5-rc1
Evgeny Mandrikov 12 years ago
parent
commit
270bdf2df0

+ 1
- 1
src/main/java/org/sonar/runner/Main.java View File

@@ -51,7 +51,7 @@ public final class Main {
log("Runner version: " + runner.getRunnerVersion());
log("Java version: " + System.getProperty("java.version", "<unknown java version>")
+ ", vendor: " + System.getProperty("java.vendor", "<unknown vendor>"));
log("Server: " + runner.getServerURl());
log("Server: " + runner.getServerURL());
log("Work directory: " + runner.getWorkDir().getCanonicalPath());
runner.execute();
} catch (IOException e) {

+ 2
- 2
src/main/java/org/sonar/runner/Runner.java View File

@@ -73,7 +73,7 @@ public final class Runner {

public void execute() {
checkMandatoryProperties();
Bootstrapper bootstrapper = new Bootstrapper("SonarRunner/" + getRunnerVersion(), getServerURl(), getWorkDir());
Bootstrapper bootstrapper = new Bootstrapper("SonarRunner/" + getRunnerVersion(), getServerURL(), getWorkDir());
checkSonarVersion(bootstrapper);
delegateExecution(createClassLoader(bootstrapper));
}
@@ -86,7 +86,7 @@ public final class Runner {
}
}

public String getServerURl() {
public String getServerURL() {
return properties.getProperty("sonar.host.url", "http://localhost:9000");
}


+ 26
- 0
src/test/java/org/sonar/runner/RunnerTest.java View File

@@ -80,6 +80,32 @@ public class RunnerTest {
assertThat(version, not(containsString("$")));
}

@Test
public void shouldGetServerUrl() {
Properties properties = new Properties();
Runner runner = Runner.create(properties);
assertThat("Default value", runner.getServerURL(), is("http://localhost:9000"));
properties.setProperty("sonar.host.url", "foo");
assertThat(runner.getServerURL(), is("foo"));
}

@Test
public void shouldDetermineVerboseMode() {
Properties properties = new Properties();
Runner runner = Runner.create(properties);
assertThat("Default value", runner.isDebug(), is(false));
properties.setProperty(Runner.VERBOSE, "true");
assertThat(runner.isDebug(), is(true));
}

@Test
public void shouldSupportDeprecatedDebugProperty() {
Properties properties = new Properties();
Runner runner = Runner.create(properties);
properties.setProperty(Runner.DEBUG_MODE, "true");
assertThat(runner.isDebug(), is(true));
}

@Test
public void shouldInitDirs() throws Exception {
Properties props = new Properties();

Loading…
Cancel
Save