From 1302c99f06505aa39720da0456445f0f27bd807e Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 3 Oct 2016 15:13:22 +0200 Subject: [PATCH] SONAR-8155 support root in UserDto, UserDao and UTs --- .../no_authorization.xml | 3 +- .../IssueAuthorizationDaoTest/shared.xml | 6 +- .../IssueAuthorizationIndexerTest/index.xml | 3 +- .../user/DeprecatedUserFinderTest/fixture.xml | 12 +- .../fail_to_create_user_if_already_exists.xml | 13 +- ..._default_groups_when_reactivating_user.xml | 26 +++- ...iate_default_groups_when_updating_user.xml | 17 ++- ..._user_when_scm_account_is_already_used.xml | 17 ++- ...m_account_is_already_used_by_many_user.xml | 34 +++-- ...ail_to_reactivate_user_if_not_disabled.xml | 17 ++- ..._user_when_scm_account_is_already_used.xml | 34 +++-- ...when_updating_user_if_already_existing.xml | 26 +++- .../user/UserUpdaterTest/reactivate_user.xml | 17 ++- .../reactivate_user_not_having_password.xml | 17 ++- .../UserUpdaterTest/update_technical_user.xml | 17 ++- .../user/UserUpdaterTest/update_user.xml | 17 ++- .../user/index/UserIndexerTest/index.xml | 8 +- .../UserResultSetIteratorTest/shared.xml | 24 +++- .../main/java/org/sonar/db/user/UserDto.java | 16 +++ .../org/sonar/db/user/UserMapper.xml | 71 +++++++--- .../org/sonar/db/charset/SqlExecutorTest.java | 8 +- .../java/org/sonar/db/user/UserDaoTest.java | 22 ++-- .../grantDefaultRoles-result.xml | 85 +++++++++--- .../grantDefaultRoles.xml | 64 ++++++--- .../grantDefaultRolesPattern-result.xml | 79 +++++++++--- .../grantDefaultRolesPattern.xml | 74 ++++++++--- .../grantDefaultRolesProject-result.xml | 122 ++++++++++++++---- .../grantDefaultRolesProject.xml | 94 +++++++++++--- .../grantDefaultRolesSeveralPattern.xml | 74 ++++++++--- ...grantDefaultRoles_unknown_group-result.xml | 45 +++++-- .../grantDefaultRoles_unknown_group.xml | 45 +++++-- .../grantDefaultRoles_users-result.xml | 57 ++++++-- .../grantDefaultRoles_users.xml | 52 ++++++-- .../grantUserRole-result.xml | 13 +- .../grantUserRole.xml | 7 +- .../hasRoles.xml | 35 +++-- .../shouldSelectDashboardsForAnonymous.xml | 76 ++++++----- .../shouldSelectDashboardsForUser.xml | 108 +++++++++------- ...rn_global_permissions_for_group_anyone.xml | 17 ++- ...should_return_group_global_permissions.xml | 37 ++++-- .../should_return_user_global_permissions.xml | 39 ++++-- ...ply_default_permission_template-result.xml | 119 +++++++++++++---- .../apply_default_permission_template.xml | 6 +- ...ission_template_by_component_id-result.xml | 109 ++++++++++++---- ...lt_permission_template_by_component_id.xml | 3 +- .../should_add_user_permission-result.xml | 33 ++++- .../should_add_user_permission.xml | 3 +- ...hould_apply_permission_template-result.xml | 102 ++++++++++++--- .../should_apply_permission_template.xml | 3 +- .../should_count_component_permissions.xml | 22 +++- .../should_delete_user_permission-result.xml | 3 +- .../should_delete_user_permission.xml | 3 +- .../should_remove_all_permissions-result.xml | 12 +- .../should_remove_all_permissions.xml | 22 +++- .../selectEmptyPermissionTemplate.xml | 24 +++- .../selectPermissionTemplate.xml | 59 +++++++-- .../select_only_enable_users.xml | 44 +++++-- .../users_with_permissions.xml | 43 ++++-- ...missions_should_be_sorted_by_user_name.xml | 38 +++++- .../user/GroupDaoTest/find_by_user_login.xml | 33 ++++- .../db/user/GroupMembershipDaoTest/shared.xml | 36 ++++-- .../shared_plus_empty_group.xml | 46 +++++-- .../should_count_component_permissions.xml | 22 +++- .../should_remove_all_permissions-result.xml | 12 +- .../should_remove_all_permissions.xml | 22 +++- .../db/user/RoleMapperTest/countRoles.xml | 40 ++++-- .../deleteRolesByResourceId-result.xml | 25 +++- .../deleteRolesByResourceId.xml | 40 ++++-- .../RoleMapperTest/insertRoles-result.xml | 23 +++- .../db/user/RoleMapperTest/insertRoles.xml | 15 ++- .../db/user/UserDaoTest/exists_by_email.xml | 26 +++- .../db/user/UserDaoTest/insert-result.xml | 10 +- .../UserDaoTest/selectActiveUserByLogin.xml | 30 ++++- .../db/user/UserDaoTest/selectUsersByIds.xml | 30 ++++- .../user/UserDaoTest/selectUsersByLogins.xml | 30 ++++- .../user/UserDaoTest/selectUsersByQuery.xml | 20 ++- .../db/user/UserDaoTest/selectUsersByText.xml | 20 ++- .../db/user/UserDaoTest/select_by_login.xml | 26 +++- .../select_nullable_by_scm_account.xml | 25 +++- ..._when_same_email_is_used_by_many_users.xml | 25 +++- .../sonar/db/user/UserDaoTest/update_user.xml | 10 +- 81 files changed, 2119 insertions(+), 643 deletions(-) diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/no_authorization.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/no_authorization.xml index 870e665683f..2145b3a4cf9 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/no_authorization.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/no_authorization.xml @@ -24,7 +24,8 @@ login="user1" name="User 1" email="user1@company.net" - active="[true]"/> + active="[true]" + is_root="[false]"/> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/shared.xml index fd8f98276bb..a360a813b0c 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/index/IssueAuthorizationDaoTest/shared.xml @@ -41,7 +41,8 @@ login="user1" name="User 1" email="user1@company.net" - active="[true]"/> + active="[true]" + is_root="[false]"/> + active="[true]" + is_root="[false]"/> + active="[true]" + is_root="[false]"/> - - + + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserCreatorTest/fail_to_create_user_if_already_exists.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserCreatorTest/fail_to_create_user_if_already_exists.xml index 926b75324ad..b2dce4244c1 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserCreatorTest/fail_to_create_user_if_already_exists.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserCreatorTest/fail_to_create_user_if_already_exists.xml @@ -1,6 +1,15 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_reactivating_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_reactivating_user.xml index 40485114bc3..d2470c724ab 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_reactivating_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_reactivating_user.xml @@ -1,12 +1,26 @@ - + - + - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_updating_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_updating_user.xml index 146d6a2893c..08f40c9808e 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_updating_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/associate_default_groups_when_updating_user.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used.xml index c7ed6aa3f75..f36944db0b4 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used_by_many_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used_by_many_user.xml index e44742a1dfb..b65100a6f01 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used_by_many_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_create_user_when_scm_account_is_already_used_by_many_user.xml @@ -1,13 +1,31 @@ - + - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_reactivate_user_if_not_disabled.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_reactivate_user_if_not_disabled.xml index 146d6a2893c..08f40c9808e 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_reactivate_user_if_not_disabled.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_reactivate_user_if_not_disabled.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_update_user_when_scm_account_is_already_used.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_update_user_when_scm_account_is_already_used.xml index 9704668e7ab..a10f24b645c 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_update_user_when_scm_account_is_already_used.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/fail_to_update_user_when_scm_account_is_already_used.xml @@ -1,12 +1,30 @@ - - + + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/not_associate_default_group_when_updating_user_if_already_existing.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/not_associate_default_group_when_updating_user_if_already_existing.xml index 7b3b2790fee..ea65c7abcfd 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/not_associate_default_group_when_updating_user_if_already_existing.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/not_associate_default_group_when_updating_user_if_already_existing.xml @@ -1,12 +1,26 @@ - + - + - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user.xml index 372d5dbc4e9..67e879dd473 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user_not_having_password.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user_not_having_password.xml index adcf3cffccf..bdb52c47db6 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user_not_having_password.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/reactivate_user_not_having_password.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_technical_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_technical_user.xml index 520f8830560..69c94f84f98 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_technical_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_technical_user.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_user.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_user.xml index 146d6a2893c..08f40c9808e 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_user.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/UserUpdaterTest/update_user.xml @@ -1,8 +1,17 @@ - + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserIndexerTest/index.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserIndexerTest/index.xml index 013dd721b60..5ff55705813 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserIndexerTest/index.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserIndexerTest/index.xml @@ -1,9 +1,13 @@ - + is_root="[false]"/> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserResultSetIteratorTest/shared.xml index 077fc76c2ee..6af8bdfcb84 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserResultSetIteratorTest/shared.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/user/index/UserResultSetIteratorTest/shared.xml @@ -1,23 +1,35 @@ - + is_root="[false]"/> - + is_root="[false]"/> - + is_root="[false]"/> diff --git a/sonar-db/src/main/java/org/sonar/db/user/UserDto.java b/sonar-db/src/main/java/org/sonar/db/user/UserDto.java index 826317bcc87..df3d9e02726 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/UserDto.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserDto.java @@ -50,6 +50,7 @@ public class UserDto { private Long createdAt; private Long updatedAt; private boolean local = true; + private boolean root = false; public Long getId() { return id; @@ -201,6 +202,21 @@ public class UserDto { return this; } + public boolean isRoot() { + return root; + } + + /** + * Setters is not accessible as dedicated requests must be used to update the root flag of a user: + *
    + *
  • a user can not be created root
    • + *
  • the generic update method of a user can not change its root flag
    • + *
+ */ + private void setRoot(boolean root) { + this.root = root; + } + public static String encryptPassword(String password, String salt) { requireNonNull(password, "Password cannot be empty"); requireNonNull(salt, "Salt cannot be empty"); diff --git a/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml index 0f79a72e840..2501f68c68f 100644 --- a/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/user/UserMapper.xml @@ -15,6 +15,7 @@ u.external_identity as "externalIdentity", u.external_identity_provider as "externalIdentityProvider", u.user_local as "local", + u.is_root as "root", u.created_at as "createdAt", u.updated_at as "updatedAt" @@ -145,28 +146,66 @@ - UPDATE users SET active=${_false}, email=null, scm_accounts=null, - external_identity=null, external_identity_provider=null, - salt=null, crypted_password=null, - updated_at=#{now,jdbcType=BIGINT} WHERE id=#{id} + UPDATE users SET + active=${_false}, + email=null, + scm_accounts=null, + external_identity=null, + external_identity_provider=null, + salt=null, + crypted_password=null, + updated_at=#{now,jdbcType=BIGINT} + WHERE + id=#{id} - INSERT INTO users (login, name, email, active, scm_accounts, external_identity, external_identity_provider, user_local, salt, crypted_password, created_at, updated_at) - VALUES (#{login,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{active,jdbcType=BOOLEAN}, - #{scmAccounts,jdbcType=VARCHAR}, #{externalIdentity,jdbcType=VARCHAR}, #{externalIdentityProvider,jdbcType=VARCHAR}, - #{local,jdbcType=BOOLEAN}, - #{salt,jdbcType=VARCHAR}, #{cryptedPassword,jdbcType=VARCHAR}, - #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) + INSERT INTO users ( + login, + name, + email, + active, + scm_accounts, + external_identity, + external_identity_provider, + user_local, + salt, + crypted_password, + is_root, + created_at, + updated_at + ) + VALUES ( + #{login,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{email,jdbcType=VARCHAR}, + #{active,jdbcType=BOOLEAN}, + #{scmAccounts,jdbcType=VARCHAR}, + #{externalIdentity,jdbcType=VARCHAR}, + #{externalIdentityProvider,jdbcType=VARCHAR}, + #{local,jdbcType=BOOLEAN}, + #{salt,jdbcType=VARCHAR}, + #{cryptedPassword,jdbcType=VARCHAR}, + #{root,jdbcType=BOOLEAN}, + #{createdAt,jdbcType=BIGINT}, + #{updatedAt,jdbcType=BIGINT} + ) - UPDATE users set name=#{name,jdbcType=VARCHAR}, email=#{email,jdbcType=VARCHAR}, active=#{active,jdbcType=BOOLEAN}, - scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, external_identity=#{externalIdentity,jdbcType=VARCHAR}, external_identity_provider=#{externalIdentityProvider,jdbcType=VARCHAR}, - user_local=#{local,jdbcType=BOOLEAN}, - salt=#{salt,jdbcType=VARCHAR}, crypted_password=#{cryptedPassword,jdbcType=BIGINT}, - updated_at=#{updatedAt,jdbcType=BIGINT} - WHERE login = #{login} + UPDATE users set + name=#{name,jdbcType=VARCHAR}, + email=#{email,jdbcType=VARCHAR}, + active=#{active,jdbcType=BOOLEAN}, + scm_accounts=#{scmAccounts,jdbcType=VARCHAR}, + external_identity=#{externalIdentity,jdbcType=VARCHAR}, + external_identity_provider=#{externalIdentityProvider,jdbcType=VARCHAR}, + user_local=#{local,jdbcType=BOOLEAN}, + salt=#{salt,jdbcType=VARCHAR}, + crypted_password=#{cryptedPassword,jdbcType=BIGINT}, + updated_at=#{updatedAt,jdbcType=BIGINT} + WHERE + login = #{login} diff --git a/sonar-db/src/test/java/org/sonar/db/charset/SqlExecutorTest.java b/sonar-db/src/test/java/org/sonar/db/charset/SqlExecutorTest.java index f107e2bb5c3..c9ac2e5594a 100644 --- a/sonar-db/src/test/java/org/sonar/db/charset/SqlExecutorTest.java +++ b/sonar-db/src/test/java/org/sonar/db/charset/SqlExecutorTest.java @@ -19,7 +19,6 @@ */ package org.sonar.db.charset; -import com.google.common.collect.ImmutableMap; import java.sql.Connection; import java.util.List; import java.util.Map; @@ -38,6 +37,7 @@ public class SqlExecutorTest { private static final String LOGIN_DB_COLUMN = "login"; private static final String NAME_DB_COLUMN = "name"; private static final String USERS_DB_TABLE = "users"; + private static final String IS_ROOT_DB_COLUMN = "is_root"; SqlExecutor underTest = new SqlExecutor(); @@ -54,8 +54,8 @@ public class SqlExecutorTest { @Test public void executeSelect_executes_PreparedStatement() throws Exception { - dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "login1", NAME_DB_COLUMN, "name one")); - dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "login2", NAME_DB_COLUMN, "name two")); + dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "login1", NAME_DB_COLUMN, "name one", IS_ROOT_DB_COLUMN, false); + dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "login2", NAME_DB_COLUMN, "name two", IS_ROOT_DB_COLUMN, false); try (Connection connection = dbTester.openConnection()) { List users = underTest.select(connection, "select " + LOGIN_DB_COLUMN + ", " + NAME_DB_COLUMN + " from users order by id", new SqlExecutor.StringsConverter( @@ -70,7 +70,7 @@ public class SqlExecutorTest { @Test public void executeUpdate_executes_PreparedStatement() throws Exception { - dbTester.executeInsert(USERS_DB_TABLE, ImmutableMap.of(LOGIN_DB_COLUMN, "the_login", NAME_DB_COLUMN, "the name")); + dbTester.executeInsert(USERS_DB_TABLE, LOGIN_DB_COLUMN, "the_login", NAME_DB_COLUMN, "the name", IS_ROOT_DB_COLUMN, false); try (Connection connection = dbTester.openConnection()) { underTest.executeDdl(connection, "update users set " + NAME_DB_COLUMN + "='new name' where " + LOGIN_DB_COLUMN + "='the_login'"); diff --git a/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java index 30f7a27cf47..5a6b8a02cba 100644 --- a/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/UserDaoTest.java @@ -53,21 +53,18 @@ import static org.sonar.db.user.GroupMembershipQuery.builder; import static org.sonar.db.user.UserTesting.newUserDto; public class UserDaoTest { + private static final long NOW = 1500000000000L; + + private System2 system2 = mock(System2.class); @Rule public ExpectedException thrown = ExpectedException.none(); - - System2 system2 = mock(System2.class); - @Rule public DbTester db = DbTester.create(system2); - static final long NOW = 1500000000000L; - - DbClient dbClient = db.getDbClient(); - - UserDao underTest = db.getDbClient().userDao(); - final DbSession session = db.getSession(); + private DbClient dbClient = db.getDbClient(); + private DbSession session = db.getSession(); + private UserDao underTest = db.getDbClient().userDao(); @Before public void setUp() throws Exception { @@ -229,6 +226,7 @@ public class UserDaoTest { assertThat(user.getExternalIdentity()).isEqualTo("johngithub"); assertThat(user.getExternalIdentityProvider()).isEqualTo("github"); assertThat(user.isLocal()).isTrue(); + assertThat(user.isRoot()).isFalse(); assertThat(user.getCreatedAt()).isEqualTo(date); assertThat(user.getUpdatedAt()).isEqualTo(date); } @@ -275,6 +273,7 @@ public class UserDaoTest { assertThat(user.getExternalIdentity()).isEqualTo("johngithub"); assertThat(user.getExternalIdentityProvider()).isEqualTo("github"); assertThat(user.isLocal()).isFalse(); + assertThat(user.isRoot()).isFalse(); assertThat(user.getCreatedAt()).isEqualTo(1418215735482L); assertThat(user.getUpdatedAt()).isEqualTo(1500000000000L); } @@ -307,6 +306,7 @@ public class UserDaoTest { assertThat(userReloaded.getCryptedPassword()).isNull(); assertThat(userReloaded.getExternalIdentity()).isNull(); assertThat(userReloaded.getExternalIdentityProvider()).isNull(); + assertThat(userReloaded.isRoot()).isFalse(); assertThat(userReloaded.getUpdatedAt()).isEqualTo(NOW); assertThat(underTest.selectUserById(session, otherUser.getId())).isNotNull(); @@ -409,8 +409,12 @@ public class UserDaoTest { assertThat(dto.getScmAccountsAsList()).containsOnly("ma", "marius33"); assertThat(dto.getSalt()).isEqualTo("79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365"); assertThat(dto.getCryptedPassword()).isEqualTo("650d2261c98361e2f67f90ce5c65a95e7d8ea2fg"); + assertThat(dto.isRoot()).isFalse(); assertThat(dto.getCreatedAt()).isEqualTo(1418215735482L); assertThat(dto.getUpdatedAt()).isEqualTo(1418215735485L); + + dto = underTest.selectOrFailByLogin(session, "sbrandhof"); + assertThat(dto.isRoot()).isTrue(); } @Test 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 @@ - + - - - + + + - - - + + + - - - - - + + + + + - + - - - - - + + + + + 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 @@ - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + 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 @@ - + - - - - + + + + - - + + - - - + + + - + - + - - + + - + - - + + 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 @@ - + - - - - + + + + - - + + - - - + + + - + - - + + - + - - + + 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 @@ - + - - - + + + - - - + + + - - - - - + + + + + - + - + - - - - - + + + + + - + - - - - - + + + + + - + 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 @@ - + - - - + + + - - - + + + - + - - - - - + + + + + - + - - - - - + + + + + - + 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 @@ - + - - - - + + + + - - + + - - - + + + - + - - + + - + - - + + 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 @@ - + - - - + + + - - - + + + - + - - + + 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 @@ - + - - - + + + - - - + + + - + - - + + 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 @@ - + - - - - + + + + - - - + + + - + - + - - + + 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 @@ - + - - - - + + + + - - - + + + - + - - + + 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 @@ - + - + - \ No newline at end of file + 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 @@ - + 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 @@ - - - + + + - + - + - - + + - \ No newline at end of file + 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 @@ - + + id="1" + user_id="1" + name="My Dashboard" + description="Dashboard shared by admin" + column_layout="100%" + shared="[true]" + /> + id="2" + user_id="[null]" + name="Default Dashboard" + description="Dashboard provided by system" + column_layout="100%" + shared="[true]" + /> + id="4" + user_id="[null]" + name="User Dashboard" + description="Won't appear, not anonymous" + column_layout="100%" + shared="[true]" + /> + id="1" + dashboard_id="1" + user_id="[null]" + order_index="2"/> + id="2" + dashboard_id="2" + user_id="[null]" + order_index="1"/> + id="4" + dashboard_id="4" + user_id="42" + order_index="1"/> 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 @@ - - + + + id="1" + user_id="1" + name="My Dashboard" + description="Dashboard shared by admin" + column_layout="100%" + shared="[true]" + /> + id="2" + user_id="[null]" + name="Default Dashboard" + description="Dashboard provided by system" + column_layout="100%" + shared="[true]" + /> + id="4" + user_id="[null]" + name="Anonymous Dashboard" + description="Won't appear, anonymous" + 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]" + /> + id="1" + dashboard_id="1" + user_id="42" + order_index="2"/> + id="2" + dashboard_id="2" + user_id="42" + order_index="1"/> + id="4" + dashboard_id="4" + user_id="[null]" + order_index="1"/> + id="5" + dashboard_id="5" + user_id="24" + order_index="1"/> 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 @@ - + - + - + - + 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 @@ - + - + - - + + - - - + + + - - + + 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 @@ - + - + - - - + + + - - + + - - + + 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 @@ - - + + - - + + - - - + + + - - - - - - + + + + + + - - - + + + - + - - - - - - + + + + + + - + 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]"/> + active="[true]" + is_root="[false]"/> - - + + - - + + - - - + + + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + 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]"/> - + - - + + - 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]"/> - - + + - + - - - + + + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + 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]"/> - + - + - + - + - \ No newline at end of file + 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]"/> + active="[true]" + is_root="[false]"/> - + - + - \ No newline at end of file + 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 @@ - + - + - + - + - \ No newline at end of file + 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 @@ - + - - + + - - + + 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 @@ - + - - - + + + - - + + - - + + - + - + - - + + 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 @@ - - - - + + + + - - - + + + - + 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 @@ - - - + + + - - - - + + + + - + 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 @@ - - - + + + - - - + + + - + 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 @@ - - - + + + - - + + - + 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 @@ - - - + + + - - - + + + - + - - - + + + 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 @@ - - - - + + + + - - - + + + - + - - - + + + 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 @@ - + - + - + - + - \ No newline at end of file + 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 @@ - + - + - \ No newline at end of file + 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 @@ - + - + - + - + - \ No newline at end of file + 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 @@ - - - + + + - - - + + + - - + + - \ No newline at end of file + 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 @@ - - - + + + - - + + - \ No newline at end of file + 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 @@ - - - + + + - - - + + + - - + + - \ No newline at end of file + 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 @@ - - - + + + - - + + 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 @@ - - - - \ No newline at end of file + + + + 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 @@ - - + + 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 @@ - + 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 @@ - + - + - + 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 @@ - - - + + + 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 @@ - - - + + + 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 @@ - - + + 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 @@ - - + + 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 @@ - - + + 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 @@ - - + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + 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 @@ - - + salt="79bd6a8e79fb8c76ac8b121cc7e8e11ad1af8365" + crypted_password="650d2261c98361e2f67f90ce5c65a95e7d8ea2fg" + is_root="[false]"/> + 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 @@ - + -- 2.39.5