From 25e2f8689d3d6319f3305f737c570ac0eba7ea2f Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 27 Oct 2014 18:11:43 +0100
Subject: [PATCH] Add missing UUID in test files

---
 .../DuplicationDaoTest/shouldGetByHash.xml         | 12 ++++++------
 .../DuplicationDaoTest/shouldInsert-result.xml     |  2 +-
 .../DuplicationDaoTest/shouldInsert.xml            |  2 +-
 .../select_issue_changelog_by_module.xml           |  8 ++++----
 ...gelog_by_module_are_sorted_by_creation_date.xml |  2 +-
 .../multi-modules-with-issues.xml                  |  8 ++++----
 .../should_create_database.xml                     |  2 +-
 .../should_create_database_with_issues.xml         |  6 +++---
 .../delete_project_property-result.xml             |  6 +++---
 .../PropertiesDaoTest/delete_project_property.xml  |  6 +++---
 .../findNotificationSubscribers.xml                |  2 +-
 .../PropertiesDaoTest/selectProjectProperties.xml  |  6 +++---
 .../purge/PurgeDaoTest/shouldDeleteProject.xml     |  4 ++++
 .../db/ProjectQgateAssociationDaoTest/shared.xml   | 14 +++++++-------
 .../db/QualityProfileDaoTest/projects.xml          |  4 ++--
 15 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml
index 7ba08c9e761..703fde5aa35 100644
--- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldGetByHash.xml
@@ -2,26 +2,26 @@
 
   <snapshots id="1" project_id="1" status="P" islast="0" purge_status="[null]" />
   <snapshots id="2" project_id="1" status="P" islast="0" purge_status="[null]" />
-  <projects id="1" kee="bar-old" enabled="1" scope="FIL" qualifier="CLA" language="java" />
+  <projects id="1" uuid="1" kee="bar-old" enabled="1" scope="FIL" qualifier="CLA" language="java" />
 
   <snapshots id="3" project_id="2" status="P" islast="1" purge_status="[null]" />
   <snapshots id="4" project_id="2" status="P" islast="1" purge_status="[null]" />
-  <projects id="2" kee="bar-last" enabled="1" scope="FIL" qualifier="CLA" language="java" />
+  <projects id="2" uuid="2" kee="bar-last" enabled="1" scope="FIL" qualifier="CLA" language="java" />
 
   <snapshots id="5" project_id="3" status="P" islast="0" purge_status="[null]" />
   <snapshots id="6" project_id="3" status="P" islast="0" purge_status="[null]" />
-  <projects id="3" kee="foo-old" enabled="1" scope="FIL" qualifier="CLA" language="java" />
+  <projects id="3" uuid="3" kee="foo-old" enabled="1" scope="FIL" qualifier="CLA" language="java" />
 
   <snapshots id="7" project_id="4" status="P" islast="1" purge_status="[null]" />
   <snapshots id="8" project_id="4" status="P" islast="1" purge_status="[null]" />
-  <projects id="4" kee="foo-last" enabled="1" scope="FIL" qualifier="CLA" language="java" />
+  <projects id="4" uuid="4" kee="foo-last" enabled="1" scope="FIL" qualifier="CLA" language="java" />
 
   <snapshots id="9" project_id="5" status="U" islast="0" purge_status="[null]" />
   <snapshots id="10" project_id="5" status="U" islast="0" purge_status="[null]" />
-  <projects id="5" kee="foo" enabled="1" scope="FIL" qualifier="CLA" language="java" />
+  <projects id="5" uuid="5" kee="foo" enabled="1" scope="FIL" qualifier="CLA" language="java" />
 
   <snapshots id="11" project_id="6" purge_status="[null]" status="P" islast="1" />
-  <projects id="6" kee="baz" enabled="1" scope="FIL" qualifier="CLA" language="grvy" />
+  <projects id="6" uuid="6" kee="baz" enabled="1" scope="FIL" qualifier="CLA" language="grvy" />
 
   <!-- Old snapshot of another project -->
   <!-- bar-old -->
diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml
index 2a8f2bc4b79..ba0e8dbd0dc 100644
--- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert-result.xml
@@ -2,7 +2,7 @@
 
   <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0" />
   <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1" />
-  <projects id="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" />
+  <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" />
 
   <duplications_index id="1" project_snapshot_id="1" snapshot_id="2" hash="bb" index_in_file="0" start_line="1" end_line="2" />
 
diff --git a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml
index b6abdbd64a9..2fe14ea1f9a 100644
--- a/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/duplication/DuplicationDaoTest/shouldInsert.xml
@@ -2,6 +2,6 @@
 
   <snapshots purge_status="[null]" id="1" status="U" islast="0" project_id="0" />
   <snapshots purge_status="[null]" id="2" status="U" islast="0" project_id="1" />
