diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-10-12 23:39:58 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-10-13 12:18:42 +0200 |
| commit | 0d6f98364a4e6a0c0055e4f0cd6132d1236329ae (patch) | |
| tree | 6be32099e5477e91436c92bbf1a509dbddfd8f93 /sonar-db/src/test/resources | |
| parent | 5975e1771500cef122160c35a648cd712b60a252 (diff) | |
| download | sonarqube-0d6f98364a4e6a0c0055e4f0cd6132d1236329ae.tar.gz sonarqube-0d6f98364a4e6a0c0055e4f0cd6132d1236329ae.zip | |
SONAR-8134 make column group_roles.organization_uuid not null
Diffstat (limited to 'sonar-db/src/test/resources')
44 files changed, 119 insertions, 108 deletions
diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_ghost_projects.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_ghost_projects.xml index 3ff92c4b3a6..d7fb2887950 100644 --- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_ghost_projects.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_ghost_projects.xml @@ -5,7 +5,7 @@ group_id="[null]" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Ghost project --> <projects id="42" diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_provisioned_projects.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_provisioned_projects.xml index e4c48f2d86b..13e4e82fa52 100644 --- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_provisioned_projects.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/select_provisioned_projects.xml @@ -5,7 +5,7 @@ group_id="[null]" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Provisioned project --> <projects id="42" diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml index 8b350036658..62b8d840872 100644 --- a/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ComponentDaoTest/shared.xml @@ -5,7 +5,7 @@ group_id="[null]" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- root project --> diff --git a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml index 326a07d321d..968aadc3f68 100644 --- a/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml +++ b/sonar-db/src/test/resources/org/sonar/db/component/ResourceDaoTest/fixture.xml @@ -5,7 +5,7 @@ group_id="[null]" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- root project --> diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml index b0c1649526e..54589bade01 100644 --- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueDaoTest/shared.xml @@ -4,7 +4,7 @@ group_id="[null]" resource_id="399" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects uuid="ABCD" uuid_path="NOT_USED" diff --git a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml index aea9404df06..71091c9a89d 100644 --- a/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml +++ b/sonar-db/src/test/resources/org/sonar/db/issue/IssueStatsDaoTest/should_select_assignees.xml @@ -4,7 +4,7 @@ group_id="[null]" resource_id="399" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="399" kee="my.project:kee" root_id="[null]" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/anonymous_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/anonymous_should_be_authorized.xml index 83167bd9f8e..ff279acc1ec 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/anonymous_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/anonymous_should_be_authorized.xml @@ -11,12 +11,12 @@ group_id="[null]" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="[null]" resource_id="400" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="301" kee="pj-w-snapshot:package" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/group_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/group_should_be_authorized.xml index 9984fe2564a..3069348c648 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/group_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/group_should_be_authorized.xml @@ -13,12 +13,12 @@ group_id="200" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="200" resource_id="400" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="301" kee="pj-w-snapshot:package" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/is_authorized_component_key_for_global_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/is_authorized_component_key_for_global_permission.xml index 84872fe06db..f0cd3139798 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/is_authorized_component_key_for_global_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/is_authorized_component_key_for_global_permission.xml @@ -13,7 +13,7 @@ group_id="200" resource_id="[null]" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="301" kee="pj-w-snapshot:package" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_anonymous.xml index a94ea95f0cc..ede31666506 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_anonymous.xml @@ -6,12 +6,12 @@ group_id="[null]" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="200" resource_id="400" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_group.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_group.xml index 3cdc77d77f4..c21e2374247 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_project_ids_for_group.xml @@ -6,12 +6,12 @@ group_id="200" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="200" resource_id="400" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_anonymous.xml index 3b6f39ed7ed..74eb60b20d3 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_anonymous.xml @@ -28,12 +28,12 @@ group_id="[null]" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="201" resource_id="400" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_group.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_group.xml index 373dfd2cc40..90dc8f49753 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_group.xml @@ -28,12 +28,12 @@ group_id="200" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="201" resource_id="400" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_user.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_user.xml index 51e54fa5edf..543cac8666b 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/keep_authorized_users_for_role_and_project_for_user.xml @@ -28,7 +28,7 @@ group_id="200" resource_id="400" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_anonymous.xml index bd1d5067213..67341bbe2b5 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_global_permissions_for_anonymous.xml @@ -15,11 +15,11 @@ group_id="[null]" resource_id="[null]" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="201" group_id="[null]" resource_id="[null]" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> 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 eb69e877be7..7378f893184 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 @@ -17,6 +17,6 @@ group_id="[null]" resource_id="[null]" role="profileadmin" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> 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 d051f0792c8..3b395a254de 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 @@ -31,11 +31,11 @@ group_id="200" resource_id="[null]" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="201" resource_id="[null]" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_anonymous.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_anonymous.xml index b17c218fcae..2addb792cf1 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_anonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_anonymous.xml @@ -11,7 +11,7 @@ group_id="[null]" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" uuid="ABCD" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_group.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_group.xml index 948fe093644..f77c4c97f6f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_group.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_group.xml @@ -13,7 +13,7 @@ group_id="200" resource_id="300" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" uuid="ABCD" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_user.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_user.xml index c7c72ba443a..113aad3eab7 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/should_return_root_project_keys_for_user.xml @@ -12,7 +12,7 @@ group_id="200" resource_id="999" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" uuid="ABCD" 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 da3d199d0d7..c8a6d9e7104 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 @@ -34,11 +34,11 @@ group_id="200" resource_id="[null]" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="201" group_id="200" resource_id="[null]" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/user_should_be_authorized.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/user_should_be_authorized.xml index 4e3daa12fa8..a2f7b6af078 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/user_should_be_authorized.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionDaoTest/user_should_be_authorized.xml @@ -17,7 +17,7 @@ group_id="200" resource_id="999" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects id="300" kee="pj-w-snapshot" 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 aa7cbaafb48..4e6496e31e3 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 @@ -25,12 +25,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_id="1" @@ -42,32 +42,32 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="[null]" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="101" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="8" group_id="100" resource_id="123" role="issueadmin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- new user permission : marius (admin) & janette (user) --> <user_roles id="2" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template.xml index 1ea13a7e18c..04c60e6a91f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template.xml @@ -42,12 +42,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_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 b9419ff2a12..c0a3eef5b84 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 @@ -25,12 +25,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_id="1" @@ -42,32 +42,32 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="[null]" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="101" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="8" group_id="100" resource_id="123" role="issueadmin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- new user permission : marius (admin) & janette (user) --> <user_roles id="2" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id.xml index 72b76d08168..ee44229b86f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/apply_default_permission_template_by_component_id.xml @@ -35,12 +35,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_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 f47ba76efb4..7667cf5e407 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 @@ -19,12 +19,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_id="1" @@ -36,32 +36,32 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="[null]" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="101" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="8" group_id="100" resource_id="123" role="issueadmin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- new user permission : marius (admin) --> <user_roles id="2" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template.xml index f908cfe1a43..ff82df0b5be 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_apply_permission_template.xml @@ -36,12 +36,12 @@ group_id="100" resource_id="1" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="101" resource_id="1" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_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 f01b60ff250..3c91825413a 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 @@ -21,6 +21,6 @@ group_id="100" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission-result.xml index 20cae681be4..efd14a5c8fb 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission-result.xml @@ -8,7 +8,7 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects uuid="A" uuid_path="NOT_USED" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission.xml index 4c136d3824f..a66c2de8f72 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_group_permission.xml @@ -8,12 +8,12 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="100" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <projects uuid="A" uuid_path="NOT_USED" 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 f01b60ff250..3c91825413a 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 @@ -21,6 +21,6 @@ group_id="100" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml index 392f09afa38..84044ff3812 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId-result.xml @@ -11,23 +11,23 @@ group_id="101" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="[null]" role="scan" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="[null]" role="provisioning" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="102" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml index 6c618d418c7..245efc76429 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/deleteGroupPermissionsByGroupId.xml @@ -12,39 +12,39 @@ group_id="100" role="admin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="100" role="profileadmin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="3" group_id="100" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="[null]" role="scan" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="[null]" role="provisioning" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="102" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml index f05583c7d9c..cdf185a15cd 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions-result.xml @@ -11,34 +11,34 @@ group_id="100" role="admin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="3" group_id="100" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Group 'anyone' has a NULL group_id --> <group_roles id="5" group_id="[null]" role="scan" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="[null]" role="provisioning" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="7" group_id="102" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml index ae90bef3c91..570c81e0ea5 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/globalGroupPermissions.xml @@ -11,40 +11,40 @@ group_id="100" role="admin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="100" role="profileadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="3" group_id="100" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="4" group_id="101" role="gateadmin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Group 'anyone' has a NULL group_id --> <group_roles id="5" group_id="[null]" role="scan" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="6" group_id="[null]" role="provisioning" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Component permission, it should not be returned with global permissions --> <group_roles id="7" group_id="102" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml index 3a6f3a75c31..3c41ea646ab 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions-result.xml @@ -11,24 +11,24 @@ group_id="100" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="3" group_id="101" role="codeviewer" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Group 'anyone' has a NULL group_id --> <group_roles id="4" group_id="[null]" role="user" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="5" group_id="100" role="admin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml index 7d9adcbab16..569141d25df 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleDaoTest/resourceGroupPermissions.xml @@ -11,30 +11,30 @@ group_id="100" role="admin" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="100" role="codeviewer" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="3" group_id="101" role="codeviewer" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Group 'anyone' has a NULL group_id --> <group_roles id="4" group_id="[null]" role="user" resource_id="1" - organization_uuid="[null]"/> + organization_uuid="org1"/> <!-- Global permission, it should not be returned with component permissions --> <group_roles id="5" group_id="100" role="admin" resource_id="[null]" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> 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 f01b60ff250..3c91825413a 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 @@ -21,6 +21,6 @@ group_id="100" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> 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 f01b60ff250..3c91825413a 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 @@ -21,6 +21,6 @@ group_id="100" resource_id="123" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> </dataset> 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 22e52a04da3..c0e35675070 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 @@ -16,12 +16,12 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="[null]" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_id="123" @@ -33,7 +33,7 @@ group_id="101" resource_id="999" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="2" user_id="200" resource_id="999" 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 827cbf47982..7575e3fae0a 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 @@ -21,7 +21,7 @@ group_id="101" resource_id="999" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="2" user_id="200" resource_id="999" 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 22e52a04da3..c0e35675070 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 @@ -16,12 +16,12 @@ group_id="100" resource_id="123" role="admin" - organization_uuid="[null]"/> + organization_uuid="org1"/> <group_roles id="2" group_id="[null]" resource_id="123" role="user" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="1" user_id="200" resource_id="123" @@ -33,7 +33,7 @@ group_id="101" resource_id="999" role="codeviewer" - organization_uuid="[null]"/> + organization_uuid="org1"/> <user_roles id="2" user_id="200" resource_id="999" diff --git a/sonar-db/src/test/resources/org/sonar/db/version/v62/MakeOrganizationUuidNotNullOnGroupRolesTest/in_progress_group_roles.sql b/sonar-db/src/test/resources/org/sonar/db/version/v62/MakeOrganizationUuidNotNullOnGroupRolesTest/in_progress_group_roles.sql new file mode 100644 index 00000000000..b7c45cfd68e --- /dev/null +++ b/sonar-db/src/test/resources/org/sonar/db/version/v62/MakeOrganizationUuidNotNullOnGroupRolesTest/in_progress_group_roles.sql @@ -0,0 +1,11 @@ +CREATE TABLE "GROUP_ROLES" ( + "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1), + "ORGANIZATION_UUID" VARCHAR(40), + "GROUP_ID" INTEGER, + "RESOURCE_ID" INTEGER, + "ROLE" VARCHAR(64) NOT NULL +); + +CREATE INDEX "GROUP_ROLES_RESOURCE" ON "GROUP_ROLES" ("RESOURCE_ID"); + +CREATE UNIQUE INDEX "UNIQ_GROUP_ROLES" ON "GROUP_ROLES" ("GROUP_ID", "RESOURCE_ID", "ROLE"); |