SONARPLUGINS-3009 Use the new ProjectBootstrapper extension

2 files changed, 0 insertions, 682 deletions

diff --git a/sonar-runner-batch/src/test/java/org/sonar/runner/batch/ProjectReactorBuilderTest.java b/sonar-runner-batch/src/test/java/org/sonar/runner/batch/ProjectReactorBuilderTest.java
deleted file mode 100644
index a8db88b..0000000
--- a/sonar-runner-batch/src/test/java/org/sonar/runner/batch/ProjectReactorBuilderTest.java
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * Sonar Runner - Batch
- * Copyright (C) 2011 SonarSource
- * dev@sonar.codehaus.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.runner.batch;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
-import org.sonar.api.batch.bootstrap.ProjectReactor;
-import org.sonar.test.TestUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-public class ProjectReactorBuilderTest {
-
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
-  @Test
-  public void shouldDefineSimpleProject() throws IOException {
-    ProjectDefinition projectDefinition = loadProjectDefinition("simple-project");
-
-    assertThat(projectDefinition.getKey()).isEqualTo("com.foo.project");
-    assertThat(projectDefinition.getName()).isEqualTo("Foo Project");
-    assertThat(projectDefinition.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(projectDefinition.getDescription()).isEqualTo("Description of Foo Project");
-    assertThat(projectDefinition.getSourceDirs()).contains("sources");
-    assertThat(projectDefinition.getLibraries()).contains(TestUtils.getResource(this.getClass(), "simple-project/libs/lib2.txt").getAbsolutePath(),
-        TestUtils.getResource(this.getClass(), "simple-project/libs/lib2.txt").getAbsolutePath());
-  }
-
-  @Test
-  public void shouldDefineSimpleProjectWithDeprecatedProperties() throws IOException {
-    ProjectDefinition projectDefinition = loadProjectDefinition("simple-project-with-deprecated-props");
-
-    assertThat(projectDefinition.getSourceDirs()).contains("sources");
-    assertThat(projectDefinition.getLibraries()).contains(
-        TestUtils.getResource(this.getClass(), "simple-project-with-deprecated-props/libs/lib2.txt").getAbsolutePath(),
-        TestUtils.getResource(this.getClass(), "simple-project-with-deprecated-props/libs/lib2.txt").getAbsolutePath());
-  }
-
-  @Test
-  public void shouldFailIfUnexistingSourceDirectory() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'unexisting-source-dir' does not exist for 'com.foo.project' (base directory = "
-        + TestUtils.getResource(this.getClass(), "simple-project-with-unexisting-source-dir") + ")");
-
-    loadProjectDefinition("simple-project-with-unexisting-source-dir");
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithDefinitionsAllInRootProject() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-definitions-all-in-root");
-
-    // CHECK ROOT
-    assertThat(rootProject.getKey()).isEqualTo("com.foo.project");
-    assertThat(rootProject.getName()).isEqualTo("Foo Project");
-    assertThat(rootProject.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(rootProject.getDescription()).isEqualTo("Description of Foo Project");
-    // root project must not contain some properties - even if they are defined in the root properties file
-    assertThat(rootProject.getSourceDirs().contains("sources")).isFalse();
-    assertThat(rootProject.getTestDirs().contains("tests")).isFalse();
-    assertThat(rootProject.getBinaries().contains("target/classes")).isFalse();
-    // and module properties must have been cleaned
-    assertThat(rootProject.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(rootProject.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-    // Check baseDir and workDir
-    assertThat(rootProject.getBaseDir().getCanonicalFile())
-        .isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"));
-    assertThat(rootProject.getWorkDir().getCanonicalFile())
-        .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root"), ".sonar"));
-
-    // CHECK MODULES
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(2);
-
-    // Module 1
-    ProjectDefinition module1 = modules.get(0);
-    assertThat(module1.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root/module1"));
-    assertThat(module1.getKey()).isEqualTo("com.foo.project:module1");
-    assertThat(module1.getName()).isEqualTo("module1");
-    assertThat(module1.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    // Description should not be inherited from parent if not set
-    assertThat(module1.getDescription()).isNull();
-    assertThat(module1.getSourceDirs()).contains("sources");
-    assertThat(module1.getTestDirs()).contains("tests");
-    assertThat(module1.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module1.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module1.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-    // Check baseDir and workDir
-    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"));
-
-    // Module 2
-    ProjectDefinition module2 = modules.get(1);
-    assertThat(module2.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-all-in-root/module2"));
-    assertThat(module2.getKey()).isEqualTo("com.foo.project:com.foo.project.module2");
-    assertThat(module2.getName()).isEqualTo("Foo Module 2");
-    assertThat(module2.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(module2.getDescription()).isEqualTo("Description of Module 2");
-    assertThat(module2.getSourceDirs()).contains("src");
-    assertThat(module2.getTestDirs()).contains("tests");
-    assertThat(module2.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module2.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module2.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-    // Check baseDir and workDir
-    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"));
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithDefinitionsAllInEachModule() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-definitions-in-each-module");
-
-    // CHECK ROOT
-    assertThat(rootProject.getKey()).isEqualTo("com.foo.project");
-    assertThat(rootProject.getName()).isEqualTo("Foo Project");
-    assertThat(rootProject.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(rootProject.getDescription()).isEqualTo("Description of Foo Project");
-    // root project must not contain some properties - even if they are defined in the root properties file
-    assertThat(rootProject.getSourceDirs().contains("sources")).isFalse();
-    assertThat(rootProject.getTestDirs().contains("tests")).isFalse();
-    assertThat(rootProject.getBinaries().contains("target/classes")).isFalse();
-    // and module properties must have been cleaned
-    assertThat(rootProject.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(rootProject.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-
-    // CHECK MODULES
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(2);
-
-    // Module 1
-    ProjectDefinition module1 = modules.get(0);
-    assertThat(module1.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-in-each-module/module1"));
-    assertThat(module1.getKey()).isEqualTo("com.foo.project:com.foo.project.module1");
-    assertThat(module1.getName()).isEqualTo("Foo Module 1");
-    assertThat(module1.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    // Description should not be inherited from parent if not set
-    assertThat(module1.getDescription()).isEqualTo("Description of Module 1");
-    assertThat(module1.getSourceDirs()).contains("sources");
-    assertThat(module1.getTestDirs()).contains("tests");
-    assertThat(module1.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module1.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module1.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-
-    // Module 2
-    ProjectDefinition module2 = modules.get(1);
-    assertThat(module2.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-in-each-module/module2/newBaseDir"));
-    assertThat(module2.getKey()).isEqualTo("com.foo.project:com.foo.project.module2");
-    assertThat(module2.getName()).isEqualTo("Foo Module 2");
-    assertThat(module2.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(module2.getDescription()).isEqualTo("Description of Module 2");
-    assertThat(module2.getSourceDirs()).contains("src");
-    assertThat(module2.getTestDirs()).contains("tests");
-    assertThat(module2.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module2.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module2.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithDefinitionsModule1Inherited() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-definitions-in-each-module-inherited");
-
-    // CHECK ROOT
-    assertThat(rootProject.getKey()).isEqualTo("com.foo.project");
-    assertThat(rootProject.getName()).isEqualTo("Foo Project");
-    assertThat(rootProject.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(rootProject.getDescription()).isEqualTo("Description of Foo Project");
-    // root project must not contain some properties - even if they are defined in the root properties file
-    assertThat(rootProject.getSourceDirs().contains("sources")).isFalse();
-    assertThat(rootProject.getTestDirs().contains("tests")).isFalse();
-    assertThat(rootProject.getBinaries().contains("target/classes")).isFalse();
-    // and module properties must have been cleaned
-    assertThat(rootProject.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(rootProject.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-
-    // CHECK MODULES
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(2);
-
-    // Module 1
-    ProjectDefinition module1 = modules.get(0);
-    assertThat(module1.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-in-each-module-inherited/module1"));
-    assertThat(module1.getKey()).isEqualTo("com.foo.project:module1");
-    assertThat(module1.getName()).isEqualTo("module1");
-    assertThat(module1.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    // Description should not be inherited from parent if not set
-    assertThat(module1.getDescription()).isNull();
-    assertThat(module1.getSourceDirs()).contains("sources");
-    assertThat(module1.getTestDirs()).contains("tests");
-    assertThat(module1.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module1.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module1.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-
-    // Module 2
-    ProjectDefinition module2 = modules.get(1);
-    assertThat(module2.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-definitions-in-each-module-inherited/module2/newBaseDir"));
-    assertThat(module2.getKey()).isEqualTo("com.foo.project:com.foo.project.module2");
-    assertThat(module2.getName()).isEqualTo("Foo Module 2");
-    assertThat(module2.getVersion()).isEqualTo("1.0-SNAPSHOT");
-    assertThat(module2.getDescription()).isEqualTo("Description of Module 2");
-    assertThat(module2.getSourceDirs()).contains("src");
-    assertThat(module2.getTestDirs()).contains("tests");
-    assertThat(module2.getBinaries()).contains("target/classes");
-    // and module properties must have been cleaned
-    assertThat(module2.getProperties().getProperty("module1.sonar.projectKey")).isNull();
-    assertThat(module2.getProperties().getProperty("module2.sonar.projectKey")).isNull();
-  }
-
-  // SONARPLUGINS-2421
-  @Test
-  public void shouldDefineMultiLanguageProjectWithDefinitionsAllInRootProject() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-language-definitions-all-in-root");
-
-    // CHECK ROOT
-    assertThat(rootProject.getKey()).isEqualTo("example");
-    assertThat(rootProject.getName()).isEqualTo("Example");
-    assertThat(rootProject.getVersion()).isEqualTo("1.0");
-
-    // CHECK MODULES
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(2);
-
-    // Module 1
-    ProjectDefinition module1 = modules.get(0);
-    assertThat(module1.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-language-definitions-all-in-root"));
-    assertThat(module1.getSourceDirs()).contains("src/main/java");
-    // and module properties must have been cleaned
-    assertThat(module1.getWorkDir().getCanonicalFile())
-        .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-language-definitions-all-in-root"), ".sonar/example_java-module"));
-
-    // Module 2
-    ProjectDefinition module2 = modules.get(1);
-    assertThat(module2.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-language-definitions-all-in-root"));
-    assertThat(module2.getSourceDirs()).contains("src/main/groovy");
-    // and module properties must have been cleaned
-    assertThat(module2.getWorkDir().getCanonicalFile())
-        .isEqualTo(new File(TestUtils.getResource(this.getClass(), "multi-language-definitions-all-in-root"), ".sonar/example_groovy-module"));
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithBaseDir() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-with-basedir");
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(1);
-    assertThat(modules.get(0).getKey()).isEqualTo("com.foo.project:com.foo.project.module1");
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithConfigFile() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-with-configfile");
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(1);
-    ProjectDefinition module = modules.get(0);
-    assertThat(module.getKey()).isEqualTo("com.foo.project:com.foo.project.module1");
-    // verify the base directory that has been changed in this config file
-    assertThat(module.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-with-configfile/any-folder"));
-  }
-
-  @Test
-  public void shouldDefineMultiModuleProjectWithConfigFileAndOverwrittenBasedir() throws IOException {
-    ProjectDefinition rootProject = loadProjectDefinition("multi-module-with-configfile-and-overwritten-basedir");
-    List<ProjectDefinition> modules = rootProject.getSubProjects();
-    assertThat(modules.size()).isEqualTo(1);
-    ProjectDefinition module = modules.get(0);
-    assertThat(module.getKey()).isEqualTo("com.foo.project:com.foo.project.module1");
-    // verify the base directory that has been changed in this config file
-    assertThat(module.getBaseDir().getCanonicalFile()).isEqualTo(TestUtils.getResource(this.getClass(), "multi-module-with-configfile-and-overwritten-basedir/any-folder"));
-  }
-
-  @Test
-  public void shouldFailIfUnexistingModuleBaseDir() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The base directory of the module 'module1' does not exist: "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-unexisting-basedir").getAbsolutePath() + File.separator + "module1");
-
-    loadProjectDefinition("multi-module-with-unexisting-basedir");
-  }
-
-  @Test
-  public void shouldFailIfUnexistingModuleFile() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The properties file of the module 'module1' does not exist: "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-unexisting-file").getAbsolutePath() + File.separator + "any-folder"
-        + File.separator + "any-file.properties");
-
-    loadProjectDefinition("multi-module-with-unexisting-file");
-  }
-
-  @Test
-  public void shouldFailIfUnexistingSourceFolderInheritedInMultimodule() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'unexisting-source-dir' does not exist for 'com.foo.project:module1' (base directory = "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-unexisting-source-dir").getAbsolutePath() + File.separator + "module1)");
-
-    loadProjectDefinition("multi-module-with-unexisting-source-dir");
-  }
-
-  @Test
-  public void shouldNotFailIfUnexistingTestBinLibFolderInheritedInMultimodule() throws IOException {
-    loadProjectDefinition("multi-module-with-unexisting-test-bin-lib-dir");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnexistingTestFolder() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'tests' does not exist for 'com.foo.project' (base directory = "
-        + TestUtils.getResource(this.getClass(), "simple-project-with-unexisting-test-dir").getAbsolutePath());
-
-    loadProjectDefinition("simple-project-with-unexisting-test-dir");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnexistingBinaryFolder() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'bin' does not exist for 'com.foo.project' (base directory = "
-        + TestUtils.getResource(this.getClass(), "simple-project-with-unexisting-binary").getAbsolutePath());
-
-    loadProjectDefinition("simple-project-with-unexisting-binary");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnmatchingLibFolder() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("No files nor directories matching 'libs/*.txt' in directory "
-        + TestUtils.getResource(this.getClass(), "simple-project-with-unexisting-lib").getAbsolutePath());
-
-    loadProjectDefinition("simple-project-with-unexisting-lib");
-  }
-
-  @Test
-  public void shouldGetLibDirectory() throws IOException {
-    ProjectDefinition def = loadProjectDefinition("simple-project-with-lib-dir");
-    assertThat(def.getLibraries()).hasSize(1);
-    File libDir = new File(def.getLibraries().get(0));
-    assertThat(libDir).isDirectory().exists();
-    assertThat(libDir.getName()).isEqualTo("lib");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnexistingTestFolderOnModule() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'tests' does not exist for 'module1' (base directory = "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-explicit-unexisting-test-dir").getAbsolutePath() + File.separator + "module1)");
-
-    loadProjectDefinition("multi-module-with-explicit-unexisting-test-dir");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnexistingBinaryFolderOnModule() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("The folder 'bin' does not exist for 'module1' (base directory = "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-explicit-unexisting-binary-dir").getAbsolutePath() + File.separator + "module1)");
-
-    loadProjectDefinition("multi-module-with-explicit-unexisting-binary-dir");
-  }
-
-  @Test
-  public void shouldFailIfExplicitUnmatchingLibFolderOnModule() throws IOException {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("No files nor directories matching 'lib/*.jar' in directory "
-        + TestUtils.getResource(this.getClass(), "multi-module-with-explicit-unexisting-lib").getAbsolutePath() + File.separator + "module1");
-
-    loadProjectDefinition("multi-module-with-explicit-unexisting-lib");
-  }
-
-  @Test
-  public void shouldExtractModuleProperties() {
-    Properties props = new Properties();
-    props.setProperty("sources", "src/main/java");
-    props.setProperty("tests", "src/test/java");
-    props.setProperty("foo.sources", "src/main/java");
-    props.setProperty("foobar.tests", "src/test/java");
-    props.setProperty("foobar.binaries", "target/classes");
-
-    Properties moduleProps = ProjectReactorBuilder.extractModuleProperties("bar", props);
-    assertThat(moduleProps.size()).isEqualTo(0);
-
-    moduleProps = ProjectReactorBuilder.extractModuleProperties("foo", props);
-    assertThat(moduleProps.size()).isEqualTo(1);
-    assertThat(moduleProps.get("sources")).isEqualTo("src/main/java");
-
-    moduleProps = ProjectReactorBuilder.extractModuleProperties("foobar", props);
-    assertThat(moduleProps.size()).isEqualTo(2);
-    assertThat(moduleProps.get("tests")).isEqualTo("src/test/java");
-    assertThat(moduleProps.get("binaries")).isEqualTo("target/classes");
-  }
-
-  @Test
-  public void shouldFailIfMandatoryPropertiesAreNotPresent() {
-    Properties props = new Properties();
-    props.setProperty("foo1", "bla");
-    props.setProperty("foo4", "bla");
-
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("You must define the following mandatory properties for 'Unknown': foo2, foo3");
-
-    ProjectReactorBuilder.checkMandatoryProperties(props, new String[]{"foo1", "foo2", "foo3"});
-  }
-
-  @Test
-  public void shouldFailIfMandatoryPropertiesAreNotPresentButWithProjectKey() {
-    Properties props = new Properties();
-    props.setProperty("foo1", "bla");
-    props.setProperty("sonar.projectKey", "my-project");
-
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("You must define the following mandatory properties for 'my-project': foo2, foo3");
-
-    ProjectReactorBuilder.checkMandatoryProperties(props, new String[]{"foo1", "foo2", "foo3"});
-  }
-
-  @Test
-  public void shouldNotFailIfMandatoryPropertiesArePresent() {
-    Properties props = new Properties();
-    props.setProperty("foo1", "bla");
-    props.setProperty("foo4", "bla");
-
-    ProjectReactorBuilder.checkMandatoryProperties(props, new String[]{"foo1"});
-
-    // No exception should be thrown
-  }
-
-  @Test
-  public void shouldFilterFiles() throws Exception {
-    File baseDir = TestUtils.getResource(this.getClass(), "shouldFilterFiles");
-    assertThat(ProjectReactorBuilder.getLibraries(baseDir, "in*.txt")).hasSize(1);
-    assertThat(ProjectReactorBuilder.getLibraries(baseDir, "*.txt")).hasSize(2);
-    assertThat(ProjectReactorBuilder.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/in*.txt")).hasSize(1);
-    assertThat(ProjectReactorBuilder.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/*.txt")).hasSize(2);
-  }
-
-  @Test
-  public void shouldWorkWithAbsolutePath() throws Exception {
-    File baseDir = new File("not-exists");
-    String absolutePattern = TestUtils.getResource(this.getClass(), "shouldFilterFiles").getAbsolutePath() + "/in*.txt";
-    assertThat(ProjectReactorBuilder.getLibraries(baseDir.getParentFile(), absolutePattern)).hasSize(1);
-  }
-
-  @Test
-  public void shouldGetRelativeFile() {
-    assertThat(ProjectReactorBuilder.getFileFromPath("shouldGetFile/foo.properties", TestUtils.getResource(this.getClass(), "/")))
-        .isEqualTo(TestUtils.getResource(this.getClass(), "shouldGetFile/foo.properties"));
-  }
-
-  @Test
-  public void shouldGetAbsoluteFile() {
-    File file = TestUtils.getResource(this.getClass(), "shouldGetFile/foo.properties");
-
-    assertThat(ProjectReactorBuilder.getFileFromPath(file.getAbsolutePath(), TestUtils.getResource(this.getClass(), "/")))
-        .isEqualTo(file);
-  }
-
-  @Test
-  public void shouldMergeParentProperties() {
-    Properties parentProps = new Properties();
-    parentProps.setProperty("toBeMergeProps", "fooParent");
-    parentProps.setProperty("existingChildProp", "barParent");
-    parentProps.setProperty("sonar.modules", "mod1,mod2");
-    parentProps.setProperty("sonar.projectDescription", "Desc from Parent");
-    parentProps.setProperty("mod1.sonar.projectDescription", "Desc for Mod1");
-    parentProps.setProperty("mod2.sonar.projectkey", "Key for Mod2");
-
-    Properties childProps = new Properties();
-    childProps.setProperty("existingChildProp", "barChild");
-    childProps.setProperty("otherProp", "tutuChild");
-
-    ProjectReactorBuilder.mergeParentProperties(childProps, parentProps);
-
-    assertThat(childProps.size()).isEqualTo(3);
-    assertThat(childProps.getProperty("toBeMergeProps")).isEqualTo("fooParent");
-    assertThat(childProps.getProperty("existingChildProp")).isEqualTo("barChild");
-    assertThat(childProps.getProperty("otherProp")).isEqualTo("tutuChild");
-    assertThat(childProps.getProperty("sonar.modules")).isNull();
-    assertThat(childProps.getProperty("sonar.projectDescription")).isNull();
-    assertThat(childProps.getProperty("mod1.sonar.projectDescription")).isNull();
-    assertThat(childProps.getProperty("mod2.sonar.projectkey")).isNull();
-  }
-
-  @Test
-  public void shouldInitRootWorkDir() {
-    ProjectReactorBuilder builder = new ProjectReactorBuilder(new Properties());
-    File baseDir = new File("target/tmp/baseDir");
-
-    File workDir = builder.initRootProjectWorkDir(baseDir);
-
-    assertThat(workDir).isEqualTo(new File(baseDir, ".sonar"));
-  }
-
-  @Test
-  public void shouldInitWorkDirWithCustomRelativeFolder() {
-    Properties properties = new Properties();
-    properties.put("sonar.working.directory", ".foo");
-    ProjectReactorBuilder builder = new ProjectReactorBuilder(properties);
-    File baseDir = new File("target/tmp/baseDir");
-
-    File workDir = builder.initRootProjectWorkDir(baseDir);
-
-    assertThat(workDir).isEqualTo(new File(baseDir, ".foo"));
-  }
-
-  @Test
-  public void shouldInitRootWorkDirWithCustomAbsoluteFolder() {
-    Properties properties = new Properties();
-    properties.put("sonar.working.directory", new File("src").getAbsolutePath());
-    ProjectReactorBuilder builder = new ProjectReactorBuilder(properties);
-    File baseDir = new File("target/tmp/baseDir");
-
-    File workDir = builder.initRootProjectWorkDir(baseDir);
-
-    assertThat(workDir).isEqualTo(new File("src").getAbsoluteFile());
-  }
-
-  @Test
-  public void shouldReturnPrefixedKey() {
-    Properties props = new Properties();
-    props.put("sonar.projectKey", "my-module-key");
-
-    ProjectReactorBuilder.prefixProjectKeyWithParentKey(props, "my-parent-key");
-    assertThat(props.getProperty("sonar.projectKey")).isEqualTo("my-parent-key:my-module-key");
-  }
-
-  @Test
-  public void shouldFailIf2ModulesWithSameKey() {
-    Properties props = new Properties();
-    props.put("sonar.projectKey", "root");
-    ProjectDefinition root = ProjectDefinition.create().setProperties(props);
-
-    Properties props1 = new Properties();
-    props1.put("sonar.projectKey", "mod1");
-    root.addSubProject(ProjectDefinition.create().setProperties(props1));
-
-    // Check uniqueness of a new module: OK
-    Properties props2 = new Properties();
-    props2.put("sonar.projectKey", "mod2");
-    ProjectDefinition mod2 = ProjectDefinition.create().setProperties(props2);
-    ProjectReactorBuilder.checkUniquenessOfChildKey(mod2, root);
-
-    // Now, add it and check again
-    root.addSubProject(mod2);
-
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("Project 'root' can't have 2 modules with the following key: mod2");
-
-    ProjectReactorBuilder.checkUniquenessOfChildKey(mod2, root);
-  }
-
-  @Test
-  public void shouldSetProjectKeyIfNotPresent() {
-    Properties props = new Properties();
-    props.put("sonar.projectVersion", "1.0");
-
-    // should be set
-    ProjectReactorBuilder.setProjectKeyAndNameIfNotDefined(props, "foo");
-    assertThat(props.getProperty("sonar.projectKey")).isEqualTo("foo");
-    assertThat(props.getProperty("sonar.projectName")).isEqualTo("foo");
-
-    // but not this 2nd time
-    ProjectReactorBuilder.setProjectKeyAndNameIfNotDefined(props, "bar");
-    assertThat(props.getProperty("sonar.projectKey")).isEqualTo("foo");
-    assertThat(props.getProperty("sonar.projectName")).isEqualTo("foo");
-  }
-
-  @Test
-  public void shouldFailToLoadPropertiesFile() throws Exception {
-    thrown.expect(IllegalStateException.class);
-    thrown.expectMessage("Impossible to read the property file");
-
-    ProjectReactorBuilder.toProperties(new File("foo.properties"));
-  }
-
-  private ProjectDefinition loadProjectDefinition(String projectFolder) throws IOException {
-    Properties props = ProjectReactorBuilder.toProperties(TestUtils.getResource(this.getClass(), projectFolder + "/sonar-project.properties"));
-    props.put("sonar.projectBaseDir", TestUtils.getResource(this.getClass(), projectFolder).getAbsolutePath());
-    ProjectReactor projectReactor = new ProjectReactorBuilder(props).build();
-    return projectReactor.getRoot();
-  }
-
-}
diff --git a/sonar-runner-batch/src/test/java/org/sonar/runner/batch/UtilsTest.java b/sonar-runner-batch/src/test/java/org/sonar/runner/batch/UtilsTest.java
deleted file mode 100644
index 21959d5..0000000
--- a/sonar-runner-batch/src/test/java/org/sonar/runner/batch/UtilsTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Sonar Runner - Batch
- * Copyright (C) 2011 SonarSource
- * dev@sonar.codehaus.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
- */
-package org.sonar.runner.batch;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.sonar.test.TestUtils;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-public class UtilsTest {
-
-  @Test
-  public void shouldGetList() {
-    Properties props = new Properties();
-
-    props.put("prop", "  foo  ,  bar  , \n\ntoto,tutu");
-    assertThat(Utils.getListFromProperty(props, "prop")).containsOnly("foo", "bar", "toto", "tutu");
-  }
-//
-//  @Test
-//  public void test_props() {
-//    Properties p1 = new Properties();
-//    p1.setProperty("foo", "bar");
-//    Properties p2 = new Properties();
-//    p2.putAll(p1);
-//    assertThat(p2.getProperty("foo")).isEqualTo("bar");
-//  }
-
-  @Test
-  public void shouldGetListFromFile() throws IOException {
-    String filePath = "shouldGetList/foo.properties";
-    Properties props = loadPropsFromFile(filePath);
-
-    assertThat(Utils.getListFromProperty(props, "prop")).containsOnly("foo", "bar", "toto", "tutu");
-  }
-
-  private Properties loadPropsFromFile(String filePath) throws IOException {
-    Properties props = new Properties();
-    FileInputStream fileInputStream = null;
-    try {
-      fileInputStream = new FileInputStream(TestUtils.getResource(this.getClass(), filePath));
-      props.load(fileInputStream);
-    } finally {
-      IOUtils.closeQuietly(fileInputStream);
-    }
-    return props;
-  }
-
-}