Sonar runner: refactor unit test to remove conflict with sonar analysis

diff --git a/src/test/java/org/sonar/runner/MainTest.java b/src/test/java/org/sonar/runner/MainTest.java
index 2e839f917d0b402266afb40ca149d4c1c220eeba..4f22fc3d43e0d138874297bc4df58b7923299a78 100644 (file)
--- a/src/test/java/org/sonar/runner/MainTest.java
+++ b/src/test/java/org/sonar/runner/MainTest.java
@@ -95,8 +95,8 @@ public class MainTest {
         "-D", "project.home=" + projectHome.getCanonicalPath()
     });
 
-    assertThat(props.getProperty("project.key"), is("foo"));
-    assertThat(props.getProperty("sonar.host.url"), is("http://overridden/sonar"));
-    assertThat(props.getProperty("sonar.jdbc.url"), is("jdbc:mysql:localhost/sonar"));
+    assertThat(props.getProperty("project.prop"), is("foo"));
+    assertThat(props.getProperty("overridden.prop"), is("project scope"));
+    assertThat(props.getProperty("global.prop"), is("jdbc:mysql:localhost/sonar"));
   }
 }

diff --git a/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project/sonar-project.properties b/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project/sonar-project.properties
index d9ed6334adcb3655281a8453b5657988ef13980d..0d1e025e28e42ae5e27083fd592e65759cf357a0 100644 (file)
--- a/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project/sonar-project.properties
@@ -1,4 +1,4 @@
-project.key=foo
+project.prop=foo
 
 # overridden property
-sonar.host.url=http://overridden/sonar
\ No newline at end of file
+overridden.prop=project scope
\ No newline at end of file

diff --git a/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner/conf/sonar-runner.properties b/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner/conf/sonar-runner.properties
index 0f6524d01ccf8ccd386aed9b4b517aad56651e1a..7edfb99e4634e0d522456064823e019c822b36f0 100644 (file)
--- a/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner/conf/sonar-runner.properties
+++ b/src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner/conf/sonar-runner.properties
@@ -1,2 +1,2 @@
-sonar.host.url=http://localhost/sonar
-sonar.jdbc.url=jdbc:mysql:localhost/sonar
+overridden.prop=runner scope
+global.prop=jdbc:mysql:localhost/sonar