-  <projects id="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" />
+  <projects id="1" uuid="1" kee="foo" enabled="1" scope="FIL" qualifier="CLA" />
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module.xml
index 205133a30f7..27bbb7806d2 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <projects id="399" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
-  <projects id="400" kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ" />
-  <projects id="401" kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ" />
-  <projects id="402" kee="Filter.java" root_id="400" qualifier="CLA" scope="PRJ" />
+  <projects id="399" uuid="1" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
+  <projects id="400" uuid="2" kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ" />
+  <projects id="401" uuid="3" kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ" />
+  <projects id="402" uuid="4" kee="Filter.java" root_id="400" qualifier="CLA" scope="PRJ" />
 
   <!-- Open Issue on a file -->
   <issues
diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module_are_sorted_by_creation_date.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module_are_sorted_by_creation_date.xml
index 330555cd7fd..9407812d437 100644
--- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module_are_sorted_by_creation_date.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/select_issue_changelog_by_module_are_sorted_by_creation_date.xml
@@ -1,6 +1,6 @@
 <dataset>
 
-  <projects id="399" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
+  <projects id="399" uuid="1" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
 
   <!-- Open Issue on a root module -->
   <issues
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml
index 66787c61fd8..8ec9c6a4e0e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/multi-modules-with-issues.xml
@@ -25,10 +25,10 @@
 
   <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs"/>
 
-  <projects id="300" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
-  <projects id="301" kee="struts-core" root_id="300" qualifier="BRC" scope="PRJ" />
-  <projects id="302" kee="struts-el" root_id="300" qualifier="BRC" scope="PRJ" />
-  <projects id="303" kee="Action.java" root_id="301" qualifier="CLA" scope="FIL" />
+  <projects id="300" uuid="A"  kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" />
+  <projects id="301" uuid="B" kee="struts-core" root_id="300" qualifier="BRC" scope="PRJ" />
+  <projects id="302" uuid="C" kee="struts-el" root_id="300" qualifier="BRC" scope="PRJ" />
+  <projects id="303" uuid="D" kee="Action.java" root_id="301" qualifier="CLA" scope="FIL" />
 
   <snapshots id="3000" project_id="300" root_project_id="300" root_snapshot_id="[null]" path="" islast="[true]"/>
   <snapshots id="3001" project_id="301" root_project_id="300" root_snapshot_id="3000" path="3000." islast="[true]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml
index abae88d3a70..13aee7d5de4 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database.xml
@@ -7,7 +7,7 @@
   <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs"/>
 
 
-  <projects id="123" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+  <projects id="123" uuid="A" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
             description="[null]" long_name="Apache Struts"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" created_at="2013-01-25 02:04:06.00"/>
 
diff --git a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml
index f9e4142991e..d2309a8c42e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/persistence/PreviewDatabaseFactoryTest/should_create_database_with_issues.xml
@@ -6,9 +6,9 @@
 
   <rules_profiles id="1" name="Sonar way with Findbugs" language="java" parent_kee="" kee="sonar_way_with_findbugs"/>
 
-  <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"/>
+  <projects id="399" uuid="A" kee="struts" root_id="[null]"/>
+  <projects id="400" uuid="B" kee="Action.java" root_id="399"/>
+  <projects id="401" uuid="C" 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]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml
index 00458094c34..0b889b14bb3 100644
--- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property-result.xml
@@ -16,7 +16,7 @@
 
   <properties id="7" prop_key="commonslang.one" text_value="one" resource_id="12" user_id="[null]"/>
 
-  <projects id="10" kee="org.struts:struts"/>
-  <projects id="11" kee="org.apache:commons-lang"/>
-  <projects id="12" kee="other"/>
+  <projects id="10" uuid="A" kee="org.struts:struts"/>
+  <projects id="11" uuid="B" kee="org.apache:commons-lang"/>
+  <projects id="12" uuid="C" kee="other"/>
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml
index 27c48034999..99bd75917c1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/delete_project_property.xml
@@ -16,7 +16,7 @@
 
   <properties id="7" prop_key="commonslang.one" text_value="one" resource_id="12" user_id="[null]"/>
 
-  <projects id="10" kee="org.struts:struts"/>
-  <projects id="11" kee="org.apache:commons-lang"/>
-  <projects id="12" kee="other"/>
+  <projects id="10" uuid="A" kee="org.struts:struts"/>
+  <projects id="11" uuid="B" kee="org.apache:commons-lang"/>
+  <projects id="12" uuid="C" kee="other"/>
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml
index 04042d7900c..78f7e4864dc 100644
--- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/findNotificationSubscribers.xml
@@ -10,7 +10,7 @@
       login="simon"
       />
 
-  <projects id="42" kee="org.apache:struts"/>
+  <projects id="42" uuid="A" kee="org.apache:struts"/>
 
   <properties
       id="1"
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml
index 27c48034999..99bd75917c1 100644
--- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/selectProjectProperties.xml
@@ -16,7 +16,7 @@
 
   <properties id="7" prop_key="commonslang.one" text_value="one" resource_id="12" user_id="[null]"/>
 
