SONAR-4282 Fix problem when returning issues when componentRoots is a module

18 files changed, 55 insertions, 46 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
index 1c01caa8b39..b3745c615f6 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java
@@ -50,7 +50,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     IssueDto issue = dao.selectByKey("ABCDE");
     assertThat(issue.getKee()).isEqualTo("ABCDE");
     assertThat(issue.getId()).isEqualTo(100L);
-    assertThat(issue.getResourceId()).isEqualTo(400);
+    assertThat(issue.getResourceId()).isEqualTo(401);
     assertThat(issue.getRuleId()).isEqualTo(500);
     assertThat(issue.getSeverity()).isEqualTo("BLOCKER");
     assertThat(issue.isManualSeverity()).isFalse();
@@ -133,6 +133,12 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     assertThat(issues.get(0).getId()).isEqualTo(100);
     assertThat(issues.get(1).getId()).isEqualTo(101);
 
+    query = IssueQuery.builder().componentRoots(newArrayList("struts-core")).build();
+    issues = newArrayList(dao.select(query));
+    assertThat(issues).hasSize(2);
+    assertThat(issues.get(0).getId()).isEqualTo(100);
+    assertThat(issues.get(1).getId()).isEqualTo(101);
+
     query = IssueQuery.builder().componentRoots(newArrayList("Filter.java")).build();
     issues = newArrayList(dao.select(query));
     assertThat(issues).hasSize(1);
@@ -241,7 +247,7 @@ public class IssueDaoTest extends AbstractDaoTestCase {
   public void should_select_open_issues() {
     setupData("shared", "should_select_open_issues");
 
-    List<IssueDto> dtos = dao.selectOpenIssues(399);
+    List<IssueDto> dtos = dao.selectOpenIssues(400);
     assertThat(dtos).hasSize(2);
 
     IssueDto issue = dtos.get(0);
diff --git a/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java b/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
index 2e06d57a703..5f9df88773d 100644
--- a/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/persistence/DryRunDatabaseFactoryTest.java
@@ -105,7 +105,7 @@ public class DryRunDatabaseFactoryTest extends AbstractDaoTestCase {
     byte[] database = localDatabaseFactory.createDatabaseForDryRun(399L);
     dataSource = createDatabase(database);
 
-    assertThat(rowCount("issues")).isEqualTo(2);
+    assertThat(rowCount("issues")).isEqualTo(1);
   }
 
   private BasicDataSource createDatabase(byte[] db) throws IOException {
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml
index 6ec982ab3de..301173c9c23 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/shared.xml
@@ -1,11 +1,14 @@
 <dataset>
 
-  <projects id="399" kee="struts" root_id="[null]" />
-  <projects id="400" kee="Action.java" root_id="399" />
-  <projects id="401" kee="Filter.java" root_id="399"/>
-  <snapshots id="100" project_id="399" root_snapshot_id="[null]" path="" islast="[true]" />
-  <snapshots id="101" project_id="400" root_snapshot_id="100" path="100." islast="[true]" />
-  <snapshots id="102" project_id="401" root_snapshot_id="100" path="100." islast="[true]" />
+  <projects id="399" kee="struts" root_id="[null]" qualifier="TRK" />
+  <projects id="400" kee="struts-core" root_id="399" qualifier="BRC" />
+  <projects id="401" kee="Action.java" root_id="400" qualifier="CLA" />
+  <projects id="402" kee="Filter.java" root_id="400" qualifier="CLA" />
+
+  <snapshots id="100" project_id="399" root_snapshot_id="[null]" parent_snapshot_id="[null]" root_project_id="399" path="" islast="[true]" />
+  <snapshots id="101" project_id="400" root_snapshot_id="100" parent_snapshot_id="100" root_project_id="399" path="100." islast="[true]" />
+  <snapshots id="102" project_id="401" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" />
+  <snapshots id="103" project_id="402" root_snapshot_id="100" parent_snapshot_id="101" root_project_id="399" path="100.101." islast="[true]" />
 
   <rules id="500" plugin_rule_key="AvoidCycle" plugin_name="squid" />
   <rules id="501" plugin_rule_key="NullRef" plugin_name="squid" />
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
index b4bd5440f19..0472f446673 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_all.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
index 51e11ba1f9a..6d0dcd710cf 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_action_plans.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       action_plan_key="DEF"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
index 11a1b1e6c0b..619c809b1f6 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_assigned.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
index a55ab8c6142..18cbee8d9f3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_component_root.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="100"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,7 +28,7 @@
   <issues
       id="101"
       kee="101"
-      resource_id="401"
+      resource_id="402"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
index 79562aa6c38..aadb69260a3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_date_creation.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,7 +28,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
index b96e48f1db9..4b011292686 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_ids.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
index 8b3367cd6f0..b1b095f894d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_key.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
index 5a4939b9bfb..8ea59a28bcb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_planned.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDF"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       action_plan_key="ABC"
       severity="BLOCKER"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDG"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       action_plan_key="[null]"
       severity="BLOCKER"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
index 29750932d6e..14c5331fe64 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_query.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
index f3eddd896cc..4719a57f140 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_resolved.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,7 +28,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -53,7 +53,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
index 1c355d2a550..b5efd1e4c80 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_by_rules.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
index b4bd5440f19..0472f446673 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_issue_and_component_ids.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
index 59b4add50ba..2ffade23dfb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_open_issues.xml
@@ -3,7 +3,7 @@
   <issues
       id="100"
       kee="100"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -28,7 +28,7 @@
   <issues
       id="101"
       kee="101"
-      resource_id="401"
+      resource_id="402"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
@@ -53,7 +53,7 @@
   <issues
       id="102"
       kee="102"
-      resource_id="401"
+      resource_id="402"
       rule_id="501"
       severity="MAJOR"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
index 7c3272bc171..7deccb78596 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/should_select_returned_sorted_result.xml
@@ -4,7 +4,7 @@
   <issues
       id="100"
       kee="ABCDE-1"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -29,7 +29,7 @@
   <issues
       id="101"
       kee="ABCDE-2"
-      resource_id="400"
+      resource_id="401"
       rule_id="500"
       severity="BLOCKER"
       manual_severity="[false]"
@@ -56,7 +56,7 @@
   <issues
       id="102"
       kee="ABCDE-3"
-      resource_id="400"
+      resource_id="401"
       rule_id="501"
       severity="BLOCKER"
       manual_severity="[false]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
index 1a8e204b301..3fbe34f7efa 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/DryRunDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -54,7 +54,7 @@
       description="[null]"
       line="120"
       effort_to_fix="[null]"
-      status="OPEN"
+      status="CLOSED"
       resolution="FIXED"
       checksum="[null]"
       user_login="[null]"