diff options
| author | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-06-26 16:36:11 +0200 |
|---|---|---|
| committer | Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com> | 2013-06-26 16:36:11 +0200 |
| commit | 64c168a91d69a0fcfb69cafba29d3f718437c764 (patch) | |
| tree | 07c6e7d7efcce0f7c8097b29ccc7b19e03d2d052 /sonar-core/src/test | |
| parent | 31fba86ddcf83f57c5040cef8843341b79a02253 (diff) | |
| download | sonarqube-64c168a91d69a0fcfb69cafba29d3f718437c764.tar.gz sonarqube-64c168a91d69a0fcfb69cafba29d3f718437c764.zip | |
SONAR-4412 Extracted Role DAO to make it available to the upcoming ruby role service
Diffstat (limited to 'sonar-core/src/test')
| -rw-r--r-- | sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java | 30 | ||||
| -rw-r--r-- | sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java | 28 |
2 files changed, 48 insertions, 10 deletions
diff --git a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java index 7f8182234df..df51c2356b9 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java @@ -25,7 +25,8 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.security.DefaultGroups; import org.sonar.core.persistence.AbstractDaoTestCase; -import org.sonar.core.resource.DefaultResourcePermissions; +import org.sonar.core.user.RoleDao; +import org.sonar.core.user.UserDao; import static org.fest.assertions.Assertions.assertThat; @@ -37,7 +38,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { public void grantGroupRole() { setupData("grantGroupRole"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantGroupRole(project, "sonar-administrators", "admin"); // do not insert duplicated rows @@ -50,7 +52,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { public void grantGroupRole_anyone() { setupData("grantGroupRole_anyone"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantGroupRole(project, DefaultGroups.ANYONE, "admin"); checkTables("grantGroupRole_anyone", "group_roles"); @@ -60,7 +63,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { public void grantGroupRole_ignore_if_group_not_found() { setupData("grantGroupRole_ignore_if_group_not_found"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantGroupRole(project, "not_found", "admin"); checkTables("grantGroupRole_ignore_if_group_not_found", "group_roles"); @@ -70,7 +74,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { public void grantGroupRole_ignore_if_not_persisted() { setupData("grantGroupRole_ignore_if_not_persisted"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); Project resourceWithoutId = new Project(""); permissions.grantGroupRole(resourceWithoutId, "sonar-users", "admin"); @@ -81,7 +86,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { public void grantUserRole() { setupData("grantUserRole"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantUserRole(project, "marius", "admin"); // do not insert duplicated rows @@ -101,7 +107,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { settings.setProperty("sonar.role.user.TRK.defaultUsers", ""); settings.setProperty("sonar.role.codeviewer.TRK.defaultGroups", "Anyone,sonar-users"); settings.setProperty("sonar.role.codeviewer.TRK.defaultUsers", ""); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantDefaultRoles(project); @@ -114,7 +121,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { Settings settings = new Settings(); settings.setProperty("sonar.role.admin.TRK.defaultGroups", "sonar-administrators,unknown"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantDefaultRoles(project); checkTables("grantDefaultRoles_unknown_group", "group_roles"); @@ -126,7 +134,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { Settings settings = new Settings(); settings.setProperty("sonar.role.admin.TRK.defaultUsers", "marius,disabled,notfound"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(settings, getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); permissions.grantDefaultRoles(project); checkTables("grantDefaultRoles_users", "user_roles"); @@ -135,7 +144,8 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { @Test public void hasRoles() { setupData("hasRoles"); - DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis()); + DefaultResourcePermissions permissions = new DefaultResourcePermissions(new Settings(), getMyBatis(), + new RoleDao(getMyBatis()), new UserDao(getMyBatis())); // no groups and at least one user assertThat(permissions.hasRoles(new Project("only_users").setId(1))).isTrue(); diff --git a/sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java new file mode 100644 index 00000000000..1f803346a3d --- /dev/null +++ b/sonar-core/src/test/java/org/sonar/core/user/RoleDaoTest.java @@ -0,0 +1,28 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2013 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.core.user; + +import org.sonar.core.persistence.AbstractDaoTestCase; + +public class RoleDaoTest extends AbstractDaoTestCase { + + +} |