-  <projects id="10" kee="org.struts:struts"/>
-  <projects id="11" kee="org.apache:commons-lang"/>
-  <projects id="12" kee="other"/>
+  <projects id="10" uuid="A" kee="org.struts:struts"/>
+  <projects id="11" uuid="B" kee="org.apache:commons-lang"/>
+  <projects id="12" uuid="C" kee="other"/>
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 818b9318fb5..34b5391a7c2 100644
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -2,6 +2,7 @@
 
   <!-- root -->
   <projects id="1" enabled="[true]" root_id="[null]"
+            uuid="A" project_uuid="A" module_uuid="[null]" module_uuid_path="[null]"
             long_name="[null]" scope="PRJ" qualifier="TRK" kee="project" name="project"
             description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" />
 
@@ -47,6 +48,7 @@
 
   <!-- modules -->
   <projects id="2" enabled="[true]" root_id="1"
+            uuid="B" project_uuid="A" module_uuid="A" module_uuid_path="A"
             long_name="[null]" scope="PRJ" qualifier="BRC" kee="module1" name="module1"
             description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" />
 
@@ -63,6 +65,7 @@
 
 
   <projects id="3" enabled="[false]" root_id="1"
+            uuid="C" project_uuid="A" module_uuid="A" module_uuid_path="A"
             long_name="[null]" scope="PRJ" qualifier="BRC" kee="module2" name="module2"
             description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" />
 
@@ -79,6 +82,7 @@
 
   <!-- file of module 2-->
   <projects id="4" enabled="[false]" root_id="3"
+            uuid="D" project_uuid="A" module_uuid="C" module_uuid_path="A.C"
             long_name="[null]" scope="FIL" qualifier="FIL" kee="module2:File.java" name="File"
             description="[null]" language="java" copy_resource_id="[null]" person_id="[null]" authorization_updated_at="[null]" />
 
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml
index 9282a4c3bb6..811480c23cc 100644
--- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/ProjectQgateAssociationDaoTest/shared.xml
@@ -3,13 +3,13 @@
   <quality_gates id="42" name="Golden"/>
   <quality_gates id="43" name="Ninth"/>
 
-  <projects id="1" name="Project One" qualifier="TRK" scope="PRJ"/>
-  <projects id="2" name="Project Two" qualifier="TRK" scope="PRJ"/>
-  <projects id="3" name="Project Three" qualifier="TRK" scope="PRJ"/>
-  <projects id="4" name="Project Four" qualifier="TRK" scope="PRJ"/>
-  <projects id="5" name="Project Five" qualifier="TRK" scope="PRJ"/>
-  <projects id="6" name="View Six" qualifier="VW" scope="PRJ"/>
-  <projects id="7" name="Project One" qualifier="TRK" scope="FIL"/>
+  <projects id="1" uuid="A" name="Project One" qualifier="TRK" scope="PRJ"/>
+  <projects id="2" uuid="B" name="Project Two" qualifier="TRK" scope="PRJ"/>
+  <projects id="3" uuid="C" name="Project Three" qualifier="TRK" scope="PRJ"/>
+  <projects id="4" uuid="D" name="Project Four" qualifier="TRK" scope="PRJ"/>
+  <projects id="5" uuid="E" name="Project Five" qualifier="TRK" scope="PRJ"/>
+  <projects id="6" uuid="F" name="View Six" qualifier="VW" scope="PRJ"/>
+  <projects id="7" uuid="G" name="Project One" qualifier="TRK" scope="FIL"/>
 
   <resource_index id="1" kee="project one" resource_id="1" root_project_id="1" position="0" name_size="11" qualifier="TRK"/>
   <resource_index id="2" kee="roject one" resource_id="1" root_project_id="1" position="1" name_size="11" qualifier="TRK"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml
index a380d4288a7..23ffb666a5d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/projects.xml
@@ -5,8 +5,8 @@
   <rules_profiles id="2" name="Sonar Way" language="js" parent_kee="[null]" kee="js_sonar_way"
                   rules_updated_at="[null]" created_at="[null]" updated_at="[null]"/>
 
-  <projects id="1" kee="org.codehaus.sonar:sonar" name="SonarQube"/>
-  <projects id="2" kee="org.codehaus.sonar-plugins.java:java" name="SonarQube Java"/>
+  <projects id="1" uuid="A" kee="org.codehaus.sonar:sonar" name="SonarQube"/>
+  <projects id="2" uuid="B" kee="org.codehaus.sonar-plugins.java:java" name="SonarQube Java"/>
 
   <properties id="1" prop_key="sonar.profile.java" text_value="Sonar Way" resource_id="1"/>
   <properties id="2" prop_key="sonar.profile.java" text_value="Sonar Way" resource_id="2"/>
-- 
2.39.5