Support organizations in user group web services

24 files changed, 113 insertions, 59 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
index c883ed34a12..9c3956fe824 100644
--- a/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
+++ b/sonar-db/src/main/java/org/sonar/db/version/DatabaseVersion.java
@@ -30,7 +30,7 @@ import org.sonar.db.MyBatis;
 
 public class DatabaseVersion {
 
-  public static final int LAST_VERSION = 1_413;
+  public static final int LAST_VERSION = 1_414;
 
   /**
    * The minimum supported version which can be upgraded. Lower
diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
index 93c0362b9c9..62b24e22a52 100644
--- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
+++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql
@@ -502,6 +502,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1410');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1411');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1412');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1413');
+INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1414');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, IS_ROOT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', true, '1418215735482', '1418215735482');
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;
diff --git a/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java
index c8cc20bb731..afa5f4e90ba 100644
--- a/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java
@@ -39,6 +39,7 @@ import org.sonar.db.issue.IssueFilterDto;
 import org.sonar.db.issue.IssueFilterFavouriteDto;
 import org.sonar.db.measure.MeasureFilterDto;
 import org.sonar.db.measure.MeasureFilterFavouriteDto;
+import org.sonar.db.permission.UserPermissionDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.property.PropertyQuery;
 
@@ -50,6 +51,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.db.user.GroupMembershipQuery.IN;
 import static org.sonar.db.user.GroupMembershipQuery.builder;
+import static org.sonar.db.user.GroupTesting.newGroupDto;
 import static org.sonar.db.user.UserTesting.newUserDto;
 
 public class UserDaoTest {
@@ -722,13 +724,13 @@ public class UserDaoTest {
 
   private org.sonar.db.permission.UserPermissionDto insertUserPermission(UserDto user) {
     String permission = randomAlphanumeric(64);
-    org.sonar.db.permission.UserPermissionDto dto = new org.sonar.db.permission.UserPermissionDto(permission, user.getId(), null);
+    UserPermissionDto dto = new UserPermissionDto(db.getDefaultOrganization().getUuid(), permission, user.getId(), null);
     dbClient.userPermissionDao().insert(session, dto);
     return dto;
   }
 
   private UserGroupDto insertUserGroup(UserDto user) {
-    GroupDto group = new GroupDto().setName(randomAlphanumeric(30));
+    GroupDto group = newGroupDto().setName(randomAlphanumeric(30));
     dbClient.groupDao().insert(session, group);
 
     UserGroupDto dto = new UserGroupDto().setUserId(user.getId()).setGroupId(group.getId());
diff --git a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
index 689122fe613..f28a1e17fde 100644
--- a/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/version/MigrationStepModuleTest.java
@@ -29,6 +29,6 @@ public class MigrationStepModuleTest {
   public void verify_count_of_added_MigrationStep_types() {
     ComponentContainer container = new ComponentContainer();
     new MigrationStepModule().configure(container);
-    assertThat(container.size()).isEqualTo(153);
+    assertThat(container.size()).isEqualTo(156);
   }
 }
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_group_anyone.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_group_anyone.xml
index 0162bcc8eed..8cf3146b93f 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_group_anyone.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_group_anyone.xml
@@ -7,7 +7,8 @@
   <user_roles id="1"
               user_id="10"
               resource_id="[null]"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <groups_users user_id="10"
                 group_id="[null]"/>
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_group_global_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_group_global_permissions.xml
index 3c277449e2c..d2b43c25d1f 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_group_global_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_group_global_permissions.xml
@@ -12,11 +12,13 @@
   <user_roles id="1"
               user_id="999"
               resource_id="[null]"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
   <user_roles id="2"
               user_id="999"
               resource_id="[null]"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <groups_users user_id="10"
                 group_id="200"/>
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_user_global_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_user_global_permissions.xml
index 53dcd98975d..b0b48640e4a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_user_global_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_user_global_permissions.xml
@@ -12,15 +12,18 @@
   <user_roles id="1"
               user_id="10"
               resource_id="[null]"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
   <user_roles id="2"
               user_id="10"
               resource_id="[null]"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
   <user_roles id="3"
               user_id="11"
               resource_id="[null]"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <groups_users user_id="999"
                 group_id="200"/>
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template-result.xml
index 0c945ecfc5d..e0fbea1348a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template-result.xml
@@ -1,9 +1,11 @@
 <dataset>
 
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
 
   <users id="200"
          login="marius"
@@ -30,7 +32,8 @@
   <user_roles id="1"
               user_id="200"
               resource_id="1"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
   <group_roles id="3"
@@ -62,20 +65,24 @@
   <user_roles id="2"
               user_id="200"
               resource_id="123"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
   <user_roles id="3"
               user_id="201"
               resource_id="123"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
   <user_roles id="4"
               user_id="201"
               resource_id="123"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <!-- default permission template for all qualifiers -->
   <permission_templates id="1"
                         name="default"
-                        kee="default_20130101_010203"/>
+                        kee="default_20130101_010203"
+                        organization_uuid="org1"/>
 
   <perm_templates_groups id="1"
                          template_id="1"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id-result.xml
index 14f030dfe78..dd703dcaf7c 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id-result.xml
@@ -1,9 +1,11 @@
 <dataset>
 
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
 
   <users id="200"
          login="marius"
@@ -30,7 +32,8 @@
   <user_roles id="1"
               user_id="200"
               resource_id="1"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
   <group_roles id="3"
@@ -62,12 +65,14 @@
   <user_roles id="2"
               user_id="200"
               resource_id="123"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
 
   <!-- default permission template for all qualifiers -->
   <permission_templates id="1"
                         name="default"
-                        kee="default_20130101_010203"/>
+                        kee="default_20130101_010203"
+                        organization_uuid="org1"/>
 
   <perm_templates_groups id="1"
                          template_id="1"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template-result.xml
index 0bfd094f5e9..b2acc6341e2 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template-result.xml
@@ -1,9 +1,11 @@
 <dataset>
 
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
 
   <users id="200"
          login="marius"
@@ -24,7 +26,8 @@
   <user_roles id="1"
               user_id="200"
               resource_id="1"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
 
   <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) -->
   <group_roles id="3"
@@ -56,12 +59,14 @@
   <user_roles id="2"
               user_id="200"
               resource_id="123"
-              role="admin"/>
+              role="admin"
+              organization_uuid="org1"/>
 
   <!-- default permission template for all qualifiers -->
   <permission_templates id="1"
                         name="default"
-                        kee="default_20130101_010203"/>
+                        kee="default_20130101_010203"
+                        organization_uuid="org1"/>
 
   <perm_templates_groups id="1"
                          template_id="1"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_count_component_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_count_component_permissions.xml
index 87111255fcc..8afe021f56a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_count_component_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_count_component_permissions.xml
@@ -8,12 +8,14 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <group_roles id="1"
                group_id="100"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions-result.xml
index 5b08aed9395..77964cdc299 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions-result.xml
@@ -8,7 +8,8 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles/>
 
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions.xml
index 87111255fcc..8afe021f56a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_remove_all_permissions.xml
@@ -8,12 +8,14 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <group_roles id="1"
                group_id="100"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
index 1f5524f8411..daecd0c42eb 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
@@ -4,7 +4,8 @@
                         kee="my_template_20130102_030405"
                         description="my description"
                         created_at="[null]"
-                        updated_at="[null]"/>
+                        updated_at="[null]"
+                        organization_uuid="org1"/>
 
   <users id="1"
          login="user1"
diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml b/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
index 97633d87fe6..ad39eaf134b 100644
--- a/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
@@ -4,7 +4,6 @@
                         kee="my_template_20130102_030405"
                         description="my description"
                         created_at="[null]"
-                        updated_at="[null]"/>
                         updated_at="[null]"
                         organization_uuid="org1"/>
 
@@ -51,7 +50,6 @@
                          permission_reference="group_permission2"/>
 
   <groups id="1"
-          name="group1"/>
           name="group1"
           organization_uuid="org1"/>
   <groups id="2"
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml
index 6ceac57ea80..ac73aa52865 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml
@@ -30,6 +30,7 @@
          email="jo@hn.com"
          created_at="1418215735482"
          updated_at="1418215735482"
-         active="[true]"/>
+         active="[true]"
+         is_root="[false]"/>
 
 </dataset>
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml
index 8ce3b02d646..425e2ed57c3 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared.xml
@@ -2,13 +2,16 @@
 
   <groups id="100"
           name="sonar-administrators"
-          description="System administrators"/>
+          description="System administrators"
+          organization_uuid="org1"/>
   <groups id="101"
           name="sonar-users"
-          description="Any new users created will automatically join this group"/>
+          description="Any new users created will automatically join this group"
+          organization_uuid="org1"/>
   <groups id="102"
           name="sonar-reviewers"
-          description="Reviewers"/>
+          description="Reviewers"
+          organization_uuid="org1"/>
 
   <!-- user 200 is in all groups -->
   <groups_users user_id="200"
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml
index 83007bbe770..3d65a44cbad 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/GroupMembershipDaoTest/shared_plus_empty_group.xml
@@ -2,16 +2,20 @@
 
   <groups id="100"
           name="sonar-administrators"
-          description="System administrators"/>
+          description="System administrators"
+          organization_uuid="org1"/>
   <groups id="101"
           name="sonar-users"
-          description="Any new users created will automatically join this group"/>
+          description="Any new users created will automatically join this group"
+          organization_uuid="org1"/>
   <groups id="102"
           name="sonar-reviewers"
-          description="Reviewers"/>
+          description="Reviewers"
+          organization_uuid="org1"/>
   <groups id="103"
           name="sonar-nobody"
-          description="Nobody in this group"/>
+          description="Nobody in this group"
+          organization_uuid="org1"/>
 
   <!-- user 200 is in all groups -->
   <groups_users user_id="200"
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_count_component_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_count_component_permissions.xml
index 87111255fcc..8afe021f56a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_count_component_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_count_component_permissions.xml
@@ -8,12 +8,14 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <group_roles id="1"
                group_id="100"
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions-result.xml
index 5b08aed9395..77964cdc299 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions-result.xml
@@ -8,7 +8,8 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles/>
 
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions.xml
index 87111255fcc..8afe021f56a 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/should_remove_all_permissions.xml
@@ -8,12 +8,14 @@
          is_root="[false]"/>
 
   <groups id="100"
-          name="devs"/>
+          name="devs"
+          organization_uuid="org1"/>
 
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="user"/>
+              role="user"
+              organization_uuid="org1"/>
 
   <group_roles id="1"
                group_id="100"
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml
index 6a6ef25983a..e635f834a44 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/countRoles.xml
@@ -1,8 +1,10 @@
 <dataset>
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
   <users id="200"
          login="marius"
          name="Marius"
@@ -21,7 +23,8 @@
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="codeviewer"/>
+              role="codeviewer"
+              organization_uuid="org1"/>
 
   <!-- other resource -->
   <group_roles id="3"
@@ -31,6 +34,7 @@
   <user_roles id="2"
               user_id="200"
               resource_id="999"
-              role="codeviewer"/>
+              role="codeviewer"
+              organization_uuid="org1"/>
 
 </dataset>
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml
index 82a63b36e48..682128d2fb1 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId-result.xml
@@ -1,8 +1,10 @@
 <dataset>
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
   <users id="200"
          login="marius"
          name="Marius"
@@ -22,6 +24,7 @@
   <user_roles id="2"
               user_id="200"
               resource_id="999"
-              role="codeviewer"/>
+              role="codeviewer"
+              organization_uuid="org1"/>
 
 </dataset>
diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml
index 6a6ef25983a..e635f834a44 100644
--- a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml
+++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/deleteRolesByResourceId.xml
@@ -1,8 +1,10 @@
 <dataset>
   <groups id="100"
-          name="sonar-administrators"/>
+          name="sonar-administrators"
+          organization_uuid="org1"/>
   <groups id="101"
-          name="sonar-users"/>
+          name="sonar-users"
+          organization_uuid="org1"/>
   <users id="200"
          login="marius"
          name="Marius"
@@ -21,7 +23,8 @@
   <user_roles id="1"
               user_id="200"
               resource_id="123"
-              role="codeviewer"/>
+              role="codeviewer"
+              organization_uuid="org1"/>
 
   <!-- other resource -->
   <group_roles id="3"
@@ -31,6 +34,7 @@
   <user_roles id="2"
               user_id="200"
               resource_id="999"
-              role="codeviewer"/>
+              role="codeviewer"
+              organization_uuid="org1"/>
 
 </dataset>