diff options
| author | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2012-09-13 18:25:31 +0200 |
|---|---|---|
| committer | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2012-09-13 18:25:31 +0200 |
| commit | fd146e021cc68228933abc9027021e0fea08843f (patch) | |
| tree | 79458ef2a87f01aa7688eb5ecb6c6550b8a90d9a | |
| parent | 4c9bf4c9306e7bcc4732092e4dee805bdae36077 (diff) | |
| download | sonar-scanner-cli-fd146e021cc68228933abc9027021e0fea08843f.tar.gz sonar-scanner-cli-fd146e021cc68228933abc9027021e0fea08843f.zip | |
SONARPLUGINS-2202 Clean the working dir name
| -rw-r--r-- | src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java index 30f1cb4..324bd15 100644 --- a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java +++ b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java @@ -156,7 +156,9 @@ public final class SonarProjectBuilder { @VisibleForTesting protected File initModuleWorkDir(Properties properties) { - return new File(rootProjectWorkDir, properties.getProperty(PROPERTY_PROJECT_KEY)); + String cleanKey = StringUtils.deleteWhitespace(properties.getProperty(PROPERTY_PROJECT_KEY)); + cleanKey = StringUtils.replace(cleanKey, ":", "_"); + return new File(rootProjectWorkDir, cleanKey); } private void defineChildren(ProjectDefinition parentProject) { diff --git a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java b/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java index 0fa56ee..c83889e 100644 --- a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java +++ b/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java @@ -119,7 +119,7 @@ public class SonarProjectBuilderTest { assertThat(module1.getBaseDir().getCanonicalFile()) .isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root/module1")); assertThat(module1.getWorkDir().getCanonicalFile()) - .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"), ".sonar/com.foo.project:module1")); + .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"), ".sonar/com.foo.project_module1")); // Module 2 ProjectDefinition module2 = modules.get(1); @@ -138,7 +138,7 @@ public class SonarProjectBuilderTest { assertThat(module2.getBaseDir().getCanonicalFile()) .isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root/module2")); assertThat(module2.getWorkDir().getCanonicalFile()) - .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"), ".sonar/com.foo.project:com.foo.project.module2")); + .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"), ".sonar/com.foo.project_com.foo.project.module2")); } @Test |