From 32d7cae2a648fa9e1743c4e71fbd00cbe0c8be61 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 28 Oct 2014 10:49:06 +0100
Subject: [PATCH] Fix IT on MsSQL

---
 .../load_component_id_from_db.xml             |  4 ++--
 .../load_project_id_from_db.xml               |  6 ++---
 .../should_insert_new_issues.xml              |  4 ++--
 .../should_update_issues.xml                  |  4 ++--
 ..._synchronize_view_dev_or_tech_projects.xml |  6 ++---
 .../find_after_dates_with_project.xml         | 22 +------------------
 .../server/issue/db/IssueDaoTest/shared.xml   |  8 +++----
 ...e_when_filter_by_component_name_or_key.xml |  8 +++----
 .../ignore_person_measures.xml                |  2 +-
 .../ignore_quality_model_measures.xml         |  2 +-
 .../MeasureFilterExecutorTest/shared.xml      | 10 ++++-----
 .../sort_by_alert.xml                         |  6 ++---
 .../source/HtmlSourceDecoratorTest/shared.xml |  6 ++---
 13 files changed, 34 insertions(+), 54 deletions(-)

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
index 157531639cc..76aa5b6864f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_component_id_from_db.xml
@@ -1,7 +1,7 @@
 <dataset>
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/>
+  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
   <snapshots id="10" project_id="10" root_project_id="[null]" islast="[true]"/>
 
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action"/>
+  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
   <snapshots id="100" project_id="100" root_project_id="10" islast="[true]"/>
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
index 1eb4ff00c26..a5097aa6f66 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/load_project_id_from_db.xml
@@ -1,7 +1,7 @@
 <dataset>
-  <projects id="1" kee="struts" root_id="[null]"/>
-  <projects id="2" kee="struts:Action.java" root_id="1"/>
+  <projects id="1" kee="struts" root_id="[null]" uuid="ABCD"/>
+  <projects id="2" kee="struts:Action.java" root_id="1" uuid="BCDE"/>
 
   <snapshots id="1" project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]" islast="[true]" />
   <snapshots id="2" project_id="2" parent_snapshot_id="1" root_project_id="1" root_snapshot_id="1" islast="[true]" />
-</dataset>
\ No newline at end of file
+</dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
index 157531639cc..76aa5b6864f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues.xml
@@ -1,7 +1,7 @@
 <dataset>
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/>
+  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
   <snapshots id="10" project_id="10" root_project_id="[null]" islast="[true]"/>
 
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action"/>
+  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
   <snapshots id="100" project_id="100" root_project_id="10" islast="[true]"/>
 </dataset>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
index 4a49fca856a..15d6a321478 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_update_issues.xml
@@ -1,9 +1,9 @@
 <dataset>
 
-  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts"/>
+  <projects id="10" scope="PRJ" qualifier="TRK" kee="struts" name="Struts" uuid="ABCD"/>
   <snapshots id="10" project_id="10" root_project_id="[null]" islast="[true]"/>
 
-  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action"/>
+  <projects id="100" scope="FIL" qualifier="CLA" kee="struts:Action" name="Action" uuid="BCDE"/>
   <snapshots id="100" project_id="100" root_project_id="10" islast="[true]"/>
 
   <issues id="1"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueAuthorizationDaoTest/not_synchronize_view_dev_or_tech_projects.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueAuthorizationDaoTest/not_synchronize_view_dev_or_tech_projects.xml
index 11a70553a2d..7c5143b6937 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueAuthorizationDaoTest/not_synchronize_view_dev_or_tech_projects.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueAuthorizationDaoTest/not_synchronize_view_dev_or_tech_projects.xml
@@ -2,19 +2,19 @@
 
   <!-- view -->
   <projects id="1" kee="VIEW" name="View" long_name="View" scope="PRJ" qualifier="VW" root_id="[null]" description="[null]"
-            uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]"
             created_at="2014-09-01" authorization_updated_at="2014-01-01"/>
 
   <!-- developer -->
   <projects id="2" kee="DEV:developer@company.net" name="developer@company.net" long_name="Developer" scope="PRJ" qualifier="DEV" root_id="[null]" description="[null]"
