Fix UTs

diff --git a/sonar-runner-dist/src/test/java/org/sonar/runner/ConfTest.java b/sonar-runner-dist/src/test/java/org/sonar/runner/ConfTest.java
index e4296c5cacd8699cb195c06484434a1e0f23117d..d9ad17d8f42c87e8be87754a55b4ef51c7e82d28 100644 (file)
--- a/sonar-runner-dist/src/test/java/org/sonar/runner/ConfTest.java
+++ b/sonar-runner-dist/src/test/java/org/sonar/runner/ConfTest.java
@@ -45,7 +45,7 @@ public class ConfTest {
     File home = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/").toURI());
     args.setProperty("runner.home", home.getCanonicalPath());
 
-    assertThat(conf.properties().get("sonar.host.url")).isEqualTo("http://moon/sonar");
+    assertThat(conf.properties().get("sonar.prop")).isEqualTo("value");
   }
 
   @Test
@@ -58,23 +58,23 @@ public class ConfTest {
     File settings = new File(getClass().getResource("/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties").toURI());
     args.setProperty("runner.settings", settings.getCanonicalPath());
 
-    assertThat(conf.properties().get("sonar.host.url")).isEqualTo("http://other/sonar");
+    assertThat(conf.properties().get("sonar.prop")).isEqualTo("otherValue");
   }
 
-//  @Test
-//  public void shouldLoadCompleteConfiguration() throws Exception {
-//    File runnerHome = new File(getClass().getResource("/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner").toURI());
-//    File projectHome = new File(getClass().getResource("/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project").toURI());
-//    Main main = new Main();
-//    Properties args = main.parseArguments(new String[] {
-//      "-D", "runner.home=" + runnerHome.getCanonicalPath(),
-//      "-D", "project.home=" + projectHome.getCanonicalPath()
-//    });
-//    main.loadProperties(args);
-//
-//    assertThat(main.projectProperties.getProperty("project.prop")).isEqualTo("foo");
-//    assertThat(main.projectProperties.getProperty("overridden.prop")).isEqualTo("project scope");
-//    assertThat(main.globalProperties.getProperty("global.prop")).isEqualTo("jdbc:mysql:localhost/sonar");
-//  }
+  // @Test
+  // public void shouldLoadCompleteConfiguration() throws Exception {
+  // File runnerHome = new File(getClass().getResource("/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner").toURI());
+  // File projectHome = new File(getClass().getResource("/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project").toURI());
+  // Main main = new Main();
+  // Properties args = main.parseArguments(new String[] {
+  // "-D", "runner.home=" + runnerHome.getCanonicalPath(),
+  // "-D", "project.home=" + projectHome.getCanonicalPath()
+  // });
+  // main.loadProperties(args);
+  //
+  // assertThat(main.projectProperties.getProperty("project.prop")).isEqualTo("foo");
+  // assertThat(main.projectProperties.getProperty("overridden.prop")).isEqualTo("project scope");
+  // assertThat(main.globalProperties.getProperty("global.prop")).isEqualTo("jdbc:mysql:localhost/sonar");
+  // }
 
 }

diff --git a/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties b/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties
index 740a616bad00a506412933391b81c6ec3d14ca2e..33dc79be632b9a1ec4e59d613a80e09f9b28648f 100644 (file)
--- a/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties
+++ b/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByDirectPath/other-conf.properties
@@ -1 +1 @@
-sonar.host.url=http://other/sonar
\ No newline at end of file
+sonar.prop=otherValue

diff --git a/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/conf/sonar-runner.properties b/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/conf/sonar-runner.properties
index e7d5c09dfdae0f59289c33c8a0ec86c111a3bda7..1e03622e05bc365da168e4c8576e60dc376b10eb 100644 (file)
--- a/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/conf/sonar-runner.properties
+++ b/sonar-runner-dist/src/test/resources/org/sonar/runner/ConfTest/shouldLoadRunnerSettingsByHome/conf/sonar-runner.properties
@@ -1,2 +1,2 @@
-sonar.host.url=http://moon/sonar
-sonar.jdbc.url=jdbc:mysql:localhost/sonar
\ No newline at end of file
+sonar.prop=value
+sonar.jdbc.url=jdbc:mysql:localhost/sonar