From 07f7f3871c4e8ea32ea6b9eda7da58a86b3fb48b Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 28 Oct 2014 09:43:17 +0100
Subject: [PATCH] Fix IT on MsSQL

---
 .../shouldIndexMultiModulesProject-result.xml         |  4 ++++
 .../shouldIndexMultiModulesProject.xml                |  4 ++++
 .../shouldIndexProjects-result.xml                    |  3 +++
 .../ResourceIndexerDaoTest/shouldIndexProjects.xml    |  3 +++
 .../ResourceIndexerDaoTest/shouldNotIndexPackages.xml |  3 +++
 .../shouldReIndexNewTwoLettersLongResource.xml        |  1 +
 .../shouldReIndexTwoLettersLongResource.xml           |  1 +
 .../shouldReindexProjectAfterRenaming-result.xml      |  1 +
 .../shouldReindexProjectAfterRenaming.xml             |  1 +
 .../anonymous_should_be_authorized.xml                | 10 +++++-----
 .../group_should_be_authorized.xml                    | 10 +++++-----
 .../group_should_have_global_authorization.xml        | 10 +++++-----
 .../user_should_be_authorized.xml                     | 11 +++++------
 13 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml
index 7210c845707..e4f5a9a95ac 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject-result.xml
@@ -2,22 +2,26 @@
 
   <!-- project "struts" -> module "struts-core" -> package org.struts -> file "RequestContext" -->
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <projects long_name="[null]" id="2" scope="PRJ" qualifier="BRC" kee="org.struts:struts-core" name="Struts Core"
+            uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- note that the root_id of package/file is wrong. It references the module but not the root project -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts"
+            uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path="ABCD.BCDE"
             name="org.struts" root_id="2"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <projects long_name="org.struts.RequestContext" id="4" scope="CLA" qualifier="CLA"
+            uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path="ABCD.BCDE"
             kee="org.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
             description="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml
index 820d4a95e59..e0915f28888 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexMultiModulesProject.xml
@@ -2,22 +2,26 @@
 
   <!-- project "struts" -> module "struts-core" -> package org.struts -> file "RequestContext" -->
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <projects long_name="[null]" id="2" scope="PRJ" qualifier="BRC" kee="org.struts:struts-core" name="Struts Core"
+            uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- note that the root_id of package/file is wrong. It references the module but not the root project -->
   <projects long_name="org.struts" id="3" scope="DIR" qualifier="PAC" kee="org.struts:struts-core:org.struts"
+            uuid="CDEF" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path="ABCD.BCDE"
             name="org.struts" root_id="2"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <projects long_name="org.struts.RequestContext" id="4" scope="FIL" qualifier="CLA"
+            uuid="DEFG" project_uuid="ABCD" module_uuid="BCDE" module_uuid_path="ABCD.BCDE"
             kee="org.struts:struts-core:org.struts.RequestContext"
             name="RequestContext" root_id="2"
             description="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml
index c7484ec4a2a..5eb937151f2 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects-result.xml
@@ -2,18 +2,21 @@
 
   <!-- project -->
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="2" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts"
+            uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             name="org.struts" root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="3" scope="CLA" qualifier="CLA"
+            uuid="CDEF" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             kee="org.struts:struts:org.struts.RequestContext"
             name="RequestContext" root_id="1"
             description="[null]"
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml
index 5388b78865a..448725c0c5b 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldIndexProjects.xml
@@ -2,18 +2,21 @@
 
   <!-- project -->
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="2" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts"
+            uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             name="org.struts" root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext"
+            uuid="CDEF" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             name="RequestContext" root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml
index 7e7124733f3..84440419a6d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotIndexPackages.xml
@@ -2,18 +2,21 @@
 
   <!-- project -->
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- directory -->
   <projects long_name="org.struts" id="2" scope="DIR" qualifier="PAC" kee="org.struts:struts:org.struts"
+            uuid="BCDE" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             name="org.struts" root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
 
   <!-- file -->
   <projects long_name="org.struts.RequestContext" id="3" scope="FIL" qualifier="CLA" kee="org.struts:struts:org.struts.RequestContext"
+            uuid="CDEF" project_uuid="ABCD" module_uuid="ABCD" module_uuid_path="ABCD"
             name="RequestContext" root_id="1"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml
index e89ad401941..4de6c73606e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexNewTwoLettersLongResource.xml
@@ -1,6 +1,7 @@
 <dataset>
 
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="AS"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml
index 7ac2a5e82d5..6c8bc14c474 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReIndexTwoLettersLongResource.xml
@@ -1,6 +1,7 @@
 <dataset>
 
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="AS"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml
index 4909ab38144..f6b16a78283 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming-result.xml
@@ -1,6 +1,7 @@
 <dataset>
 
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Apache Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
index b499760cfd5..0b0bbee6401 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
@@ -1,6 +1,7 @@
 <dataset>
 
   <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Apache Struts"
