Fix IT on MsSQL

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 7210c845707aacc4df4e5c307989f0cf7e3582d7..e4f5a9a95ac8043214360cbc8fa12dcce2aa5662 100644 (file)
--- 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 820d4a95e59d277e0f97780a0b470e45e464dba2..e0915f2888864ccbd92c7acef6d2a2d5722f17fb 100644 (file)
--- 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 c7484ec4a2a4e5ce714cc9b83278ab5960e9f02a..5eb937151f22b2428c707538c22c906a6f45fe34 100644 (file)
--- 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 5388b78865a28c86b800b47922a6d41e0789c037..448725c0c5b6c4fdd93dbb8181b13044102bb499 100644 (file)
--- 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 7e7124733f32c490cd3ba41e3c0edc6bbf84507c..84440419a6d26688f183f2596a3a27d8de631f2f 100644 (file)
--- 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 e89ad4019411de3b8bf90e24de2c654e5063fec9..4de6c73606e7d9266d63968ba086e6959071edcf 100644 (file)
--- 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 7ac2a5e82d5e63fbbae89e4843395cc6e60cc7a0..6c8bc14c474b2e510fc4fabbff92b4dfcf7bb3bd 100644 (file)
--- 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 4909ab381445870ccd5ce3d54955bfcd80242304..f6b16a78283a4771d6bffafc2b65f46e565e02b7 100644 (file)
--- 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 b499760cfd5b7a37107201f53d64acf431ff3cb6..0b0bbee6401c0411c8b59910110501805319e202 100644 (file)
--- 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 76984033aa1d884c0caddeaa2d327bf569eb0de1..aaf6b56ff941b7d0db0ce9f693802270dbd0d8de 100644 (file)
--- 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 3631f49e9ee47c1d5cf31606e35124a5b3f863e0..b500a05366a6bdaa4419421c0b25aa7570d495b6 100644 (file)
--- 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 6ceb4b16f1bf055c84fa8be320a9093670a1d7b5..fe02d7bccbb7023ff870195b1a79b735e1d69c91 100644 (file)
--- 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 b5d58e167cbf1f7079a3e13098a2176dfcf74b1c..07f8997740d8ad492caf1a0112c63d29f5c5eb56 100644 (file)
--- 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>