diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-10-03 15:13:22 +0200 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-10-12 12:24:28 +0200 |
| commit | 1302c99f06505aa39720da0456445f0f27bd807e (patch) | |
| tree | 43ad4af0427cc9a9510f2e65e5904d59bdee17d4 /sonar-db/src/test/resources | |
| parent | d01fd740c7dbfddc5f7c4a30514c12c8a3578dd2 (diff) | |
| download | sonarqube-1302c99f06505aa39720da0456445f0f27bd807e.tar.gz sonarqube-1302c99f06505aa39720da0456445f0f27bd807e.zip | |
SONAR-8155 support root in UserDto, UserDao and UTs
Diffstat (limited to 'sonar-db/src/test/resources')
59 files changed, 1795 insertions, 542 deletions
diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml index 5318ae07093..9ead92bbb12 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles-result.xml @@ -1,32 +1,81 @@ <dataset> - <projects id="123" kee="com.foo:bar"/> + <projects id="123" + kee="com.foo:bar"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new rows : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer), --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> - <group_roles id="4" group_id="101" resource_id="123" role="user"/> - <group_roles id="5" group_id="[null]" resource_id="123" role="user"/> - <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/> - <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="4" + group_id="101" + resource_id="123" + role="user"/> + <group_roles id="5" + group_id="[null]" + resource_id="123" + role="user"/> + <group_roles id="6" + group_id="101" + resource_id="123" + role="codeviewer"/> + <group_roles id="7" + group_id="[null]" + resource_id="123" + role="codeviewer"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_template_20130101_010203"/> + <permission_templates id="1" + name="default" + kee="default_template_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> <perm_templates_users/> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml index 1291c08b42a..609b3e57739 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles.xml @@ -1,25 +1,59 @@ <dataset> - <projects id="123" kee="com.foo:bar"/> - - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <projects id="123" + kee="com.foo:bar"/> + + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_template_20130101_010203"/> - - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> + <permission_templates id="1" + name="default" + kee="default_template_20130101_010203"/> + + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> <perm_templates_users/> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml index 9ada7f379cb..3402bd2adcf 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern-result.xml @@ -1,34 +1,79 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <groups id="102" name="sonar-foos"/> - <groups id="103" name="sonar-bars"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <groups id="102" + name="sonar-foos"/> + <groups id="103" + name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> + <users id="200" + login="foo" + name="Foo" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="bar" + name="Bar" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new rows --> - <group_roles id="3" group_id="102" resource_id="123" role="user"/> + <group_roles id="3" + group_id="102" + resource_id="123" + role="user"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/> + <permission_templates id="1" + name="default" + kee="default" + key_pattern="[null]"/> - <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/> - <permission_templates id="3" name="Start with bar" kee="bar_tmpl" key_pattern="bar\..*"/> + <permission_templates id="2" + name="Start with foo" + kee="foo_tmpl" + key_pattern="foo\..*"/> + <permission_templates id="3" + name="Start with bar" + kee="bar_tmpl" + key_pattern="bar\..*"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> - <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/> - <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/> + <perm_templates_groups id="2" + template_id="2" + group_id="102" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="3" + group_id="103" + permission_reference="user"/> <perm_templates_users/> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml index 667ef671ce1..fa4c829202c 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesPattern.xml @@ -1,30 +1,72 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <groups id="102" name="sonar-foos"/> - <groups id="103" name="sonar-bars"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <groups id="102" + name="sonar-foos"/> + <groups id="103" + name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> + <users id="200" + login="foo" + name="Foo" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="bar" + name="Bar" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/> + <permission_templates id="1" + name="default" + kee="default" + key_pattern="[null]"/> - <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/> - <permission_templates id="3" name="Start with bar" kee="bar_tmpl" key_pattern="bar\..*"/> + <permission_templates id="2" + name="Start with foo" + kee="foo_tmpl" + key_pattern="foo\..*"/> + <permission_templates id="3" + name="Start with bar" + kee="bar_tmpl" + key_pattern="bar\..*"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> - <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/> - <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/> + <perm_templates_groups id="2" + template_id="2" + group_id="102" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="3" + group_id="103" + permission_reference="user"/> <perm_templates_users/> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml index a70196dc547..e79b0f2567f 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject-result.xml @@ -1,44 +1,114 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- created permissions should be based on the TRK template --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> - <group_roles id="4" group_id="101" resource_id="123" role="admin"/> - <group_roles id="5" group_id="100" resource_id="123" role="user"/> - <group_roles id="6" group_id="100" resource_id="123" role="codeviewer"/> - <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="4" + group_id="101" + resource_id="123" + role="admin"/> + <group_roles id="5" + group_id="100" + resource_id="123" + role="user"/> + <group_roles id="6" + group_id="100" + resource_id="123" + role="codeviewer"/> + <group_roles id="7" + group_id="[null]" + resource_id="123" + role="codeviewer"/> - <user_roles id="2" user_id="200" resource_id="123" role="codeviewer"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="codeviewer"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default"/> + <permission_templates id="1" + name="default"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> <!-- default permission template for TRK --> - <permission_templates id="2" name="default_for_TRK"/> + <permission_templates id="2" + name="default_for_TRK"/> - <perm_templates_groups id="6" template_id="2" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="7" template_id="2" group_id="101" permission_reference="admin"/> - <perm_templates_groups id="8" template_id="2" group_id="100" permission_reference="user"/> - <perm_templates_groups id="9" template_id="2" group_id="100" permission_reference="codeviewer"/> - <perm_templates_groups id="10" template_id="2" group_id="[null]" permission_reference="codeviewer"/> + <perm_templates_groups id="6" + template_id="2" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="7" + template_id="2" + group_id="101" + permission_reference="admin"/> + <perm_templates_groups id="8" + template_id="2" + group_id="100" + permission_reference="user"/> + <perm_templates_groups id="9" + template_id="2" + group_id="100" + permission_reference="codeviewer"/> + <perm_templates_groups id="10" + template_id="2" + group_id="[null]" + permission_reference="codeviewer"/> - <perm_templates_users id="1" template_id="2" user_id="200" permission_reference="codeviewer"/> + <perm_templates_users id="1" + template_id="2" + user_id="200" + permission_reference="codeviewer"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml index 3b60c1c78d4..1cd2d2c0544 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesProject.xml @@ -1,35 +1,89 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_20130101_010203"/> + <permission_templates id="1" + name="default" + kee="default_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> <!-- default permission template for TRK --> - <permission_templates id="2" name="default_for_TRK" kee="default_for_trk_20130101_010203"/> + <permission_templates id="2" + name="default_for_TRK" + kee="default_for_trk_20130101_010203"/> - <perm_templates_groups id="6" template_id="2" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="7" template_id="2" group_id="101" permission_reference="admin"/> - <perm_templates_groups id="8" template_id="2" group_id="100" permission_reference="user"/> - <perm_templates_groups id="9" template_id="2" group_id="100" permission_reference="codeviewer"/> - <perm_templates_groups id="10" template_id="2" group_id="[null]" permission_reference="codeviewer"/> + <perm_templates_groups id="6" + template_id="2" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="7" + template_id="2" + group_id="101" + permission_reference="admin"/> + <perm_templates_groups id="8" + template_id="2" + group_id="100" + permission_reference="user"/> + <perm_templates_groups id="9" + template_id="2" + group_id="100" + permission_reference="codeviewer"/> + <perm_templates_groups id="10" + template_id="2" + group_id="[null]" + permission_reference="codeviewer"/> - <perm_templates_users id="1" template_id="2" user_id="200" permission_reference="codeviewer"/> + <perm_templates_users id="1" + template_id="2" + user_id="200" + permission_reference="codeviewer"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml index 25fdc99252c..231a7cdd71a 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRolesSeveralPattern.xml @@ -1,30 +1,72 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <groups id="102" name="sonar-foos"/> - <groups id="103" name="sonar-bars"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <groups id="102" + name="sonar-foos"/> + <groups id="103" + name="sonar-bars"/> - <users id="200" login="foo" name="Foo" email="[null]" active="[true]"/> - <users id="201" login="bar" name="Bar" email="[null]" active="[true]"/> + <users id="200" + login="foo" + name="Foo" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="bar" + name="Bar" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default" key_pattern="[null]"/> + <permission_templates id="1" + name="default" + kee="default" + key_pattern="[null]"/> - <permission_templates id="2" name="Start with foo" kee="foo_tmpl" key_pattern="foo\..*"/> - <permission_templates id="3" name="Start with foo again" kee="foo2_tmpl" key_pattern="foo.*"/> + <permission_templates id="2" + name="Start with foo" + kee="foo_tmpl" + key_pattern="foo\..*"/> + <permission_templates id="3" + name="Start with foo again" + kee="foo2_tmpl" + key_pattern="foo.*"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> - <perm_templates_groups id="2" template_id="2" group_id="102" permission_reference="user"/> - <perm_templates_groups id="3" template_id="3" group_id="103" permission_reference="user"/> + <perm_templates_groups id="2" + template_id="2" + group_id="102" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="3" + group_id="103" + permission_reference="user"/> <perm_templates_users/> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml index ea9b6e062fc..fa6f0be4f65 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group-result.xml @@ -1,20 +1,45 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new rows : sonar-administrators (admin) --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> <!-- default permission template --> - <permission_templates id="1" name="default_template" kee="default_template_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> + <permission_templates id="1" + name="default_template" + kee="default_template_20130101_010203"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml index d1b61aa180c..0f911d4976e 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_unknown_group.xml @@ -1,19 +1,44 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for TRK --> - <permission_templates id="1" name="default_template" kee="default_template_20130101_010203"/> + <permission_templates id="1" + name="default_template" + kee="default_template_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="999" permission_reference="admin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="999" + permission_reference="admin"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml index 319040d44b5..eb800a9f517 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users-result.xml @@ -1,23 +1,56 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> - <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="disabled" + name="Disabled" + email="[null]" + active="[false]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new row : marius (admin) --> - <user_roles id="2" user_id="200" resource_id="123" role="admin"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="admin"/> <!-- default permission template for TRK --> - <permission_templates id="1" name="default_for_TRK" kee="default_for_trk_20130101_010203"/> + <permission_templates id="1" + name="default_for_TRK" + kee="default_for_trk_20130101_010203"/> - <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/> - <perm_templates_users id="2" template_id="1" user_id="201" permission_reference="admin"/> + <perm_templates_users id="1" + template_id="1" + user_id="200" + permission_reference="admin"/> + <perm_templates_users id="2" + template_id="1" + user_id="201" + permission_reference="admin"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml index 72a71613609..c56ed11a533 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantDefaultRoles_users.xml @@ -1,20 +1,50 @@ <dataset> - <projects id="123" kee="foo.project"/> + <projects id="123" + kee="foo.project"/> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> - <users id="201" login="disabled" name="Disabled" email="[null]" active="[false]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="disabled" + name="Disabled" + email="[null]" + active="[false]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- default permission template for TRK --> - <permission_templates id="1" name="default_for_TRK" kee="default_for_trk_20130101_010203"/> + <permission_templates id="1" + name="default_for_TRK" + kee="default_for_trk_20130101_010203"/> - <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/> - <perm_templates_users id="2" template_id="1" user_id="201" permission_reference="admin"/> + <perm_templates_users id="1" + template_id="1" + user_id="200" + permission_reference="admin"/> + <perm_templates_users id="2" + template_id="1" + user_id="201" + permission_reference="admin"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml index 7f154cd1915..0710211a205 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole-result.xml @@ -1,6 +1,13 @@ <dataset> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> - <user_roles user_id="200" resource_id="123" role="admin"/> + <user_roles user_id="200" + resource_id="123" + role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml index 24349836265..9b2062063ee 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/grantUserRole.xml @@ -1,3 +1,8 @@ <dataset> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml index 3d5f9a5ecf2..a24d8cb4f1e 100644 --- a/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/core/resource/DefaultResourcePermissionsTest/hasRoles.xml @@ -1,16 +1,35 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- only_users --> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- only_groups --> - <group_roles id="1" group_id="100" resource_id="2" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="2" + role="admin"/> <!-- groups_and_users --> - <group_roles id="2" group_id="101" resource_id="3" role="user"/> - <user_roles id="2" user_id="200" resource_id="3" role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="3" + role="user"/> + <user_roles id="2" + user_id="200" + resource_id="3" + role="admin"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml index c348e3daa47..ef64957570f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForAnonymous.xml @@ -1,50 +1,56 @@ <dataset> - <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + <users id="42" + login="obiwan" + name="Obiwan" + email="obiwan@keno.bi" + created_at="1418215735482" + updated_at="1418215735482" + active="[true]" + is_root="[false]"/> <dashboards - id="1" - user_id="1" - name="My Dashboard" - description="Dashboard shared by admin" - column_layout="100%" - shared="[true]" - /> + id="1" + user_id="1" + name="My Dashboard" + description="Dashboard shared by admin" + column_layout="100%" + shared="[true]" + /> <dashboards - id="2" - user_id="[null]" - name="Default Dashboard" - description="Dashboard provided by system" - column_layout="100%" - shared="[true]" - /> + id="2" + user_id="[null]" + name="Default Dashboard" + description="Dashboard provided by system" + column_layout="100%" + shared="[true]" + /> <dashboards - id="4" - user_id="[null]" - name="User Dashboard" - description="Won't appear, not anonymous" - column_layout="100%" - shared="[true]" - /> + id="4" + user_id="[null]" + name="User Dashboard" + description="Won't appear, not anonymous" + column_layout="100%" + shared="[true]" + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards - id="1" - dashboard_id="1" - user_id="[null]" - order_index="2"/> + id="1" + dashboard_id="1" + user_id="[null]" + order_index="2"/> <!-- Dashboard with ID 2 appears before ID 1 --> <active_dashboards - id="2" - dashboard_id="2" - user_id="[null]" - order_index="1"/> + id="2" + dashboard_id="2" + user_id="[null]" + order_index="1"/> <!-- Dashboard with ID 4 does not appear (not anonymous) --> <active_dashboards - id="4" - dashboard_id="4" - user_id="42" - order_index="1"/> + id="4" + dashboard_id="4" + user_id="42" + order_index="1"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml index 12889562e42..5b57ddfa5d5 100644 --- a/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml +++ b/sonar-db/src/test/resources/org/sonar/db/dashboard/ActiveDashboardDaoTest/shouldSelectDashboardsForUser.xml @@ -1,66 +1,78 @@ <dataset> - <users id="24" login="anakin" name="Anakin" email="anakin@skywalk.er" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> - <users id="42" login="obiwan" name="Obiwan" email="obiwan@keno.bi" - created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + <users id="24" + login="anakin" + name="Anakin" + email="anakin@skywalk.er" + created_at="1418215735482" + updated_at="1418215735482" + active="[true]" + is_root="[false]"/> + <users id="42" + login="obiwan" + name="Obiwan" + email="obiwan@keno.bi" + created_at="1418215735482" + updated_at="1418215735482" + active="[true]" + is_root="[false]"/> <dashboards - id="1" - user_id="1" - name="My Dashboard" - description="Dashboard shared by admin" - column_layout="100%" - shared="[true]" - /> + id="1" + user_id="1" + name="My Dashboard" + description="Dashboard shared by admin" + column_layout="100%" + shared="[true]" + /> <dashboards - id="2" - user_id="[null]" - name="Default Dashboard" - description="Dashboard provided by system" - column_layout="100%" - shared="[true]" - /> + id="2" + user_id="[null]" + name="Default Dashboard" + description="Dashboard provided by system" + column_layout="100%" + shared="[true]" + /> <dashboards - id="4" - user_id="[null]" - name="Anonymous Dashboard" - description="Won't appear, anonymous" - column_layout="100%" - shared="[true]" - /> + id="4" + user_id="[null]" + name="Anonymous Dashboard" + description="Won't appear, anonymous" + column_layout="100%" + shared="[true]" + /> <dashboards - id="5" - user_id="[null]" - name="Another User Dashboard" - description="Won't appear, different user" - column_layout="100%" - shared="[true]" - /> + id="5" + user_id="[null]" + name="Another User Dashboard" + description="Won't appear, different user" + column_layout="100%" + shared="[true]" + /> <!-- Dashboard with ID 1 appears after ID 2 --> <active_dashboards - id="1" - dashboard_id="1" - user_id="42" - order_index="2"/> + id="1" + dashboard_id="1" + user_id="42" + order_index="2"/> <!-- Dashboard with ID 2 appears before ID 1 --> <active_dashboards - id="2" - dashboard_id="2" - user_id="42" - order_index="1"/> + id="2" + dashboard_id="2" + user_id="42" + order_index="1"/> <!-- Dashboard with ID 4 does not appear (anonymous) --> <active_dashboards - id="4" - dashboard_id="4" - user_id="[null]" - order_index="1"/> + id="4" + dashboard_id="4" + user_id="[null]" + order_index="1"/> <!-- Dashboard with ID 5 does not appear (another user) --> <active_dashboards - id="5" - dashboard_id="5" - user_id="24" - order_index="1"/> + id="5" + dashboard_id="5" + user_id="24" + order_index="1"/> </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 bd166a7e669..0162bcc8eed 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 @@ -1,11 +1,20 @@ <dataset> - <users id="10" login="anyone_user"/> + <users id="10" + login="anyone_user" + is_root="[false]"/> - <user_roles id="1" user_id="10" resource_id="[null]" role="user"/> + <user_roles id="1" + user_id="10" + resource_id="[null]" + role="user"/> - <groups_users user_id="10" group_id="[null]"/> + <groups_users user_id="10" + group_id="[null]"/> - <group_roles id="1" group_id="[null]" resource_id="[null]" role="profileadmin"/> + <group_roles id="1" + group_id="[null]" + resource_id="[null]" + role="profileadmin"/> </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 0ff49e9417c..3c277449e2c 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 @@ -1,18 +1,37 @@ <dataset> <!-- user 10 has no direct grant access, but is in the 'user' group 200 and in the 'admin' group 201 --> - <users id="10" login="john"/> + <users id="10" + login="john" + is_root="[false]"/> <!-- user 11 has no direct grant access, but is in the 'user' group 200 --> - <users id="11" login="arthur"/> + <users id="11" + login="arthur" + is_root="[false]"/> - <user_roles id="1" user_id="999" resource_id="[null]" role="user"/> - <user_roles id="2" user_id="999" resource_id="[null]" role="user"/> + <user_roles id="1" + user_id="999" + resource_id="[null]" + role="user"/> + <user_roles id="2" + user_id="999" + resource_id="[null]" + role="user"/> - <groups_users user_id="10" group_id="200"/> - <groups_users user_id="10" group_id="201"/> - <groups_users user_id="11" group_id="200"/> + <groups_users user_id="10" + group_id="200"/> + <groups_users user_id="10" + group_id="201"/> + <groups_users user_id="11" + group_id="200"/> - <group_roles id="1" group_id="200" resource_id="[null]" role="user"/> - <group_roles id="2" group_id="201" resource_id="[null]" role="admin"/> + <group_roles id="1" + group_id="200" + resource_id="[null]" + role="user"/> + <group_roles id="2" + group_id="201" + resource_id="[null]" + role="admin"/> </dataset> 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 5b8e83ba208..53dcd98975d 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 @@ -1,18 +1,39 @@ <dataset> <!-- user 10 has no group, but has direct role 'user' and 'admin' --> - <users id="10" login="john"/> + <users id="10" + login="john" + is_root="[false]"/> <!-- user 11 has no group, but has direct role 'user' --> - <users id="11" login="arthur"/> + <users id="11" + login="arthur" + is_root="[false]"/> - <user_roles id="1" user_id="10" resource_id="[null]" role="user"/> - <user_roles id="2" user_id="10" resource_id="[null]" role="admin"/> - <user_roles id="3" user_id="11" resource_id="[null]" role="user"/> + <user_roles id="1" + user_id="10" + resource_id="[null]" + role="user"/> + <user_roles id="2" + user_id="10" + resource_id="[null]" + role="admin"/> + <user_roles id="3" + user_id="11" + resource_id="[null]" + role="user"/> - <groups_users user_id="999" group_id="200"/> - <groups_users user_id="999" group_id="201"/> + <groups_users user_id="999" + group_id="200"/> + <groups_users user_id="999" + group_id="201"/> - <group_roles id="200" group_id="200" resource_id="[null]" role="user"/> - <group_roles id="201" group_id="200" resource_id="[null]" role="admin"/> + <group_roles id="200" + group_id="200" + resource_id="[null]" + role="user"/> + <group_roles id="201" + group_id="200" + resource_id="[null]" + role="admin"/> </dataset> 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 617ffffe38e..0c945ecfc5d 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,39 +1,110 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> - <users id="201" login="janette" name="Janette" email="[null]" active="[true]"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="janette" + name="Janette" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> - <group_roles id="4" group_id="101" resource_id="123" role="user"/> - <group_roles id="5" group_id="[null]" resource_id="123" role="user"/> - <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/> - <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/> - <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="4" + group_id="101" + resource_id="123" + role="user"/> + <group_roles id="5" + group_id="[null]" + resource_id="123" + role="user"/> + <group_roles id="6" + group_id="101" + resource_id="123" + role="codeviewer"/> + <group_roles id="7" + group_id="[null]" + resource_id="123" + role="codeviewer"/> + <group_roles id="8" + group_id="100" + resource_id="123" + role="issueadmin"/> <!-- new user permission : marius (admin) & janette (user) --> - <user_roles id="2" user_id="200" resource_id="123" role="admin"/> - <user_roles id="3" user_id="201" resource_id="123" role="admin"/> - <user_roles id="4" user_id="201" resource_id="123" role="user"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="admin"/> + <user_roles id="3" + user_id="201" + resource_id="123" + role="admin"/> + <user_roles id="4" + user_id="201" + resource_id="123" + role="user"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_20130101_010203"/> + <permission_templates id="1" + name="default" + kee="default_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> - <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> + <perm_templates_groups id="6" + template_id="1" + group_id="100" + permission_reference="issueadmin"/> - <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/> + <perm_templates_users id="1" + template_id="1" + user_id="200" + permission_reference="admin"/> </dataset> 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 f73214a0ce6..69ef3dc8a0a 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 @@ -26,12 +26,14 @@ login="marius" name="Marius" email="[null]" - active="[true]"/> + active="[true]" + is_root="[false]"/> <users id="201" login="janette" name="Janette" email="[null]" - active="[true]"/> + active="[true]" + is_root="[false]"/> <!-- on other resources --> <group_roles 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 3eeec0d08bf..14f030dfe78 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,37 +1,102 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> - <users id="201" login="janette" name="Janette" email="[null]" active="[true]"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> + <users id="201" + login="janette" + name="Janette" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> - <group_roles id="4" group_id="101" resource_id="123" role="user"/> - <group_roles id="5" group_id="[null]" resource_id="123" role="user"/> - <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/> - <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/> - <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="4" + group_id="101" + resource_id="123" + role="user"/> + <group_roles id="5" + group_id="[null]" + resource_id="123" + role="user"/> + <group_roles id="6" + group_id="101" + resource_id="123" + role="codeviewer"/> + <group_roles id="7" + group_id="[null]" + resource_id="123" + role="codeviewer"/> + <group_roles id="8" + group_id="100" + resource_id="123" + role="issueadmin"/> <!-- new user permission : marius (admin) & janette (user) --> - <user_roles id="2" user_id="200" resource_id="123" role="admin"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_20130101_010203"/> + <permission_templates id="1" + name="default" + kee="default_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> - <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> + <perm_templates_groups id="6" + template_id="1" + group_id="100" + permission_reference="issueadmin"/> - <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/> + <perm_templates_users id="1" + template_id="1" + user_id="200" + permission_reference="admin"/> </dataset> 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 ebbe1126bfd..fbb7723c0b9 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 @@ -25,7 +25,8 @@ login="marius" name="Marius" email="[null]" - active="[true]"/> + active="[true]" + is_root="[false]"/> <!-- on other resources --> <group_roles id="1" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission-result.xml index 242b2056066..893a26c346e 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission-result.xml @@ -1,13 +1,34 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <user_roles id="1" user_id="200" resource_id="123" role="user"/> - <user_roles id="2" user_id="200" resource_id="123" role="admin"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="user"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="admin"/> - <projects id="100" root_id="[null]" scope="PRJ" qualifier="TRK" kee="org.struts:struts" name="Struts" - description="the description" long_name="Apache Struts" - enabled="[true]" language="java" copy_component_uuid="[null]" developer_uuid="[null]" path="[null]" + <projects id="100" + root_id="[null]" + scope="PRJ" + qualifier="TRK" + kee="org.struts:struts" + name="Struts" + description="the description" + long_name="Apache Struts" + enabled="[true]" + language="java" + copy_component_uuid="[null]" + developer_uuid="[null]" + path="[null]" authorization_updated_at="123456789"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission.xml index e2b447b0064..d05c847f70f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_add_user_permission.xml @@ -4,7 +4,8 @@ login="dave.loper" name="Dave Loper" email="dave.loper@company.net" - active="[true]"/> + active="[true]" + is_root="[false]"/> <user_roles id="1" user_id="200" 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 b70b4ac31a0..0bfd094f5e9 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,36 +1,96 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!-- on other resources --> - <group_roles id="1" group_id="100" resource_id="1" role="admin"/> - <group_roles id="2" group_id="101" resource_id="1" role="user"/> - <user_roles id="1" user_id="200" resource_id="1" role="admin"/> + <group_roles id="1" + group_id="100" + resource_id="1" + role="admin"/> + <group_roles id="2" + group_id="101" + resource_id="1" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="1" + role="admin"/> <!-- new groups permissions : sonar-administrators (admin), sonar-users (user & codeviewer), Anyone (user & codeviewer) --> - <group_roles id="3" group_id="100" resource_id="123" role="admin"/> - <group_roles id="4" group_id="101" resource_id="123" role="user"/> - <group_roles id="5" group_id="[null]" resource_id="123" role="user"/> - <group_roles id="6" group_id="101" resource_id="123" role="codeviewer"/> - <group_roles id="7" group_id="[null]" resource_id="123" role="codeviewer"/> - <group_roles id="8" group_id="100" resource_id="123" role="issueadmin"/> + <group_roles id="3" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="4" + group_id="101" + resource_id="123" + role="user"/> + <group_roles id="5" + group_id="[null]" + resource_id="123" + role="user"/> + <group_roles id="6" + group_id="101" + resource_id="123" + role="codeviewer"/> + <group_roles id="7" + group_id="[null]" + resource_id="123" + role="codeviewer"/> + <group_roles id="8" + group_id="100" + resource_id="123" + role="issueadmin"/> <!-- new user permission : marius (admin) --> - <user_roles id="2" user_id="200" resource_id="123" role="admin"/> + <user_roles id="2" + user_id="200" + resource_id="123" + role="admin"/> <!-- default permission template for all qualifiers --> - <permission_templates id="1" name="default" kee="default_20130101_010203"/> + <permission_templates id="1" + name="default" + kee="default_20130101_010203"/> - <perm_templates_groups id="1" template_id="1" group_id="100" permission_reference="admin"/> - <perm_templates_groups id="2" template_id="1" group_id="101" permission_reference="user"/> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="user"/> - <perm_templates_groups id="4" template_id="1" group_id="101" permission_reference="codeviewer"/> - <perm_templates_groups id="5" template_id="1" group_id="[null]" permission_reference="codeviewer"/> - <perm_templates_groups id="6" template_id="1" group_id="100" permission_reference="issueadmin"/> + <perm_templates_groups id="1" + template_id="1" + group_id="100" + permission_reference="admin"/> + <perm_templates_groups id="2" + template_id="1" + group_id="101" + permission_reference="user"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="user"/> + <perm_templates_groups id="4" + template_id="1" + group_id="101" + permission_reference="codeviewer"/> + <perm_templates_groups id="5" + template_id="1" + group_id="[null]" + permission_reference="codeviewer"/> + <perm_templates_groups id="6" + template_id="1" + group_id="100" + permission_reference="issueadmin"/> - <perm_templates_users id="1" template_id="1" user_id="200" permission_reference="admin"/> + <perm_templates_users id="1" + template_id="1" + user_id="200" + permission_reference="admin"/> </dataset> 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 d8dd2c0fbed..49d49e682df 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 @@ -26,7 +26,8 @@ login="marius" name="Marius" email="[null]" - active="[true]"/> + active="[true]" + is_root="[false]"/> <!-- on other resources --> <group_roles 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 aea672478c6..87111255fcc 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 @@ -1,11 +1,23 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> - <user_roles id="1" user_id="200" resource_id="123" role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="user"/> - <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission-result.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission-result.xml index e2b447b0064..d05c847f70f 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission-result.xml @@ -4,7 +4,8 @@ login="dave.loper" name="Dave Loper" email="dave.loper@company.net" - active="[true]"/> + active="[true]" + is_root="[false]"/> <user_roles id="1" user_id="200" diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission.xml b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission.xml index c6386d5c4cf..4cdf709a435 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/PermissionRepositoryTest/should_delete_user_permission.xml @@ -4,7 +4,8 @@ login="dave.loper" name="Dave Loper" email="dave.loper@company.net" - active="[true]"/> + active="[true]" + is_root="[false]"/> <user_roles id="1" user_id="200" 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 38def462ed1..5b08aed9395 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 @@ -1,11 +1,17 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> <user_roles/> <group_roles/> -</dataset>
\ No newline at end of file +</dataset> 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 aea672478c6..87111255fcc 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 @@ -1,11 +1,23 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> - <user_roles id="1" user_id="200" resource_id="123" role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="user"/> - <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</dataset> 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 ab25dd40192..d6c387efb80 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 @@ -1,10 +1,22 @@ <dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" - created_at="[null]" updated_at="[null]"/> + <permission_templates id="1" + name="my template" + kee="my_template_20130102_030405" + description="my description" + created_at="[null]" + updated_at="[null]"/> - <users id="1" login="user1" name="user1"/> - <users id="2" login="user2" name="user2"/> + <users id="1" + login="user1" + name="user1" + is_root="[false]"/> + <users id="2" + login="user2" + name="user2" + is_root="[false]"/> - <groups id="1" name="group1"/> - <groups id="2" name="group2"/> + <groups id="1" + name="group1"/> + <groups id="2" + name="group2"/> </dataset> 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 2c82c31400e..c3301093db9 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 @@ -1,21 +1,54 @@ <dataset> - <permission_templates id="1" name="my template" kee="my_template_20130102_030405" description="my description" - created_at="[null]" updated_at="[null]"/> + <permission_templates id="1" + name="my template" + kee="my_template_20130102_030405" + description="my description" + created_at="[null]" + updated_at="[null]"/> - <perm_templates_users id="1" template_id="1" user_id="1" permission_reference="user_permission1"/> - <perm_templates_users id="2" template_id="1" user_id="2" permission_reference="user_permission1"/> - <perm_templates_users id="3" template_id="1" user_id="2" permission_reference="user_permission2"/> + <perm_templates_users id="1" + template_id="1" + user_id="1" + permission_reference="user_permission1"/> + <perm_templates_users id="2" + template_id="1" + user_id="2" + permission_reference="user_permission1"/> + <perm_templates_users id="3" + template_id="1" + user_id="2" + permission_reference="user_permission2"/> - <users id="1" login="login1" name="user1"/> - <users id="2" login="login2" name="user2"/> + <users id="1" + login="login1" + name="user1" + is_root="[false]"/> + <users id="2" + login="login2" + name="user2" + is_root="[false]"/> - <perm_templates_groups id="1" template_id="1" group_id="1" permission_reference="group_permission1"/> - <perm_templates_groups id="2" template_id="1" group_id="2" permission_reference="group_permission1"/> + <perm_templates_groups id="1" + template_id="1" + group_id="1" + permission_reference="group_permission1"/> + <perm_templates_groups id="2" + template_id="1" + group_id="2" + permission_reference="group_permission1"/> <!-- Anyone group --> - <perm_templates_groups id="3" template_id="1" group_id="[null]" permission_reference="group_permission2"/> + <perm_templates_groups id="3" + template_id="1" + group_id="[null]" + permission_reference="group_permission2"/> <!-- Unmatched group --> - <perm_templates_groups id="4" template_id="1" group_id="999999" permission_reference="group_permission2"/> + <perm_templates_groups id="4" + template_id="1" + group_id="999999" + permission_reference="group_permission2"/> - <groups id="1" name="group1"/> - <groups id="2" name="group2"/> + <groups id="1" + name="group1"/> + <groups id="2" + name="group2"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml index 14833919475..07574c24e02 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/select_only_enable_users.xml @@ -1,14 +1,42 @@ <dataset> - <users id="200" login="user1" name="User1" active="[true]"/> - <users id="201" login="user2" name="User2" active="[true]"/> - <users id="202" login="user3" name="User3" active="[true]"/> - <users id="999" login="disabledUser" name="disabledUser" active="[false]"/> + <users id="200" + login="user1" + name="User1" + active="[true]" + is_root="[false]"/> + <users id="201" + login="user2" + name="User2" + active="[true]" + is_root="[false]"/> + <users id="202" + login="user3" + name="User3" + active="[true]" + is_root="[false]"/> + <users id="999" + login="disabledUser" + name="disabledUser" + active="[false]" + is_root="[false]"/> - <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/> - <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/> - <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/> + <perm_templates_users id="1" + user_id="200" + permission_reference="user" + template_id="50"/> + <perm_templates_users id="2" + user_id="200" + permission_reference="admin" + template_id="50"/> + <perm_templates_users id="3" + user_id="200" + permission_reference="codeviewer" + template_id="50"/> - <perm_templates_users id="4" user_id="201" permission_reference="user" template_id="50"/> + <perm_templates_users id="4" + user_id="201" + permission_reference="user" + template_id="50"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions.xml b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions.xml index 6670f5ca21c..528d308bd52 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions.xml @@ -1,14 +1,41 @@ <dataset> - <users id="200" login="user1" name="User1" active="[true]"/> - <users id="201" login="user2" name="User2" active="[true]"/> - <users id="202" login="user3" name="User3" active="[true]"/> + <users id="200" + login="user1" + name="User1" + active="[true]" + is_root="[false]"/> + <users id="201" + login="user2" + name="User2" + active="[true]" + is_root="[false]"/> + <users id="202" + login="user3" + name="User3" + active="[true]" + is_root="[false]"/> - <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/> - <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/> - <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/> - <perm_templates_users id="4" user_id="200" permission_reference="user" template_id="51"/> + <perm_templates_users id="1" + user_id="200" + permission_reference="user" + template_id="50"/> + <perm_templates_users id="2" + user_id="200" + permission_reference="admin" + template_id="50"/> + <perm_templates_users id="3" + user_id="200" + permission_reference="codeviewer" + template_id="50"/> + <perm_templates_users id="4" + user_id="200" + permission_reference="user" + template_id="51"/> - <perm_templates_users id="5" user_id="201" permission_reference="user" template_id="50"/> + <perm_templates_users id="5" + user_id="201" + permission_reference="user" + template_id="50"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml index fd8b981c203..ba020005237 100644 --- a/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml +++ b/sonar-db/src/test/resources/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest/users_with_permissions_should_be_sorted_by_user_name.xml @@ -1,13 +1,37 @@ <dataset> - <users id="200" login="user3" name="User3" active="[true]"/> - <users id="201" login="user1" name="User1" active="[true]"/> - <users id="202" login="user2" name="User2" active="[true]"/> + <users id="200" + login="user3" + name="User3" + active="[true]" + is_root="[false]"/> + <users id="201" + login="user1" + name="User1" + active="[true]" + is_root="[false]"/> + <users id="202" + login="user2" + name="User2" + active="[true]" + is_root="[false]"/> - <perm_templates_users id="1" user_id="200" permission_reference="user" template_id="50"/> - <perm_templates_users id="2" user_id="200" permission_reference="admin" template_id="50"/> - <perm_templates_users id="3" user_id="200" permission_reference="codeviewer" template_id="50"/> + <perm_templates_users id="1" + user_id="200" + permission_reference="user" + template_id="50"/> + <perm_templates_users id="2" + user_id="200" + permission_reference="admin" + template_id="50"/> + <perm_templates_users id="3" + user_id="200" + permission_reference="codeviewer" + template_id="50"/> - <perm_templates_users id="4" user_id="201" permission_reference="user" template_id="50"/> + <perm_templates_users id="4" + user_id="201" + permission_reference="user" + template_id="50"/> </dataset> 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 da498e192bd..a7dda4cf789 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 @@ -1,12 +1,33 @@ <dataset> - <groups id="1" name="sonar-users" description="Sonar Users" created_at="2014-09-07" updated_at="2014-09-08"/> - <groups id="2" name="sonar-admins" description="Sonar Admins" created_at="2014-09-07" updated_at="2014-09-08"/> - <groups id="3" name="sonar-reviewers" description="Sonar Reviewers" created_at="2014-09-07" updated_at="2014-09-08"/> + <groups id="1" + name="sonar-users" + description="Sonar Users" + created_at="2014-09-07" + updated_at="2014-09-08"/> + <groups id="2" + name="sonar-admins" + description="Sonar Admins" + created_at="2014-09-07" + updated_at="2014-09-08"/> + <groups id="3" + name="sonar-reviewers" + description="Sonar Reviewers" + created_at="2014-09-07" + updated_at="2014-09-08"/> - <groups_users user_id="100" group_id="1"/> - <groups_users user_id="100" group_id="2"/> + <groups_users user_id="100" + group_id="1"/> + <groups_users user_id="100" + group_id="2"/> - <users id="100" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" active="[true]"/> + <users id="100" + login="john" + name="John" + email="jo@hn.com" + created_at="1418215735482" + updated_at="1418215735482" + 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 a882f396f6c..8ce3b02d646 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 @@ -1,19 +1,35 @@ <dataset> - <groups id="100" name="sonar-administrators" description="System administrators"/> - <groups id="101" name="sonar-users" description="Any new users created will automatically join this group"/> - <groups id="102" name="sonar-reviewers" description="Reviewers"/> + <groups id="100" + name="sonar-administrators" + description="System administrators"/> + <groups id="101" + name="sonar-users" + description="Any new users created will automatically join this group"/> + <groups id="102" + name="sonar-reviewers" + description="Reviewers"/> <!-- user 200 is in all groups --> - <groups_users user_id="200" group_id="100"/> - <groups_users user_id="200" group_id="101"/> - <groups_users user_id="200" group_id="102"/> + <groups_users user_id="200" + group_id="100"/> + <groups_users user_id="200" + group_id="101"/> + <groups_users user_id="200" + group_id="102"/> <!-- user 201 is in users group --> - <groups_users user_id="201" group_id="101"/> + <groups_users user_id="201" + group_id="101"/> - <users id="200" login="two-hundred"/> - <users id="201" login="two-hundred-one"/> - <users id="202" login="two-hundred-two"/> + <users id="200" + login="two-hundred" + is_root="[false]"/> + <users id="201" + login="two-hundred-one" + is_root="[false]"/> + <users id="202" + login="two-hundred-two" + is_root="[false]"/> </dataset> 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 36b89224326..83007bbe770 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 @@ -1,20 +1,44 @@ <dataset> - <groups id="100" name="sonar-administrators" description="System administrators"/> - <groups id="101" name="sonar-users" description="Any new users created will automatically join this group"/> - <groups id="102" name="sonar-reviewers" description="Reviewers"/> - <groups id="103" name="sonar-nobody" description="Nobody in this group"/> + <groups id="100" + name="sonar-administrators" + description="System administrators"/> + <groups id="101" + name="sonar-users" + description="Any new users created will automatically join this group"/> + <groups id="102" + name="sonar-reviewers" + description="Reviewers"/> + <groups id="103" + name="sonar-nobody" + description="Nobody in this group"/> <!-- user 200 is in all groups --> - <groups_users user_id="200" group_id="100"/> - <groups_users user_id="200" group_id="101"/> - <groups_users user_id="200" group_id="102"/> + <groups_users user_id="200" + group_id="100"/> + <groups_users user_id="200" + group_id="101"/> + <groups_users user_id="200" + group_id="102"/> <!-- user 201 is in users group --> - <groups_users user_id="201" group_id="101"/> + <groups_users user_id="201" + group_id="101"/> - <users id="200" login="admin" name="Admin" active="[true]"/> - <users id="201" login="not.admin" name="Not Admin" active="[true]"/> - <users id="202" login="inactive" name="Inactive" active="[false]"/> + <users id="200" + login="admin" + name="Admin" + active="[true]" + is_root="[false]"/> + <users id="201" + login="not.admin" + name="Not Admin" + active="[true]" + is_root="[false]"/> + <users id="202" + login="inactive" + name="Inactive" + active="[false]" + is_root="[false]"/> </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 aea672478c6..87111255fcc 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 @@ -1,11 +1,23 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> - <user_roles id="1" user_id="200" resource_id="123" role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="user"/> - <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</dataset> 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 38def462ed1..5b08aed9395 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 @@ -1,11 +1,17 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> <user_roles/> <group_roles/> -</dataset>
\ No newline at end of file +</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 aea672478c6..87111255fcc 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 @@ -1,11 +1,23 @@ <dataset> - <users id="200" login="dave.loper" name="Dave Loper" email="dave.loper@company.net" active="[true]"/> + <users id="200" + login="dave.loper" + name="Dave Loper" + email="dave.loper@company.net" + active="[true]" + is_root="[false]"/> - <groups id="100" name="devs"/> + <groups id="100" + name="devs"/> - <user_roles id="1" user_id="200" resource_id="123" role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="user"/> - <group_roles id="1" group_id="100" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</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 ec1ed3b076f..6a6ef25983a 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,14 +1,36 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> - <group_roles id="1" group_id="100" resource_id="123" role="admin"/> - <group_roles id="2" group_id="[null]" resource_id="123" role="user"/> - <user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="2" + group_id="[null]" + resource_id="123" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="codeviewer"/> <!-- other resource --> - <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/> - <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/> + <group_roles id="3" + group_id="101" + resource_id="999" + role="codeviewer"/> + <user_roles id="2" + user_id="200" + resource_id="999" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</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 dae82ddd8f8..82a63b36e48 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,14 +1,27 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> <!--<group_roles id="1" group_id="100" resource_id="123" role="admin"/>--> <!--<group_roles id="2" group_id="[null]" resource_id="123" role="user"/>--> <!--<user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/>--> <!-- other resource --> - <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/> - <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/> + <group_roles id="3" + group_id="101" + resource_id="999" + role="codeviewer"/> + <user_roles id="2" + user_id="200" + resource_id="999" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</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 ec1ed3b076f..6a6ef25983a 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,14 +1,36 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> - <group_roles id="1" group_id="100" resource_id="123" role="admin"/> - <group_roles id="2" group_id="[null]" resource_id="123" role="user"/> - <user_roles id="1" user_id="200" resource_id="123" role="codeviewer"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="2" + group_id="[null]" + resource_id="123" + role="user"/> + <user_roles id="1" + user_id="200" + resource_id="123" + role="codeviewer"/> <!-- other resource --> - <group_roles id="3" group_id="101" resource_id="999" role="codeviewer"/> - <user_roles id="2" user_id="200" resource_id="999" role="codeviewer"/> + <group_roles id="3" + group_id="101" + resource_id="999" + role="codeviewer"/> + <user_roles id="2" + user_id="200" + resource_id="999" + role="codeviewer"/> -</dataset>
\ No newline at end of file +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml index 48a22e18834..615725e27d6 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles-result.xml @@ -1,10 +1,23 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> - <group_roles id="1" group_id="100" resource_id="123" role="admin"/> - <group_roles id="2" group_id="[null]" resource_id="123" role="user"/> + <group_roles id="1" + group_id="100" + resource_id="123" + role="admin"/> + <group_roles id="2" + group_id="[null]" + resource_id="123" + role="user"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml index b99df83bc15..87b54d7b355 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/RoleMapperTest/insertRoles.xml @@ -1,5 +1,12 @@ <dataset> - <groups id="100" name="sonar-administrators"/> - <groups id="101" name="sonar-users"/> - <users id="200" login="marius" name="Marius" email="[null]" active="[true]"/> -</dataset>
\ No newline at end of file + <groups id="100" + name="sonar-administrators"/> + <groups id="101" + name="sonar-users"/> + <users id="200" + login="marius" + name="Marius" + email="[null]" + active="[true]" + is_root="[false]"/> +</dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/exists_by_email.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/exists_by_email.xml index 5a54ec22958..63dd4a57e8d 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/exists_by_email.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/exists_by_email.xml @@ -1,8 +1,26 @@ <dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts=" ma marius33 " created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts=" ma marius33 " + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + <users id="102" + login="sbrandhof" + name="Simon Brandhof" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts="[null]" + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml index 621e018f88b..a15c10259bc 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/insert-result.xml @@ -1,4 +1,10 @@ <dataset> - <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" - active="[true]"/> + <users id="1" + login="john" + name="John" + email="jo@hn.com" + created_at="1418215735482" + updated_at="1418215735482" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml index dc029ad46d6..aa0b64fadf2 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectActiveUserByLogin.xml @@ -1,14 +1,32 @@ <dataset> <!-- inactive --> - <users id="50" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[false]"/> + <users id="50" + login="inactive_user" + name="Disabled" + email="inactive@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[false]" + is_root="[false]"/> <!-- active --> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> - <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="102" + login="jcdus" + name="Jean-Claude Dus" + email="jcdus@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByIds.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByIds.xml index 3be84a27b69..65e155941df 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByIds.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByIds.xml @@ -1,9 +1,27 @@ <dataset> - <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[false]"/> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> - <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="100" + login="inactive_user" + name="Disabled" + email="inactive@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[false]" + is_root="[false]"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> + <users id="102" + login="jcdus" + name="Jean-Claude Dus" + email="jcdus@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml index 3be84a27b69..65e155941df 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByLogins.xml @@ -1,9 +1,27 @@ <dataset> - <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[false]"/> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> - <users id="102" login="jcdus" name="Jean-Claude Dus" email="jcdus@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="100" + login="inactive_user" + name="Disabled" + email="inactive@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[false]" + is_root="[false]"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> + <users id="102" + login="jcdus" + name="Jean-Claude Dus" + email="jcdus@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml index 7107ad4ed36..8f6bacd7c43 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByQuery.xml @@ -1,7 +1,19 @@ <dataset> - <users id="100" login="inactive_user" name="Disabled" email="inactive@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[false]"/> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="100" + login="inactive_user" + name="Disabled" + email="inactive@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[false]" + is_root="[false]"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml index 1c685cc787c..89b1302e298 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/selectUsersByText.xml @@ -1,7 +1,19 @@ <dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" created_at="1418215735482" - updated_at="1418215735485" active="[true]"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> + <users id="102" + login="sbrandhof" + name="Simon Brandhof" + email="marius@lesbronzes.fr" + created_at="1418215735482" + updated_at="1418215735485" + active="[true]" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_by_login.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_by_login.xml index 5a54ec22958..d07ecce8728 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_by_login.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_by_login.xml @@ -1,8 +1,26 @@ <dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts=" ma marius33 " created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/> + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts=" ma marius33 " + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + <users id="102" + login="sbrandhof" + name="Simon Brandhof" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts="[null]" + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh" + is_root="[true]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account.xml index 1a5f244b365..3ded656c9f4 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account.xml @@ -1,9 +1,26 @@ <dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts=" ma marius33 " created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="sbrandhof@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts=" ma marius33 " + created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/> + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + <users id="102" + login="sbrandhof" + name="Simon Brandhof" + email="sbrandhof@lesbronzes.fr" + active="[true]" + scm_accounts="[null]" + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account_return_many_results_when_same_email_is_used_by_many_users.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account_return_many_results_when_same_email_is_used_by_many_users.xml index 41fe9478740..63dd4a57e8d 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account_return_many_results_when_same_email_is_used_by_many_users.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/select_nullable_by_scm_account_return_many_results_when_same_email_is_used_by_many_users.xml @@ -1,9 +1,26 @@ <dataset> - <users id="101" login="marius" name="Marius" email="marius@lesbronzes.fr" active="[true]" scm_accounts=" ma marius33 " created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"/> - <users id="102" login="sbrandhof" name="Simon Brandhof" email="marius@lesbronzes.fr" active="[true]" scm_accounts="[null]" created_at="1418215735482" + <users id="101" + login="marius" + name="Marius" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts=" ma marius33 " + created_at="1418215735482" updated_at="1418215735485" - salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh"/> + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + <users id="102" + login="sbrandhof" + name="Simon Brandhof" + email="marius@lesbronzes.fr" + active="[true]" + scm_accounts="[null]" + created_at="1418215735482" + updated_at="1418215735485" + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8366" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fh" + is_root="[false]"/> </dataset> diff --git a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml index 621e018f88b..a15c10259bc 100644 --- a/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml +++ b/sonar-db/src/test/resources/org/sonar/db/user/UserDaoTest/update_user.xml @@ -1,4 +1,10 @@ <dataset> - <users id="1" login="john" name="John" email="jo@hn.com" created_at="1418215735482" updated_at="1418215735482" - active="[true]"/> + <users id="1" + login="john" + name="John" + email="jo@hn.com" + created_at="1418215735482" + updated_at="1418215735482" + active="[true]" + is_root="[false]"/> </dataset> |