aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/resources/org
diff options
context:
space:
mode:
authorFabrice Bellingard <fabrice.bellingard@sonarsource.com>2012-09-10 11:16:32 +0200
committerFabrice Bellingard <fabrice.bellingard@sonarsource.com>2012-09-10 11:16:32 +0200
commit4c56d81fdcfe24b1e4fd049b23f7bc673e246af0 (patch)
treeb090763d2fbea88fb2922f519ae96358fe88bffa /src/test/resources/org
parent3cd42ac0a5e2b24ce579ed86823bcc1c97d16c16 (diff)
downloadsonar-scanner-cli-4c56d81fdcfe24b1e4fd049b23f7bc673e246af0.tar.gz
sonar-scanner-cli-4c56d81fdcfe24b1e4fd049b23f7bc673e246af0.zip
SONARPLUGINS-2202 Change some property names
The 2 following properties have been introduced for better readability and consistency: - sonar.projectBaseDir - sonar.projectConfigFile
Diffstat (limited to 'src/test/resources/org')
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java (renamed from src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/sources/Fake.java)0
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties (renamed from src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/sonar-project.properties)2
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/generated/any-file.properties (renamed from src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/any-file.properties)3
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java (renamed from src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/modules/module1/sources/Fake.java)0
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties (renamed from src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/sonar-project.properties)4
-rw-r--r--src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties4
6 files changed, 6 insertions, 7 deletions
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/sources/Fake.java b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/modules/module1/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties
index 782fd4e..615f5c7 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-basedir/sonar-project.properties
@@ -9,6 +9,6 @@ sonar.binaries=target/classes
sonar.modules=module1
-module1.file=any-folder/any-file.properties
+module1.sonar.projectBaseDir=modules/module1
module1.sonar.projectKey=com.foo.project.module1
module1.sonar.projectName=Foo Module 1
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/any-file.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/generated/any-file.properties
index 460d349..c50d50b 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/any-file.properties
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/generated/any-file.properties
@@ -1,2 +1,5 @@
sonar.projectKey=com.foo.project.module1
sonar.projectName=Foo Module 1
+
+# and specify a different baseDir
+sonar.projectBaseDir=..
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/modules/module1/sources/Fake.java b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
index 5967658..5967658 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/modules/module1/sources/Fake.java
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/any-folder/sources/Fake.java
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties
index ce5fa00..c1640b1 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-configfile/sonar-project.properties
@@ -9,6 +9,4 @@ sonar.binaries=target/classes
sonar.modules=module1
-module1.path=modules/module1
-module1.sonar.projectKey=com.foo.project.module1
-module1.sonar.projectName=Foo Module 1
+module1.sonar.projectConfigFile=any-folder/generated/any-file.properties
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
index 782fd4e..e246f8c 100644
--- a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
@@ -9,6 +9,4 @@ sonar.binaries=target/classes
sonar.modules=module1
-module1.file=any-folder/any-file.properties
-module1.sonar.projectKey=com.foo.project.module1
-module1.sonar.projectName=Foo Module 1
+module1.sonar.projectConfigFile=any-folder/any-file.properties