mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
HEAD test/build fix (AuthorityServiceTest)
- tweak existing tests to be less susceptible to existing site=>group data (should now work with more than one default site) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.security.AuthorityType;
|
||||
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.cmr.security.PersonService;
|
||||
import org.alfresco.service.cmr.site.SiteService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.namespace.RegexQNamePattern;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
@@ -60,31 +61,30 @@ import org.springframework.context.ApplicationContext;
|
||||
public class AuthorityServiceTest extends TestCase
|
||||
{
|
||||
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
|
||||
|
||||
|
||||
private AuthenticationComponent authenticationComponent;
|
||||
|
||||
private MutableAuthenticationService authenticationService;
|
||||
|
||||
private MutableAuthenticationDao authenticationDAO;
|
||||
|
||||
private AuthorityService authorityService;
|
||||
|
||||
private AuthorityService pubAuthorityService;
|
||||
|
||||
private PersonService personService;
|
||||
|
||||
private UserTransaction tx;
|
||||
|
||||
private AclDAO aclDaoComponent;
|
||||
|
||||
private NodeService nodeService;
|
||||
|
||||
|
||||
public AuthorityServiceTest()
|
||||
{
|
||||
super();
|
||||
|
||||
}
|
||||
|
||||
|
||||
private static final int DEFAULT_SITE_GRP_CNT = 5; // default number of groups per site
|
||||
private static final int DEFAULT_SITE_ROOT_GRP_CNT = 1; // default number of root groups per site
|
||||
private static final int DEFAULT_GRP_CNT = 2; // default (non-site) bootstrap groups - eg. GROUP_ALFRESCO_ADMINISTRATORS, GROUP_EMAIL_CONTRIBUTORS
|
||||
|
||||
private int SITE_CNT = 0;
|
||||
private int GRP_CNT = 0;
|
||||
private int ROOT_GRP_CNT = 0;
|
||||
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_NONE)
|
||||
@@ -102,9 +102,16 @@ public class AuthorityServiceTest extends TestCase
|
||||
authenticationDAO = (MutableAuthenticationDao) ctx.getBean("authenticationDao");
|
||||
aclDaoComponent = (AclDAO) ctx.getBean("aclDAO");
|
||||
nodeService = (NodeService) ctx.getBean("nodeService");
|
||||
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
|
||||
|
||||
|
||||
String defaultAdminUser = AuthenticationUtil.getAdminUserName();
|
||||
AuthenticationUtil.setFullyAuthenticatedUser(defaultAdminUser);
|
||||
|
||||
// note: currently depends on any existing (and/or bootstrap) group data - eg. default site "swsdp" (Sample Web Site Design Project)
|
||||
SiteService siteService = (SiteService) ctx.getBean("SiteService");
|
||||
SITE_CNT = siteService.listSites(defaultAdminUser).size();
|
||||
GRP_CNT = DEFAULT_GRP_CNT + (DEFAULT_SITE_GRP_CNT * SITE_CNT);
|
||||
ROOT_GRP_CNT = DEFAULT_GRP_CNT + (DEFAULT_SITE_ROOT_GRP_CNT * SITE_CNT);
|
||||
|
||||
TransactionService transactionService = (TransactionService) ctx.getBean(ServiceRegistry.TRANSACTION_SERVICE.getLocalName());
|
||||
tx = transactionService.getUserTransaction();
|
||||
tx.begin();
|
||||
@@ -362,7 +369,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(authorityService.hasAdminAuthority());
|
||||
assertTrue(pubAuthorityService.hasAdminAuthority());
|
||||
Set<String> authorities = authorityService.getAuthorities();
|
||||
assertEquals("Unexpected result: " + authorities, 6, authorityService.getAuthorities().size());
|
||||
assertEquals("Unexpected result: " + authorities, 4 + (SITE_CNT*2), authorityService.getAuthorities().size());
|
||||
}
|
||||
|
||||
public void testAuthorities()
|
||||
@@ -372,7 +379,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(1, getAllAuthorities(AuthorityType.EVERYONE).size());
|
||||
assertTrue(getAllAuthorities(AuthorityType.EVERYONE).contains(PermissionService.ALL_AUTHORITIES));
|
||||
// groups added for email and admin
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertFalse(getAllAuthorities(AuthorityType.GROUP).contains(PermissionService.ALL_AUTHORITIES));
|
||||
assertEquals(1, getAllAuthorities(AuthorityType.GUEST).size());
|
||||
assertTrue(getAllAuthorities(AuthorityType.GUEST).contains(PermissionService.GUEST_AUTHORITY));
|
||||
@@ -452,14 +459,14 @@ public class AuthorityServiceTest extends TestCase
|
||||
{
|
||||
String auth;
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth = pubAuthorityService.createAuthority(AuthorityType.GROUP, "woof");
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
pubAuthorityService.deleteAuthority(auth);
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(0, getAllAuthorities(AuthorityType.ROLE).size());
|
||||
assertEquals(0, pubAuthorityService.getAllRootAuthorities(AuthorityType.ROLE).size());
|
||||
@@ -480,44 +487,44 @@ public class AuthorityServiceTest extends TestCase
|
||||
String auth5;
|
||||
|
||||
assertFalse(pubAuthorityService.authorityExists(pubAuthorityService.getName(AuthorityType.GROUP, "one")));
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
assertTrue(pubAuthorityService.authorityExists(auth1));
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
assertEquals(9, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+2, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth3 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "three");
|
||||
pubAuthorityService.addAuthority(auth1, auth3);
|
||||
assertEquals(10, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+3, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth4 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "four");
|
||||
pubAuthorityService.addAuthority(auth1, auth4);
|
||||
assertEquals(11, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+4, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth5 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "five");
|
||||
pubAuthorityService.addAuthority(auth2, auth5);
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
pubAuthorityService.deleteAuthority(auth5);
|
||||
assertEquals(11, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+4, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
pubAuthorityService.deleteAuthority(auth4);
|
||||
assertEquals(10, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+3, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
pubAuthorityService.deleteAuthority(auth3);
|
||||
assertEquals(9, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+2, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
pubAuthorityService.deleteAuthority(auth2);
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
pubAuthorityService.deleteAuthority(auth1);
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(0, getAllAuthorities(AuthorityType.ROLE).size());
|
||||
assertEquals(0, pubAuthorityService.getAllRootAuthorities(AuthorityType.ROLE).size());
|
||||
auth1 = pubAuthorityService.createAuthority(AuthorityType.ROLE, "one");
|
||||
@@ -538,7 +545,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
pubAuthorityService.addAuthority(auth2, auth5);
|
||||
assertEquals(5, getAllAuthorities(AuthorityType.ROLE).size());
|
||||
assertEquals(2, pubAuthorityService.getAllRootAuthorities(AuthorityType.ROLE).size());
|
||||
|
||||
|
||||
pubAuthorityService.deleteAuthority(auth5);
|
||||
assertEquals(4, getAllAuthorities(AuthorityType.ROLE).size());
|
||||
assertEquals(2, pubAuthorityService.getAllRootAuthorities(AuthorityType.ROLE).size());
|
||||
@@ -575,38 +582,38 @@ public class AuthorityServiceTest extends TestCase
|
||||
String auth3;
|
||||
String auth4;
|
||||
String auth5;
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
assertEquals("GROUP_one", auth1);
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
assertEquals("GROUP_two", auth2);
|
||||
assertEquals(9, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+2, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth3 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "three");
|
||||
pubAuthorityService.addAuthority(auth1, auth3);
|
||||
assertEquals("GROUP_three", auth3);
|
||||
assertEquals(10, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+3, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth4 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "four");
|
||||
pubAuthorityService.addAuthority(auth1, auth4);
|
||||
assertEquals("GROUP_four", auth4);
|
||||
assertEquals(11, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+4, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth5 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "five");
|
||||
pubAuthorityService.addAuthority(auth2, auth5);
|
||||
assertEquals("GROUP_five", auth5);
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
//System.out.println("Users: "+ getAllAuthorities(AuthorityType.USER));
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
pubAuthorityService.addAuthority(auth5, "andy");
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(2, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
@@ -614,73 +621,73 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth2));
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, auth5, false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, auth5, false).contains(auth2));
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains("andy"));
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(null, auth5, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth5, false).contains("andy"));
|
||||
|
||||
|
||||
pubAuthorityService.removeAuthority(auth5, "andy");
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, auth5, false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, auth5, false).contains(auth2));
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, auth5, false).size());
|
||||
}
|
||||
|
||||
|
||||
public void testCreateAuthNet()
|
||||
{
|
||||
personService.getPerson("andy");
|
||||
|
||||
|
||||
String auth1;
|
||||
String auth2;
|
||||
String auth3;
|
||||
String auth4;
|
||||
String auth5;
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
assertEquals(9, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+2, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth3 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "three");
|
||||
pubAuthorityService.addAuthority(auth1, auth3);
|
||||
assertEquals(10, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+3, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth4 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "four");
|
||||
pubAuthorityService.addAuthority(auth1, auth4);
|
||||
assertEquals(11, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+4, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth5 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "five");
|
||||
pubAuthorityService.addAuthority(auth2, auth5);
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(3, getAllAuthorities(AuthorityType.USER).size());
|
||||
pubAuthorityService.addAuthority(auth5, "andy");
|
||||
pubAuthorityService.addAuthority(auth1, "andy");
|
||||
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(3, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth2));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth1));
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains("andy"));
|
||||
@@ -688,17 +695,17 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth3));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth4));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains("andy"));
|
||||
|
||||
|
||||
pubAuthorityService.removeAuthority(auth1, "andy");
|
||||
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(2, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth2));
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains("andy"));
|
||||
@@ -706,51 +713,51 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth3));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth4));
|
||||
}
|
||||
|
||||
|
||||
public void testCreateAuthNet2()
|
||||
{
|
||||
personService.getPerson("andy");
|
||||
|
||||
|
||||
String auth1;
|
||||
String auth2;
|
||||
String auth3;
|
||||
String auth4;
|
||||
String auth5;
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
assertEquals(8, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+1, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
assertEquals(9, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+2, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth3 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "three");
|
||||
pubAuthorityService.addAuthority(auth1, auth3);
|
||||
assertEquals(10, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+3, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth4 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "four");
|
||||
pubAuthorityService.addAuthority(auth1, auth4);
|
||||
assertEquals(11, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT+4, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
auth5 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "five");
|
||||
pubAuthorityService.addAuthority(auth2, auth5);
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
pubAuthorityService.addAuthority(auth5, "andy");
|
||||
pubAuthorityService.addAuthority(auth1, "andy");
|
||||
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(5, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+2, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(3, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth2));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth1));
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains("andy"));
|
||||
@@ -758,13 +765,13 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth3));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth4));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains("andy"));
|
||||
|
||||
|
||||
pubAuthorityService.addAuthority(auth3, auth2);
|
||||
|
||||
assertEquals(12, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
|
||||
assertEquals(GRP_CNT+5, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
// Number of root authorities has been reduced since auth2 is no longer an orphan
|
||||
assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT+1, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
// The next call looks for people not users :-)
|
||||
checkAuthorityCollectionSize(3, getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
|
||||
assertEquals(4, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
@@ -772,7 +779,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth2));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth1));
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy", false).contains(auth3));
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth2, false).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth2, false).contains("andy"));
|
||||
@@ -782,7 +789,6 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth2));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains(auth5));
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, false).contains("andy"));
|
||||
|
||||
}
|
||||
|
||||
public void testGetAuthorityNodeRef()
|
||||
@@ -852,8 +858,8 @@ public class AuthorityServiceTest extends TestCase
|
||||
personService.getPerson("andy4");
|
||||
personService.getPerson("andy5");
|
||||
personService.getPerson("andy6");
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
String auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
pubAuthorityService.addAuthority(auth1, "andy1");
|
||||
String auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
@@ -876,7 +882,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
pubAuthorityService.addAuthority(auth6, "andy1");
|
||||
pubAuthorityService.addAuthority(auth6, "andy5");
|
||||
pubAuthorityService.addAuthority(auth6, "andy6");
|
||||
|
||||
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth1, true).size());
|
||||
assertEquals(11, pubAuthorityService.getContainedAuthorities(null, auth1, false).size());
|
||||
assertEquals(3, pubAuthorityService.getContainedAuthorities(null, auth2, true).size());
|
||||
@@ -889,7 +895,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(null, auth5, false).size());
|
||||
assertEquals(3, pubAuthorityService.getContainedAuthorities(null, auth6, true).size());
|
||||
assertEquals(3, pubAuthorityService.getContainedAuthorities(null, auth6, false).size());
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy1", true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy1", false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy2", true).size());
|
||||
@@ -902,7 +908,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy5", false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy6", true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(null, "andy6", false).size());
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth1, true).size());
|
||||
assertEquals(5, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth1, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth2, true).size());
|
||||
@@ -915,7 +921,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth5, false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth6, true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth6, false).size());
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth1, true).size());
|
||||
assertEquals(6, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth1, false).size());
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth2, true).size());
|
||||
@@ -928,9 +934,9 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth5, false).size());
|
||||
assertEquals(3, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth6, true).size());
|
||||
assertEquals(3, pubAuthorityService.getContainedAuthorities(AuthorityType.USER, auth6, false).size());
|
||||
|
||||
|
||||
// containing
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(null, auth1, true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(null, auth1, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, auth2, true).size());
|
||||
@@ -943,7 +949,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(4, pubAuthorityService.getContainingAuthorities(null, auth5, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, auth6, true).size());
|
||||
assertEquals(3, pubAuthorityService.getContainingAuthorities(null, auth6, false).size());
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth1, true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth1, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth2, true).size());
|
||||
@@ -956,7 +962,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(4, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth5, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth6, true).size());
|
||||
assertEquals(3, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, auth6, false).size());
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth1, true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth1, false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth2, true).size());
|
||||
@@ -969,7 +975,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth5, false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth6, true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, auth6, false).size());
|
||||
|
||||
|
||||
assertEquals(5, pubAuthorityService.getContainingAuthorities(null, "andy1", true).size());
|
||||
assertEquals(6, pubAuthorityService.getContainingAuthorities(null, "andy1", false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, "andy2", true).size());
|
||||
@@ -982,7 +988,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(6, pubAuthorityService.getContainingAuthorities(null, "andy5", false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, "andy6", true).size());
|
||||
assertEquals(4, pubAuthorityService.getContainingAuthorities(null, "andy6", false).size());
|
||||
|
||||
|
||||
assertEquals(5, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy1", true).size());
|
||||
assertEquals(6, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy1", false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy2", true).size());
|
||||
@@ -995,7 +1001,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(6, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy5", false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy6", true).size());
|
||||
assertEquals(4, pubAuthorityService.getContainingAuthorities(AuthorityType.GROUP, "andy6", false).size());
|
||||
|
||||
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, "andy1", true).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, "andy1", false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainingAuthorities(AuthorityType.USER, "andy2", true).size());
|
||||
@@ -1029,9 +1035,9 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(personService.personExists("andy2"));
|
||||
personService.getPerson("an3dy");
|
||||
assertTrue(personService.personExists("an3dy"));
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
String auth1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "one");
|
||||
pubAuthorityService.addAuthority(auth1, "1234");
|
||||
String auth2 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "two");
|
||||
@@ -1044,7 +1050,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
pubAuthorityService.addAuthority(auth5, "andy2");
|
||||
String auth6 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "six");
|
||||
pubAuthorityService.addAuthority(auth6, "an3dy");
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(null, auth1, true).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth1, true).contains("1234"));
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(null, auth2, true).size());
|
||||
@@ -1057,7 +1063,7 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth5, true).contains("andy2"));
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(null, auth6, true).size());
|
||||
assertTrue(pubAuthorityService.getContainedAuthorities(null, auth6, true).contains("an3dy"));
|
||||
|
||||
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, "1234", false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "1234", false).contains(auth1));
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, "andy", false).size());
|
||||
@@ -1070,14 +1076,13 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "andy2", false).contains(auth5));
|
||||
assertEquals(1, pubAuthorityService.getContainingAuthorities(null, "an3dy", false).size());
|
||||
assertTrue(pubAuthorityService.getContainingAuthorities(null, "an3dy", false).contains(auth6));
|
||||
|
||||
}
|
||||
|
||||
public void testGroupNameTokenisation()
|
||||
{
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
String auth1234 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "1234");
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, auth1234, false).size());
|
||||
String authC1 = pubAuthorityService.createAuthority(AuthorityType.GROUP, "circle");
|
||||
@@ -1102,15 +1107,15 @@ public class AuthorityServiceTest extends TestCase
|
||||
assertEquals(2, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, authC2, false).size());
|
||||
assertEquals(1, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, authStuff, false).size());
|
||||
assertEquals(0, pubAuthorityService.getContainedAuthorities(AuthorityType.GROUP, authSpace, false).size());
|
||||
|
||||
|
||||
pubAuthorityService.deleteAuthority(authSpace);
|
||||
pubAuthorityService.deleteAuthority(authStuff);
|
||||
pubAuthorityService.deleteAuthority(authC2);
|
||||
pubAuthorityService.deleteAuthority(authC1);
|
||||
pubAuthorityService.deleteAuthority(auth1234);
|
||||
|
||||
assertEquals(7, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(3, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
|
||||
assertEquals(GRP_CNT, getAllAuthorities(AuthorityType.GROUP).size());
|
||||
assertEquals(ROOT_GRP_CNT, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
|
||||
}
|
||||
|
||||
public void testAdminGroup()
|
||||
|
Reference in New Issue
Block a user