aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/resources/org
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-07-07 10:14:24 +0000
committerSimon Brandhof <simon.brandhof@gmail.com>2011-07-07 10:14:24 +0000
commitfdda729e0b8a2b907f19b84720ac44dd1d8d47c4 (patch)
tree8956ddb0484530499531ee5e73086c397469e241 /src/test/resources/org
parent45e872297de7537dd43fc8f8f8861ef17b2763be (diff)
downloadsonar-scanner-cli-fdda729e0b8a2b907f19b84720ac44dd1d8d47c4.tar.gz
sonar-scanner-cli-fdda729e0b8a2b907f19b84720ac44dd1d8d47c4.zip
Sonar runner: refactor unit test to remove conflict with sonar analysis
Diffstat (limited to 'src/test/resources/org')
-rw-r--r--src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/project/sonar-project.properties4
-rw-r--r--src/test/resources/org/sonar/runner/MainTest/shouldLoadCompleteConfiguration/runner/conf/sonar-runner.properties4
2 files changed, 4 insertions, 4 deletions
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 d9ed633..0d1e025 100644
--- 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 0f6524d..7edfb99 100644
--- 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