diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2019-09-03 15:36:13 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2019-09-05 10:03:19 +0200 |
| commit | 3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8 (patch) | |
| tree | f3635ce9877ea9384b340d6f6adffee62b8d57ec /it | |
| parent | 7d253e8dc460e1858d5756211f0f16dafd724eae (diff) | |
| download | sonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.tar.gz sonar-scanner-cli-3091d1bb8bfdb695942afdac41a5fa7c79a8ebc8.zip | |
SQSCANNER-24 Always consider project.settings, if set
Diffstat (limited to 'it')
5 files changed, 23 insertions, 0 deletions
diff --git a/it/projects/override-project-settings-path/conf/sq-project.properties b/it/projects/override-project-settings-path/conf/sq-project.properties new file mode 100644 index 0000000..a3b76fd --- /dev/null +++ b/it/projects/override-project-settings-path/conf/sq-project.properties @@ -0,0 +1,4 @@ +sonar.projectKey=sample-with-custom-settings-path +sonar.projectName=Test with custom settings location + +sonar.sources=src diff --git a/it/projects/override-project-settings-path/sonar-project.properties b/it/projects/override-project-settings-path/sonar-project.properties new file mode 100644 index 0000000..bd982e4 --- /dev/null +++ b/it/projects/override-project-settings-path/sonar-project.properties @@ -0,0 +1,4 @@ +sonar.projectKey=sample-should-be-ignored +sonar.projectName=Should be ignored + +sonar.sources=src diff --git a/it/projects/override-project-settings-path/src/basic/Hello.js b/it/projects/override-project-settings-path/src/basic/Hello.js new file mode 100644 index 0000000..fd35455 --- /dev/null +++ b/it/projects/override-project-settings-path/src/basic/Hello.js @@ -0,0 +1,2 @@ +function hello() { +} diff --git a/it/projects/override-project-settings-path/src/basic/World.js b/it/projects/override-project-settings-path/src/basic/World.js new file mode 100644 index 0000000..1ea849a --- /dev/null +++ b/it/projects/override-project-settings-path/src/basic/World.js @@ -0,0 +1,2 @@ +function world() { +} diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java index f003df2..c0c2875 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java @@ -198,4 +198,15 @@ public class ScannerTest extends ScannerTestCase { assertThat(logs).containsPattern("Too small (initial|maximum) heap"); } + // SQSCANNER-24 + @Test + public void should_override_project_settings_path() { + File projectHome = new File("projects/override-project-settings-path"); + SonarScanner build = newScanner(projectHome) + .setProperty("project.settings", new File(projectHome, "conf/sq-project.properties").getAbsolutePath()); + orchestrator.executeBuild(build); + + assertThat(getComponent("sample-with-custom-settings-path").getName()).isEqualTo("Test with custom settings location"); + } + } |