SONARPLUGINS-2202 Add multi-module support

20 files changed, 417 insertions, 49 deletions

diff --git a/src/test/java/org/sonar/runner/LauncherTest.java b/src/test/java/org/sonar/runner/LauncherTest.java
index 515daa1..0cec5f5 100644
--- a/src/test/java/org/sonar/runner/LauncherTest.java
+++ b/src/test/java/org/sonar/runner/LauncherTest.java
@@ -22,61 +22,12 @@ package org.sonar.runner;
 import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.junit.Test;
-import org.sonar.api.batch.bootstrap.ProjectDefinition;
-
-import java.io.File;
-import java.util.Properties;
 
 import static org.fest.assertions.Assertions.assertThat;
-import static org.junit.Assert.fail;
 
 public class LauncherTest {
 
   @Test
-  public void shouldFilterFiles() throws Exception {
-    File baseDir = new File(getClass().getResource("/org/sonar/runner/LauncherTest/shouldFilterFiles/").toURI());
-    assertThat(Launcher.getLibraries(baseDir, "in*.txt").length).isEqualTo(1);
-    assertThat(Launcher.getLibraries(baseDir, "*.txt").length).isEqualTo(2);
-    assertThat(Launcher.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/in*.txt").length).isEqualTo(1);
-    assertThat(Launcher.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/*.txt").length).isEqualTo(2);
-  }
-
-  @Test
-  public void shouldWorkWithAbsolutePath() throws Exception {
-    File baseDir = new File("not-exists");
-    String absolutePattern = new File(getClass().getResource("/org/sonar/runner/LauncherTest/shouldFilterFiles/").toURI()).getAbsolutePath() + "/in*.txt";
-    assertThat(Launcher.getLibraries(baseDir.getParentFile(), absolutePattern).length).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldThrowExceptionWhenNoFilesMatchingPattern() throws Exception {
-    File baseDir = new File(getClass().getResource("/org/sonar/runner/LauncherTest/shouldFilterFiles/").toURI());
-    try {
-      Launcher.getLibraries(baseDir, "*.jar");
-      fail("Exception expected");
-    } catch (RunnerException e) {
-      assertThat(e.getMessage()).contains("No files matching pattern \"*.jar\" in directory");
-    }
-  }
-
-  @Test
-  public void shouldDefineProject() {
-    Properties conf = new Properties();
-    conf.setProperty("sources", "src/main/java");
-    conf.setProperty("tests", "src/test/java");
-    conf.setProperty("binaries", "target/classes");
-    conf.setProperty("libraries", "./*.xml");
-    Runner runner = Runner.create(conf);
-
-    Launcher launcher = new Launcher(runner);
-    ProjectDefinition projectDefinition = launcher.defineProject();
-    assertThat(projectDefinition.getSourceDirs()).contains("src/main/java");
-    assertThat(projectDefinition.getTestDirs()).contains("src/test/java");
-    assertThat(projectDefinition.getBinaries()).contains("target/classes");
-    assertThat(projectDefinition.getLibraries()).contains(new File("assembly.xml").getAbsolutePath(), new File("pom.xml").getAbsolutePath());
-  }
-
-  @Test
   public void testGetSqlLevel() throws Exception {
     Configuration conf = new BaseConfiguration();
 
diff --git a/src/test/java/org/sonar/runner/model/SonarProjectBuilderTest.java b/src/test/java/org/sonar/runner/model/SonarProjectBuilderTest.java
new file mode 100644
index 0000000..931e535
--- /dev/null
+++ b/src/test/java/org/sonar/runner/model/SonarProjectBuilderTest.java
@@ -0,0 +1,316 @@
+/*
+ * Sonar Standalone Runner
+ * 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.model;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.api.batch.bootstrap.ProjectDefinition;
+import org.sonar.runner.RunnerException;
+import org.sonar.test.TestUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+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 SonarProjectBuilderTest {
+
+  @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.getTestDirs()).contains("tests");
+    assertThat(projectDefinition.getBinaries()).contains("target/classes");
+    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 shouldDefineMultiModuleProject() throws IOException {
+    ProjectDefinition rootProject = loadProjectDefinition("multi-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();
+
+    // CHECK MODULES
+    List<ProjectDefinition> modules = rootProject.getSubProjects();
+    assertThat(modules.size()).isEqualTo(2);
+
+    // Module 1
+    ProjectDefinition module1 = modules.get(0);
+    assertThat(module1.getKey()).isEqualTo("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()).isNull();
+    assertThat(module1.getSourceDirs()).contains("sources");
+    assertThat(module1.getTestDirs()).contains("tests");
+    assertThat(module1.getBinaries()).contains("target/classes");
+
+    // Module 2
+    ProjectDefinition module2 = modules.get(1);
+    assertThat(module2.getKey()).isEqualTo("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");
+  }
+
+  @Test
+  public void shouldDefineMultiModuleProjectWithPath() throws IOException {
+    ProjectDefinition rootProject = loadProjectDefinition("multi-module-with-path");
+    List<ProjectDefinition> modules = rootProject.getSubProjects();
+    assertThat(modules.size()).isEqualTo(1);
+    assertThat(modules.get(0).getKey()).isEqualTo("com.foo.project.module1");
+  }
+
+  @Test
+  public void shouldDefineMultiModuleProjectWithFile() throws IOException {
+    ProjectDefinition rootProject = loadProjectDefinition("multi-module-with-file");
+    List<ProjectDefinition> modules = rootProject.getSubProjects();
+    assertThat(modules.size()).isEqualTo(1);
+    assertThat(modules.get(0).getKey()).isEqualTo("com.foo.project.module1");
+  }
+
+  @Test
+  public void shouldFailIfUnexistingModuleBaseDir() throws IOException {
+    thrown.expect(RunnerException.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(RunnerException.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 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 = SonarProjectBuilder.extractModuleProperties("bar", props);
+    assertThat(moduleProps.size()).isEqualTo(0);
+
+    moduleProps = SonarProjectBuilder.extractModuleProperties("foo", props);
+    assertThat(moduleProps.size()).isEqualTo(1);
+    assertThat(moduleProps.get("sources")).isEqualTo("src/main/java");
+
+    moduleProps = SonarProjectBuilder.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("sources", "src/main/java");
+    props.setProperty("tests", "src/test/java");
+
+    thrown.expect(RunnerException.class);
+    thrown.expectMessage("You must define the following mandatory properties for 'foo': sonar.projectKey, sonar.projectName");
+
+    SonarProjectBuilder.checkMandatoryProperties("foo", props, new String[] {"sonar.projectKey", "sonar.projectName", "sources"});
+  }
+
+  @Test
+  public void shouldNotFailIfMandatoryPropertiesArePresent() {
+    Properties props = new Properties();
+    props.setProperty("sources", "src/main/java");
+    props.setProperty("tests", "src/test/java");
+
+    SonarProjectBuilder.checkMandatoryProperties("foo", props, new String[] {"sources"});
+
+    // No exception should be thrown
+  }
+
+  @Test
+  public void shouldFilterFiles() throws Exception {
+    File baseDir = TestUtils.getResource(this.getClass(), "shouldFilterFiles");
+    assertThat(SonarProjectBuilder.getLibraries(baseDir, "in*.txt").length).isEqualTo(1);
+    assertThat(SonarProjectBuilder.getLibraries(baseDir, "*.txt").length).isEqualTo(2);
+    assertThat(SonarProjectBuilder.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/in*.txt").length).isEqualTo(1);
+    assertThat(SonarProjectBuilder.getLibraries(baseDir.getParentFile(), "shouldFilterFiles/*.txt").length).isEqualTo(2);
+  }
+
+  @Test
+  public void shouldWorkWithAbsolutePath() throws Exception {
+    File baseDir = new File("not-exists");
+    String absolutePattern = TestUtils.getResource(this.getClass(), "shouldFilterFiles").getAbsolutePath() + "/in*.txt";
+    assertThat(SonarProjectBuilder.getLibraries(baseDir.getParentFile(), absolutePattern).length).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldThrowExceptionWhenNoFilesMatchingPattern() throws Exception {
+    File baseDir = TestUtils.getResource(this.getClass(), "shouldFilterFiles");
+
+    thrown.expect(RunnerException.class);
+    thrown.expectMessage("No files matching pattern \"*.jar\" in directory");
+
+    SonarProjectBuilder.getLibraries(baseDir, "*.jar");
+  }
+
+  @Test
+  public void shouldGetList() {
+    Properties props = new Properties();
+
+    props.put("prop", "  foo  ,  bar  , \n\ntoto,tutu");
+    assertThat(SonarProjectBuilder.getListFromProperty(props, "prop")).containsOnly("foo", "bar", "toto", "tutu");
+  }
+
+  @Test
+  public void shouldGetListFromFile() throws IOException {
+    String filePath = "shouldGetList/foo.properties";
+    Properties props = loadPropsFromFile(filePath);
+
+    assertThat(SonarProjectBuilder.getListFromProperty(props, "prop")).containsOnly("foo", "bar", "toto", "tutu");
+  }
+
+  @Test
+  public void shouldGetRelativeFile() {
+    Properties props = new Properties();
+    props.put("path", "shouldGetFile/foo.properties");
+
+    assertThat(SonarProjectBuilder.getFileFromProperty(props, "path", TestUtils.getResource(this.getClass(), "/")))
+        .isEqualTo(TestUtils.getResource("org/sonar/runner/model/SonarProjectBuilderTest/shouldGetFile/foo.properties"));
+  }
+
+  @Test
+  public void shouldGetAbsoluteFile() {
+    File file = TestUtils.getResource("org/sonar/runner/model/SonarProjectBuilderTest/shouldGetFile/foo.properties");
+
+    Properties props = new Properties();
+    props.put("path", file.getAbsolutePath());
+
+    assertThat(SonarProjectBuilder.getFileFromProperty(props, "path", 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 fomr Parent");
+
+    Properties childProps = new Properties();
+    childProps.setProperty("existingChildProp", "barChild");
+    childProps.setProperty("otherProp", "tutuChild");
+
+    SonarProjectBuilder.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();
+  }
+
+  private ProjectDefinition loadProjectDefinition(String projectFolder) throws FileNotFoundException, IOException {
+    Properties props = loadPropsFromFile(projectFolder + "/sonar-project.properties");
+    ProjectDefinition projectDefinition = SonarProjectBuilder.create(TestUtils.getResource(this.getClass(), projectFolder), props)
+        .generateProjectDefinition();
+    return projectDefinition;
+  }
+
+  private Properties loadPropsFromFile(String filePath) throws FileNotFoundException, 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;
+  }
+
+  @Test
+  public void shouldInitWorkDir() {
+    SonarProjectBuilder builder = SonarProjectBuilder.create(null, new Properties());
+    File baseDir = new File("target/tmp/baseDir");
+
+    File workDir = builder.initWorkDir(baseDir);
+
+    assertThat(workDir).isEqualTo(new File(baseDir, ".sonar"));
+  }
+
+  @Test
+  public void shouldInitWorkDirWithCustomRelativeFolder() {
+    Properties properties = new Properties();
+    properties.put("sonar.working.directory", ".foo");
+    SonarProjectBuilder builder = SonarProjectBuilder.create(null, properties);
+    File baseDir = new File("target/tmp/baseDir");
+
+    File workDir = builder.initWorkDir(baseDir);
+
+    assertThat(workDir).isEqualTo(new File(baseDir, ".foo"));
+  }
+
+  @Test
+  public void shouldInitWorkDirWithCustomAbsoluteFolder() {
+    Properties properties = new Properties();
+    properties.put("sonar.working.directory", new File("src").getAbsolutePath());
+    SonarProjectBuilder builder = SonarProjectBuilder.create(null, properties);
+    File baseDir = new File("target/tmp/baseDir");
+
+    File workDir = builder.initWorkDir(baseDir);
+
+    assertThat(workDir).isEqualTo(new File("src").getAbsoluteFile());
+  }
+
+}
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-file/any-folder/any-file.properties
new file mode 100644
index 0000000..460d349
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/any-file.properties
@@ -0,0 +1,2 @@
+sonar.projectKey=com.foo.project.module1
+sonar.projectName=Foo Module 1
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-file/any-folder/sources/Fake.java
new file mode 100644
index 0000000..5967658
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/any-folder/sources/Fake.java
@@ -0,0 +1 @@
+Fake
\ No newline at end of file
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-file/sonar-project.properties
new file mode 100644
index 0000000..4c655a7
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-file/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+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
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-path/modules/module1/sources/Fake.java
new file mode 100644
index 0000000..5967658
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/modules/module1/sources/Fake.java
@@ -0,0 +1 @@
+Fake
\ No newline at end of file
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-path/sonar-project.properties
new file mode 100644
index 0000000..202de2e
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-path/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+binaries=target/classes
+
+sonar.modules=module1
+
+module1.path=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-unexisting-basedir/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
new file mode 100644
index 0000000..7249f0a
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-basedir/sonar-project.properties
@@ -0,0 +1,13 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+binaries=target/classes
+
+sonar.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-unexisting-file/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
new file mode 100644
index 0000000..4c655a7
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module-with-unexisting-file/sonar-project.properties
@@ -0,0 +1,14 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+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
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module1/sources/Fake.java b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module1/sources/Fake.java
new file mode 100644
index 0000000..5967658
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module1/sources/Fake.java
@@ -0,0 +1 @@
+Fake
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module2/src/Fake.java b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module2/src/Fake.java
new file mode 100644
index 0000000..5967658
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/module2/src/Fake.java
@@ -0,0 +1 @@
+Fake
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/sonar-project.properties
new file mode 100644
index 0000000..96eb03d
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/multi-module/sonar-project.properties
@@ -0,0 +1,20 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+binaries=target/classes
+
+sonar.modules=module1,\
+              module2
+
+module1.sonar.projectKey=com.foo.project.module1
+module1.sonar.projectName=Foo Module 1
+
+module2.sonar.projectKey=com.foo.project.module2
+module2.sonar.projectName=Foo Module 2
+# redefine some properties
+module2.sonar.projectDescription=Description of Module 2
+module2.sources=src
diff --git a/src/test/resources/org/sonar/runner/LauncherTest/shouldFilterFiles/exclude.txt b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt
index e69de29..e69de29 100644
--- a/src/test/resources/org/sonar/runner/LauncherTest/shouldFilterFiles/exclude.txt
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldFilterFiles/exclude.txt
diff --git a/src/test/resources/org/sonar/runner/LauncherTest/shouldFilterFiles/include.txt b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldFilterFiles/include.txt
index e69de29..e69de29 100644
--- a/src/test/resources/org/sonar/runner/LauncherTest/shouldFilterFiles/include.txt
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldFilterFiles/include.txt
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetFile/foo.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetFile/foo.properties
new file mode 100644
index 0000000..8fbb104
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetFile/foo.properties
@@ -0,0 +1,4 @@
+prop=  foo, bar, \
+toto,\
+\
+tutu,
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetList/foo.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetList/foo.properties
new file mode 100644
index 0000000..8fbb104
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/shouldGetList/foo.properties
@@ -0,0 +1,4 @@
+prop=  foo, bar, \
+toto,\
+\
+tutu,
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib1.txt b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib1.txt
new file mode 100644
index 0000000..81d4e95
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib1.txt
@@ -0,0 +1 @@
+lib1
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib2.txt b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib2.txt
new file mode 100644
index 0000000..7dacac0
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/libs/lib2.txt
@@ -0,0 +1 @@
+lib2
\ No newline at end of file
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sonar-project.properties b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sonar-project.properties
new file mode 100644
index 0000000..81bdf16
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sonar-project.properties
@@ -0,0 +1,9 @@
+sonar.projectKey=com.foo.project
+sonar.projectName=Foo Project
+sonar.projectVersion=1.0-SNAPSHOT
+sonar.projectDescription=Description of Foo Project
+
+sources=sources
+tests=tests
+binaries=target/classes
+libraries=libs/*.txt
diff --git a/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sources/Fake.java b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sources/Fake.java
new file mode 100644
index 0000000..5967658
--- /dev/null
+++ b/src/test/resources/org/sonar/runner/model/SonarProjectBuilderTest/simple-project/sources/Fake.java
@@ -0,0 +1 @@
+Fake
\ No newline at end of file