-            uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
+            uuid="BCDE" project_uuid="BCDE" module_uuid="[null]" module_uuid_path="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]" path="[null]" deprecated_kee="[null]"
             created_at="2014-09-01" authorization_updated_at="2014-01-01"/>
 
   <!-- Tech project -->
   <projects id="3" kee="VIEWorg.codehaus.sonar-plugins:sonar-piwik-plugin" name="Piwik" long_name="Piwik" scope="FIL" qualifier="TRK" root_id="[null]" description="[null]"
-            uuid="[null]" project_uuid="[null]" module_uuid="[null]" module_uuid_path="[null]"
+            uuid="CDEF" project_uuid="BCDE" module_uuid="BCDE" module_uuid_path="BCDE"
             enabled="[true]" language="[null]" copy_resource_id="3" person_id="[null]" path="[null]" deprecated_kee="[null]"
             created_at="2014-09-01" authorization_updated_at="2014-01-01"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/find_after_dates_with_project.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/find_after_dates_with_project.xml
index b8ffad1a1c0..d58c6186d19 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/find_after_dates_with_project.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/find_after_dates_with_project.xml
@@ -1,26 +1,6 @@
-<!--
-  ~ SonarQube, open source software quality management tool.
-  ~ Copyright (C) 2008-2014 SonarSource
-  ~ mailto:contact AT sonarsource DOT com
-  ~
-  ~ SonarQube 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.
-  ~
-  ~ SonarQube 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  02110-1301, USA.
-  -->
-
 <dataset>
 
-  <projects id="1000" kee="other" root_id="[null]" qualifier="TRK" scope="PRJ"/>
+  <projects id="1000" kee="other" root_id="[null]" qualifier="TRK" scope="PRJ" uuid="DBCA"/>
 
   <snapshots id="1000" project_id="1000" root_snapshot_id="[null]" parent_snapshot_id="[null]" root_project_id="1000"
              path="" islast="[true]"/>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/shared.xml
index 41a2d34e288..44deea3ff9c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/db/IssueDaoTest/shared.xml
@@ -2,10 +2,10 @@
 
   <group_roles id="1" group_id="[null]" resource_id="399" role="user"/>
 
-  <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" kee="struts" root_id="[null]" qualifier="TRK" scope="PRJ" uuid="ABCD"/>
+  <projects id="400" kee="struts-core" root_id="399" qualifier="BRC" scope="PRJ" uuid="BCDE"/>
+  <projects id="401" kee="Action.java" root_id="400" qualifier="CLA" scope="PRJ" uuid="CDEF"/>
+  <projects id="402" kee="Filter.java" root_id="400" qualifier="CLA" scope="PRJ" uuid="DEFG"/>
 
   <snapshots id="100" project_id="399" root_snapshot_id="[null]" parent_snapshot_id="[null]" root_project_id="399"
              path="" islast="[true]"/>
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml
index 2419fb9ef8b..c2e8480b194 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/escape_percent_and_underscore_when_filter_by_component_name_or_key.xml
@@ -2,23 +2,23 @@
 
   <!-- java project -->
   <projects kee="java_project:org.sonar.bar" long_name="org.sonar.bar" scope="FIL" qualifier="CLA" name="org.sonar.bar"
-            id="1" root_id="[null]"
+            id="1" root_id="[null]" uuid="ABCD"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java_project:org.sonar.foo" scope="FIL" qualifier="CLA" long_name="org.sonar.foo" name="org.sonar.foo"
-            id="2" root_id="1"
+            id="2" root_id="1" uuid="BCDE"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java project:org.sonar.foo.Big" scope="FIL" qualifier="CLA" long_name="org.sonar.foo.Big"
             name="Big"
-            id="3" root_id="1"
+            id="3" root_id="1" uuid="CDEF"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java project:org.sonar.foo.Tiny" scope="FIL" qualifier="CLA" long_name="org.sonar.foo.Tiny" name="Tiny"
-            id="4" root_id="1"
+            id="4" root_id="1" uuid="DEFG"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml
index c868a8d6933..fdecec73505 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml
@@ -5,7 +5,7 @@
            delete_historical_data="[null]"/>
 
   <projects kee="java_project" long_name="Java project" scope="PRJ" qualifier="TRK" name="Java project"
-            id="1" root_id="[null]"
+            id="1" root_id="[null]" uuid="ABCD"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"/>
 
   <snapshots id="101" project_id="1" root_project_id="1" root_snapshot_id="[null]" parent_snapshot_id="[null]"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml
