dlestrat 2004/10/02 16:05:48
Modified: components/security/src/test/org/apache/jetspeed/security
TestGroupManager.java AbstractSecurityTestcase.java
Log:
http://nagoya.apache.org/jira/browse/JS2-114#action_53626
Revision Changes Path
1.9 +7 -8
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java
Index: TestGroupManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestGroupManager.java 25 Sep 2004 23:03:17 -0000 1.8
+++ TestGroupManager.java 2 Oct 2004 23:05:48 -0000 1.9
@@ -217,13 +217,12 @@
{
gms.removeGroup("testgroup1.group1");
Collection principals =
ums.getUser("anonuser2").getSubject().getPrincipals();
- // because of hierarchical groups
- //
- //assertEquals(
- // "principal size should be == 3 after removing testgroup1.group1,
- // for principals: " + principals.toString(),
- // 3,
- // principals.size());
+ // because of hierarchical groups with generalization strategy as
default. Was 5 groups + 1 user, should now be 5
+ // (4 groups + 1 user).
+ assertEquals(
+ "principal size should be == 5 after removing testgroup1.group1,
for principals: " + principals.toString(),
+ 5,
+ principals.size());
assertFalse("anonuser2 should not contain testgroup1.group1",
principals.contains(new GroupPrincipalImpl(
"testgroup1.group1")));
}
1.5 +3 -3
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/AbstractSecurityTestcase.java
Index: AbstractSecurityTestcase.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/AbstractSecurityTestcase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractSecurityTestcase.java 19 Sep 2004 19:04:11 -0000 1.4
+++ AbstractSecurityTestcase.java 2 Oct 2004 23:05:48 -0000 1.5
@@ -99,8 +99,8 @@
Policy policy = new RdbmsPolicy(pms);
securityProvider = new SecurityProviderImpl(policy, ch, ush, rsh, gsh, smh);
ums = new UserManagerImpl(securityProvider);
- gms = new GroupManagerImpl(persistenceStore, securityProvider);
- rms = new RoleManagerImpl(persistenceStore, securityProvider);
+ gms = new GroupManagerImpl(securityProvider);
+ rms = new RoleManagerImpl(securityProvider);
new AuthenticationProviderImpl("login.conf", ums);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
