@@ -101,7 +101,7 @@ class Conf { | |||
moduleProps = loadChildConfigFile(parentBaseDir, moduleProps, module); | |||
// the child project may have children as well | |||
loadModulesProperties(moduleProps, projectProps, module + "."); | |||
loadModulesProperties(moduleProps, projectProps, prefix + module + "."); | |||
// and finally add this child properties to global props | |||
merge(projectProps, prefix, module, moduleProps); | |||
} |
@@ -100,8 +100,12 @@ public class ConfTest { | |||
assertThat(properties.getProperty("1.sonar.projectName")).isEqualTo("Module 1"); | |||
assertThat(properties.getProperty("1.11.sonar.projectName")).isEqualTo("Module 11"); | |||
assertThat(properties.getProperty("1.11.111.sonar.projectName")).isEqualTo("Module 111"); | |||
assertThat(properties.getProperty("1.12.sonar.projectName")).isEqualTo("Module 12"); | |||
assertThat(properties.getProperty("2.sonar.projectName")).isEqualTo("Module 2"); | |||
// SONARUNNER-125 | |||
assertThat(properties.getProperty("11.111.sonar.projectName")).isNull(); | |||
} | |||
@Test |
@@ -4,6 +4,12 @@ sonar.modules=1,2 | |||
1.sonar.modules=11,12 | |||
1.11.sonar.projectBaseDir=module11 | |||
1.11.sonar.projectName=Module 11 | |||
1.11.sonar.modules=111,112 | |||
1.11.111.sonar.projectBaseDir=module111 | |||
1.11.111.sonar.projectName=Module 111 | |||
1.11.112.sonar.projectBaseDir=module112 | |||
1.11.112.sonar.projectName=Module 112 | |||
1.12.sonar.projectBaseDir=module12 | |||
1.12.sonar.projectName=Module 12 | |||