index 6289fa9539e..005439eeaff 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_quality_model_measures.xml
@@ -5,7 +5,7 @@
            delete_historical_data="[null]"/>
 
   <projects kee="java_project" long_name="Java project" scope="PRJ" qualifier="TRK" name="Java project"
-            id="1" root_id="[null]"
+            id="1" root_id="[null]" uuid="ABCD"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"/>
 
   <snapshots id="101" project_id="1" root_project_id="1" root_snapshot_id="[null]" parent_snapshot_id="[null]"
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml
index 173b39e17d6..346ef1ae1fd 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/shared.xml
@@ -24,23 +24,23 @@
 
   <!-- java project -->
   <projects kee="java_project" long_name="Java project" scope="PRJ" qualifier="TRK" name="Java project"
-            id="1" root_id="[null]"
+            id="1" root_id="[null]" uuid="ABCD"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java_project:org.sonar.foo" scope="DIR" qualifier="PAC" long_name="org.sonar.foo" name="org.sonar.foo"
-            id="2" root_id="1"
+            id="2" root_id="1" uuid="BCDE"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java_project:org.sonar.foo.Big" scope="FIL" qualifier="CLA" long_name="org.sonar.foo.Big"
             name="Big"
-            id="3" root_id="1"
+            id="3" root_id="1" uuid="CDEF"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
   <projects kee="java_project:org.sonar.foo.Tiny" scope="FIL" qualifier="CLA" long_name="org.sonar.foo.Tiny" name="Tiny"
-            id="4" root_id="1"
+            id="4" root_id="1" uuid="DEFG"
             description="[null]" enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
@@ -128,7 +128,7 @@
 
   <!-- php project -->
   <projects kee="php_project" long_name="PHP project" scope="PRJ" qualifier="TRK" name="PHP project"
-            id="10" root_id="[null]"
+            id="10" root_id="[null]" uuid="EFGH"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2012-12-12 04:06:00.00"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml
index a8376646b7f..afcc9f3a1ea 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/sort_by_alert.xml
@@ -7,7 +7,7 @@
 
   <!-- java project -->
   <projects kee="java_project" long_name="Java project" scope="PRJ" qualifier="TRK" name="Java project"
-            id="1" root_id="[null]"
+            id="1" root_id="[null]" uuid="ABCD"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2008-12-19 00:00:00.00"/>
 
@@ -31,7 +31,7 @@
 
   <!-- php project -->
   <projects kee="php_project" long_name="PHP project" scope="PRJ" qualifier="TRK" name="PHP project"
-            id="10" root_id="[null]"
+            id="10" root_id="[null]" uuid="BCDE"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2012-12-12 04:06:00.00"/>
 
@@ -55,7 +55,7 @@
 
   <!-- js project -->
   <projects kee="js_project" long_name="JS project" scope="PRJ" qualifier="TRK" name="JS project"
-            id="20" root_id="[null]"
+            id="20" root_id="[null]" uuid="CDEF"
             description="[null]" enabled="[true]" language="[null]" copy_resource_id="[null]" person_id="[null]"
             created_at="2012-12-12 04:06:00.00"/>
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml
index 5f71e1539ac..7ee99827284 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/HtmlSourceDecoratorTest/shared.xml
@@ -1,8 +1,8 @@
 <dataset>
 
-    <projects id="1" kee="org.apache.struts:struts:Dispatcher" enabled="[true]"/>
-    <projects id="2" kee="org.apache.struts:struts:VelocityManager" enabled="[true]"/>
-    <projects id="3" kee="org.apache.struts:struts:DebuggingInterceptor" enabled="[true]"/>
+    <projects id="1" kee="org.apache.struts:struts:Dispatcher" enabled="[true]" uuid="ABCD"/>
+    <projects id="2" kee="org.apache.struts:struts:VelocityManager" enabled="[true]" uuid="BCDE"/>
+    <projects id="3" kee="org.apache.struts:struts:DebuggingInterceptor" enabled="[true]" uuid="CDEF"/>
 
     <snapshots id="11" project_id="1" islast="[true]" />
     <snapshots id="12" project_id="2" islast="[true]" />
-- 
2.39.5