+            uuid="ABCD" project_uuid="ABCD" module_uuid="[null]" module_uuid_path="[null]"
             root_id="[null]"
             description="[null]"
             enabled="[true]" language="java" copy_resource_id="[null]" person_id="[null]"/>
diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml
index 76984033aa1..aaf6b56ff94 100644
--- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/anonymous_should_be_authorized.xml
@@ -5,10 +5,10 @@
   <group_roles id="1" group_id="[null]" resource_id="300" role="user"/>
   <group_roles id="2" group_id="[null]" resource_id="400" role="user"/>
 
-  <projects id="301" kee="pj-w-snapshot:package" root_id="300" />
-  <projects id="302" kee="pj-w-snapshot:file" root_id="300" />
-  <projects id="303" kee="pj-w-snapshot:other" root_id="300" />
-  <projects id="300" kee="pj-w-snapshot" />
-  <projects id="400" kee="pj-wo-snapshot" />
+  <projects id="301" kee="pj-w-snapshot:package" root_id="300" uuid="ABCD"/>
+  <projects id="302" kee="pj-w-snapshot:file" root_id="300" uuid="BCDE"/>
+  <projects id="303" kee="pj-w-snapshot:other" root_id="300" uuid="CDEF" />
+  <projects id="300" kee="pj-w-snapshot" uuid="EDFG"/>
+  <projects id="400" kee="pj-wo-snapshot" uuid="FGHI"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml
index 3631f49e9ee..b500a05366a 100644
--- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_be_authorized.xml
@@ -7,10 +7,10 @@
   <group_roles id="1" group_id="200" resource_id="300" role="user"/>
   <group_roles id="2" group_id="200" resource_id="400" role="user"/>
 
-  <projects id="301" kee="pj-w-snapshot:package" root_id="300" />
-  <projects id="302" kee="pj-w-snapshot:file" root_id="300" />
-  <projects id="303" kee="pj-w-snapshot:other" root_id="300" />
-  <projects id="300" kee="pj-w-snapshot" />
-  <projects id="400" kee="pj-wo-snapshot" />
+  <projects id="301" kee="pj-w-snapshot:package" root_id="300" uuid="ABCD"/>
+  <projects id="302" kee="pj-w-snapshot:file" root_id="300" uuid="BCDE"/>
+  <projects id="303" kee="pj-w-snapshot:other" root_id="300" uuid="CDEF"/>
+  <projects id="300" kee="pj-w-snapshot" uuid="DEFG"/>
+  <projects id="400" kee="pj-wo-snapshot" uuid="EFGH"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_have_global_authorization.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_have_global_authorization.xml
index 6ceb4b16f1b..fe02d7bccbb 100644
--- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_have_global_authorization.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/group_should_have_global_authorization.xml
@@ -6,10 +6,10 @@
   <groups_users user_id="100" group_id="200"/>
   <group_roles id="1" group_id="200" resource_id="[null]" role="user"/>
 
-  <projects id="301" kee="pj-w-snapshot:package" root_id="300" />
-  <projects id="302" kee="pj-w-snapshot:file" root_id="300" />
-  <projects id="303" kee="pj-w-snapshot:other" root_id="300" />
-  <projects id="300" kee="pj-w-snapshot" />
-  <projects id="400" kee="pj-wo-snapshot" />
+  <projects id="301" kee="pj-w-snapshot:package" root_id="300" uuid="ABCD"/>
+  <projects id="302" kee="pj-w-snapshot:file" root_id="300" uuid="BCDE"/>
+  <projects id="303" kee="pj-w-snapshot:other" root_id="300" uuid="CDEF"/>
+  <projects id="300" kee="pj-w-snapshot" uuid="DEFG"/>
+  <projects id="400" kee="pj-wo-snapshot" uuid="EFGH"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml
index b5d58e167cb..07f8997740d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/user/AuthorizationDaoTest/user_should_be_authorized.xml
@@ -6,10 +6,9 @@
   <groups_users user_id="100" group_id="200"/>
   <group_roles id="1" group_id="200" resource_id="999" role="user"/>
 
-  <projects id="301" kee="pj-w-snapshot:package" root_id="300" />
-  <projects id="302" kee="pj-w-snapshot:file" root_id="300" />
-  <projects id="303" kee="pj-w-snapshot:other" root_id="300" />
-  <projects id="300" kee="pj-w-snapshot" />
-  <projects id="400" kee="pj-wo-snapshot" />
-
+  <projects id="301" kee="pj-w-snapshot:package" root_id="300" uuid="ABCD"/>
+  <projects id="302" kee="pj-w-snapshot:file" root_id="300" uuid="BCDE"/>
+  <projects id="303" kee="pj-w-snapshot:other" root_id="300" uuid="CDEF"/>
+  <projects id="300" kee="pj-w-snapshot" uuid="DEFG"/>
+  <projects id="400" kee="pj-wo-snapshot" uuid="EFGH"/>
 </dataset>
-- 
2.39.5