aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2015-09-25 11:02:12 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2015-09-25 14:08:48 +0200
commit2e24cfd57b9ffa406a95018f23bc5034567a761a (patch)
tree24ad11fd140be1d215657ea78088552353eac391 /it
parent6571831760ff04b098cdf8e6177fa4fff6f9fb11 (diff)
downloadsonarqube-2e24cfd57b9ffa406a95018f23bc5034567a761a.tar.gz
sonarqube-2e24cfd57b9ffa406a95018f23bc5034567a761a.zip
SONAR-6665 Fix StackOverflow error when analyzing project with several modules having same key
Diffstat (limited to 'it')
-rw-r--r--it/it-projects/batch/multi-module-repeated-names/modules/module1/module1/sources/Fake.java1
-rw-r--r--it/it-projects/batch/multi-module-repeated-names/modules/module1/sources/Fake.java1
-rw-r--r--it/it-projects/batch/multi-module-repeated-names/sonar-project.properties19
-rw-r--r--it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java21
4 files changed, 3 insertions, 39 deletions
diff --git a/it/it-projects/batch/multi-module-repeated-names/modules/module1/module1/sources/Fake.java b/it/it-projects/batch/multi-module-repeated-names/modules/module1/module1/sources/Fake.java
deleted file mode 100644
index e67004defc5..00000000000
--- a/it/it-projects/batch/multi-module-repeated-names/modules/module1/module1/sources/Fake.java
+++ /dev/null
@@ -1 +0,0 @@
-class Fake {}
diff --git a/it/it-projects/batch/multi-module-repeated-names/modules/module1/sources/Fake.java b/it/it-projects/batch/multi-module-repeated-names/modules/module1/sources/Fake.java
deleted file mode 100644
index e67004defc5..00000000000
--- a/it/it-projects/batch/multi-module-repeated-names/modules/module1/sources/Fake.java
+++ /dev/null
@@ -1 +0,0 @@
-class Fake {}
diff --git a/it/it-projects/batch/multi-module-repeated-names/sonar-project.properties b/it/it-projects/batch/multi-module-repeated-names/sonar-project.properties
deleted file mode 100644
index b1816be030b..00000000000
--- a/it/it-projects/batch/multi-module-repeated-names/sonar-project.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-sonar.projectKey=com.foo.project
-sonar.projectName=Foo Project
-sonar.projectVersion=1.0-SNAPSHOT
-sonar.projectDescription=Description of Foo Project
-
-sonar.sources=sources
-sonar.tests=tests
-sonar.binaries=target/classes
-
-sonar.modules=module1
-
-module1.sonar.projectBaseDir=modules/module1
-module1.sonar.projectKey=com.foo.project.module1
-module1.sonar.projectName=Foo Module 1
-module1.sonar.modules=module1
-
-module1.module1.sonar.projectBaseDir=module1
-module1.module1.sonar.projectKey=com.foo.project.module1.module1
-module1.module1.sonar.projectName=Foo Sub Module 1
diff --git a/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java b/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java
index 8dff64ce5fd..9728fc0a3d2 100644
--- a/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java
+++ b/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java
@@ -5,18 +5,15 @@
*/
package batch.suite;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.sonar.orchestrator.build.BuildFailureException;
-
-import com.sonar.orchestrator.build.SonarRunner;
-import util.ItUtils;
import com.sonar.orchestrator.Orchestrator;
import com.sonar.orchestrator.build.MavenBuild;
import org.junit.ClassRule;
import org.junit.Test;
import org.sonar.wsclient.services.Resource;
import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
/**
* Test the extension point org.sonar.api.batch.bootstrap.ProjectBuilder
@@ -47,18 +44,6 @@ public class ProjectBuilderTest {
assertThat(getResource("com.sonarsource.it.projects.batch:project-builder-module-b:src/IgnoredFile.java")).isNull();
}
- @Test
- // SONAR-6665
- public void errorSubModuleSameName() {
- SonarRunner build = SonarRunner.create(ItUtils.projectDir("batch/multi-module-repeated-names"));
-
- try {
- orchestrator.executeBuild(build);
- } catch (BuildFailureException e) {
- assertThat(e.getResult().getLogs()).contains("Two modules have the same id: module1");
- }
- }
-
private void checkProject() {
Resource project = getResource("com.sonarsource.it.projects.batch:project-builder");