You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/08/23 17:30:48 UTC
cvs commit: jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl AccessControlListTest.java
epugh 2003/08/23 08:30:48
Modified: security/src/test/org/apache/fulcrum/security/examples
DemoMemorySecurityAndTurbine.java
security/src/test InMemorySecurity.xml
roleTurbineConfiguration.xml AccessControlList.xml
TorqueSecurity.xml
security/src/test/org/apache/fulcrum/security
StartingSecurityServicesTest.java
UserManagerTest.java RoleManagerTest.java
GroupManagerTest.java
security/src/test/org/apache/fulcrum/security/adapter/turbine
AccessControlListAdaptorTest.java
security/src/test/org/apache/fulcrum/security/acl
AccessControlListTest.java
Log:
Updated tests for new package structure
Revision Changes Path
1.2 +4 -4 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/examples/DemoMemorySecurityAndTurbine.java
Index: DemoMemorySecurityAndTurbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/examples/DemoMemorySecurityAndTurbine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DemoMemorySecurityAndTurbine.java 23 Aug 2003 03:56:26 -0000 1.1
+++ DemoMemorySecurityAndTurbine.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -53,10 +53,10 @@
* <http://www.apache.org/>.
*/
import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.security.impl.torque.TorqueGroupManager;
-import org.apache.fulcrum.security.impl.torque.TorquePermissionManager;
-import org.apache.fulcrum.security.impl.torque.TorqueRoleManager;
-import org.apache.fulcrum.security.impl.torque.TorqueUserManager;
+import org.apache.fulcrum.security.spi.torque.TorqueGroupManager;
+import org.apache.fulcrum.security.spi.torque.TorquePermissionManager;
+import org.apache.fulcrum.security.spi.torque.TorqueRoleManager;
+import org.apache.fulcrum.security.spi.torque.TorqueUserManager;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
public class DemoMemorySecurityAndTurbine extends BaseUnitTest
{
1.2 +4 -4 jakarta-turbine-fulcrum/security/src/test/InMemorySecurity.xml
Index: InMemorySecurity.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/InMemorySecurity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InMemorySecurity.xml 23 Aug 2003 03:56:26 -0000 1.1
+++ InMemorySecurity.xml 23 Aug 2003 15:30:48 -0000 1.2
@@ -6,21 +6,21 @@
<component
role="org.apache.fulcrum.security.UserManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryUserManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryUserManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.GroupManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryGroupManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryGroupManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.RoleManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryRoleManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryRoleManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.PermissionManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryPermissionManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryPermissionManagerImpl">
</component>
</my-system>
1.2 +4 -4 jakarta-turbine-fulcrum/security/src/test/roleTurbineConfiguration.xml
Index: roleTurbineConfiguration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/roleTurbineConfiguration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roleTurbineConfiguration.xml 23 Aug 2003 03:56:26 -0000 1.1
+++ roleTurbineConfiguration.xml 23 Aug 2003 15:30:48 -0000 1.2
@@ -8,19 +8,19 @@
<role name="org.apache.fulcrum.security.UserManager"
shorthand="userManager"
- default-class="org.apache.fulcrum.security.impl.memory.MemoryUserManagerImpl" />
+ default-class="org.apache.fulcrum.security.spi.memory.simple.MemoryUserManagerImpl" />
<role name="org.apache.fulcrum.security.GroupManager"
shorthand="groupManager"
- default-class="org.apache.fulcrum.security.impl.memory.MemoryGroupManagerImpl" />
+ default-class="org.apache.fulcrum.security.spi.memory.simple.MemoryGroupManagerImpl" />
<role name="org.apache.fulcrum.security.RoleManager"
shorthand="roleManager"
- default-class="org.apache.fulcrum.security.impl.memory.MemoryRoleManagerImpl" />
+ default-class="org.apache.fulcrum.security.spi.memory.simple.MemoryRoleManagerImpl" />
<role name="org.apache.fulcrum.security.PermissionManager"
shorthand="permissionManager"
- default-class="org.apache.fulcrum.security.impl.memory.MemoryPermissionManagerImpl" />
+ default-class="org.apache.fulcrum.security.spi.memory.simple.MemoryPermissionManagerImpl" />
</role-list>
1.2 +4 -4 jakarta-turbine-fulcrum/security/src/test/AccessControlList.xml
Index: AccessControlList.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/AccessControlList.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AccessControlList.xml 23 Aug 2003 03:56:26 -0000 1.1
+++ AccessControlList.xml 23 Aug 2003 15:30:48 -0000 1.2
@@ -13,20 +13,20 @@
<component
role="org.apache.fulcrum.security.UserManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryUserManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryUserManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.GroupManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryGroupManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryGroupManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.RoleManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryRoleManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryRoleManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.PermissionManager"
- class="org.apache.fulcrum.security.impl.memory.MemoryPermissionManagerImpl">
+ class="org.apache.fulcrum.security.spi.memory.simple.MemoryPermissionManagerImpl">
</component>
</my-system>
1.2 +4 -4 jakarta-turbine-fulcrum/security/src/test/TorqueSecurity.xml
Index: TorqueSecurity.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/TorqueSecurity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TorqueSecurity.xml 23 Aug 2003 03:56:26 -0000 1.1
+++ TorqueSecurity.xml 23 Aug 2003 15:30:48 -0000 1.2
@@ -5,18 +5,18 @@
</component>
<component
role="org.apache.fulcrum.security.UserManager"
- class="org.apache.fulcrum.security.impl.torque.impl.TorqueUserManagerImpl">
+ class="org.apache.fulcrum.security.spi.torque.impl.TorqueUserManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.GroupManager"
- class="org.apache.fulcrum.security.impl.torque.impl.TorqueGroupManagerImpl">
+ class="org.apache.fulcrum.security.spi.torque.impl.TorqueGroupManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.RoleManager"
- class="org.apache.fulcrum.security.impl.torque.impl.TorqueRoleManagerImpl">
+ class="org.apache.fulcrum.security.spi.torque.impl.TorqueRoleManagerImpl">
</component>
<component
role="org.apache.fulcrum.security.PermissionManager"
- class="org.apache.fulcrum.security.impl.torque.impl.TorquePermissionManagerImpl">
+ class="org.apache.fulcrum.security.spi.torque.impl.TorquePermissionManagerImpl">
</component>
</my-system>
1.2 +8 -8 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java
Index: StartingSecurityServicesTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StartingSecurityServicesTest.java 23 Aug 2003 03:56:25 -0000 1.1
+++ StartingSecurityServicesTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -52,14 +52,14 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.security.impl.memory.MemoryGroupManagerImpl;
-import org.apache.fulcrum.security.impl.memory.MemoryPermissionManagerImpl;
-import org.apache.fulcrum.security.impl.memory.MemoryRoleManagerImpl;
-import org.apache.fulcrum.security.impl.memory.MemoryUserManagerImpl;
-import org.apache.fulcrum.security.impl.torque.TorqueGroupManager;
-import org.apache.fulcrum.security.impl.torque.TorquePermissionManager;
-import org.apache.fulcrum.security.impl.torque.TorqueRoleManager;
-import org.apache.fulcrum.security.impl.torque.TorqueUserManager;
+import org.apache.fulcrum.security.spi.memory.simple.MemoryGroupManagerImpl;
+import org.apache.fulcrum.security.spi.memory.simple.MemoryPermissionManagerImpl;
+import org.apache.fulcrum.security.spi.memory.simple.MemoryRoleManagerImpl;
+import org.apache.fulcrum.security.spi.memory.simple.MemoryUserManagerImpl;
+import org.apache.fulcrum.security.spi.torque.TorqueGroupManager;
+import org.apache.fulcrum.security.spi.torque.TorquePermissionManager;
+import org.apache.fulcrum.security.spi.torque.TorqueRoleManager;
+import org.apache.fulcrum.security.spi.torque.TorqueUserManager;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
public class StartingSecurityServicesTest extends BaseUnitTest
{
1.2 +12 -12 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/UserManagerTest.java
Index: UserManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/UserManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserManagerTest.java 23 Aug 2003 03:56:25 -0000 1.1
+++ UserManagerTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -8,8 +8,8 @@
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.impl.memory.MemoryUserManager;
-import org.apache.fulcrum.security.impl.memory.entity.MemoryUser;
+import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
+import org.apache.fulcrum.security.model.simple.manager.SimpleUserManager;
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -154,7 +154,7 @@
}
public void testRevokeAll() throws Exception
{
- if (userManager instanceof MemoryUserManager)
+ if (userManager instanceof SimpleUserManager)
{
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_REVOKEALL");
@@ -164,10 +164,10 @@
securityService.getGroupManager().addGroup(group2);
user = userManager.getUserInstance("Clint2");
userManager.addUser(user, "clint");
- ((MemoryUserManager) userManager).grant(user, group);
- ((MemoryUserManager) userManager).grant(user, group2);
+ ((SimpleUserManager) userManager).grant(user, group);
+ ((SimpleUserManager) userManager).grant(user, group2);
userManager.revokeAll(user);
- assertEquals(0, ((MemoryUser) user).getGroups().size());
+ assertEquals(0, ((SimpleUser) user).getGroups().size());
}
}
public void testSaveUser() throws Exception
@@ -181,28 +181,28 @@
}
public void testGrantUserGroup() throws Exception
{
- if (userManager instanceof MemoryUserManager)
+ if (userManager instanceof SimpleUserManager)
{
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_GROUP");
securityService.getGroupManager().addGroup(group);
user = userManager.getUserInstance("Clint");
userManager.addUser(user, "clint");
- ((MemoryUserManager) userManager).grant(user, group);
- assertTrue(((MemoryUser) user).getGroups().contains(group));
+ ((SimpleUserManager) userManager).grant(user, group);
+ assertTrue(((SimpleUser) user).getGroups().contains(group));
}
}
public void testRevokeUserGroup() throws Exception
{
- if (userManager instanceof MemoryUserManager)
+ if (userManager instanceof SimpleUserManager)
{
Group group = securityService.getGroupManager().getGroupInstance();
group.setName("TEST_REVOKE");
securityService.getGroupManager().addGroup(group);
user = userManager.getUserInstance("Lima");
userManager.addUser(user, "pet");
- ((MemoryUserManager) userManager).revoke(user, group);
- assertFalse(((MemoryUser) user).getGroups().contains(group));
+ ((SimpleUserManager) userManager).revoke(user, group);
+ assertFalse(((SimpleUser) user).getGroups().contains(group));
}
}
/*
1.2 +6 -6 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/RoleManagerTest.java
Index: RoleManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/RoleManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleManagerTest.java 23 Aug 2003 03:56:25 -0000 1.1
+++ RoleManagerTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -7,7 +7,7 @@
package org.apache.fulcrum.security;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.impl.memory.MemoryRoleManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleRoleManager;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -124,27 +124,27 @@
}
public void testGrantUserGroup() throws Exception
{
- if (roleManager instanceof MemoryRoleManager)
+ if (roleManager instanceof SimpleRoleManager)
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
permission.setName("TEST_PERMISSION");
securityService.getPermissionManager().addPermission(permission);
role = roleManager.getRoleInstance("TEST_ROLE");
roleManager.addRole(role);
- ((MemoryRoleManager) roleManager).grant(role, permission);
+ ((SimpleRoleManager) roleManager).grant(role, permission);
}
}
public void testRevokeUserGroup() throws Exception
{
- if (roleManager instanceof MemoryRoleManager)
+ if (roleManager instanceof SimpleRoleManager)
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
permission.setName("TEST_PERMISSION2");
securityService.getPermissionManager().addPermission(permission);
role = roleManager.getRoleInstance("Lima2");
roleManager.addRole(role);
- ((MemoryRoleManager) roleManager).grant(role, permission);
- ((MemoryRoleManager) roleManager).revoke(role, permission);
+ ((SimpleRoleManager) roleManager).grant(role, permission);
+ ((SimpleRoleManager) roleManager).revoke(role, permission);
}
}
/*
1.2 +6 -6 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/GroupManagerTest.java
Index: GroupManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/GroupManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GroupManagerTest.java 23 Aug 2003 03:56:25 -0000 1.1
+++ GroupManagerTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -7,7 +7,7 @@
package org.apache.fulcrum.security;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.impl.memory.MemoryGroupManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleGroupManager;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -155,27 +155,27 @@
}
public void testGrantUserGroup() throws Exception
{
- if (groupManager instanceof MemoryGroupManager)
+ if (groupManager instanceof SimpleGroupManager)
{
Role role = securityService.getRoleManager().getRoleInstance();
role.setName("TEST_PERMISSION");
securityService.getRoleManager().addRole(role);
group = groupManager.getGroupInstance("TEST_ROLE");
groupManager.addGroup(group);
- ((MemoryGroupManager) groupManager).grant(group, role);
+ ((SimpleGroupManager) groupManager).grant(group, role);
}
}
public void testRevokeUserGroup() throws Exception
{
- if (groupManager instanceof MemoryGroupManager)
+ if (groupManager instanceof SimpleGroupManager)
{
Role role = securityService.getRoleManager().getRoleInstance();
role.setName("TEST_PERMISSION2");
securityService.getRoleManager().addRole(role);
group = groupManager.getGroupInstance("Lima2");
groupManager.addGroup(group);
- ((MemoryGroupManager) groupManager).grant(group, role);
- ((MemoryGroupManager) groupManager).revoke(group, role);
+ ((SimpleGroupManager) groupManager).grant(group, role);
+ ((SimpleGroupManager) groupManager).revoke(group, role);
}
}
}
1.2 +48 -36 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java
Index: AccessControlListAdaptorTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdaptorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AccessControlListAdaptorTest.java 23 Aug 2003 03:56:23 -0000 1.1
+++ AccessControlListAdaptorTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -55,16 +55,19 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
+
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.apache.fulcrum.security.BaseSecurityService;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.impl.memory.MemoryGroupManager;
-import org.apache.fulcrum.security.impl.memory.MemoryRoleManager;
-import org.apache.fulcrum.security.impl.memory.MemoryUserManager;
-import org.apache.fulcrum.security.impl.memory.entity.MemoryUser;
+import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
+import org.apache.fulcrum.security.model.simple.manager.SimpleRoleManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleUserManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleGroupManager;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
import org.apache.turbine.modules.actions.sessionvalidator.DefaultSessionValidator;
import org.apache.turbine.modules.actions.sessionvalidator.SessionValidator;
@@ -81,6 +84,7 @@
import org.apache.turbine.util.security.GroupSet;
import org.apache.turbine.util.security.PermissionSet;
import org.apache.turbine.util.security.RoleSet;
+
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
@@ -114,30 +118,9 @@
{
TurbineConfig tc = new TurbineConfig(".", "/src/test/AdapterTestTurbineResources.properties");
tc.initialize();
- RunDataService rds = (RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
MockHttpSession session = new MockHttpSession();
- session.setAttribute(User.SESSION_KEY, "");
session.setupGetAttribute(User.SESSION_KEY, null);
- //Object o = null;
- //session.setExpectedAttribute(User.SESSION_KEY,o);
- BetterMockHttpServletRequest request = new BetterMockHttpServletRequest();
- request.setupServerName("bob");
- request.setupGetProtocol("http");
- request.setupScheme("scheme");
- request.setupPathInfo("damn");
- request.setupGetServletPath("damn2");
- request.setupGetContextPath("wow");
- request.setupGetContentType("html/text");
- request.setupAddHeader("Content-type", "html/text");
- Vector v = new Vector();
- request.setupGetParameterNames(v.elements());
- request.setSession(session);
- HttpServletResponse response = new MockHttpServletResponse();
- ServletConfig config = new MockServletConfig();
- RunData rd = rds.getRunData(request, response, config);
- SessionValidator sessionValidator = new DefaultSessionValidator();
- sessionValidator.doPerform(rd);
- User turbineUser = rd.getUser();
+ User turbineUser = getUserFromRunData(session);
assertNotNull(turbineUser);
assertTrue(TurbineSecurity.getService().isAnonymousUser(turbineUser));
}
@@ -162,18 +145,18 @@
securityService.getPermissionManager().addPermission(fulcrumPermission);
securityService.getPermissionManager().addPermission(fulcrumPermission2);
securityService.getPermissionManager().addPermission(fulcrumPermission3);
- ((MemoryRoleManager) securityService.getRoleManager()).grant(fulcrumRole, fulcrumPermission);
- ((MemoryRoleManager) securityService.getRoleManager()).grant(fulcrumRole2, fulcrumPermission2);
- ((MemoryRoleManager) securityService.getRoleManager()).grant(fulcrumRole2, fulcrumPermission3);
- ((MemoryGroupManager) securityService.getGroupManager()).grant(fulcrumGroup, fulcrumRole);
- ((MemoryGroupManager) securityService.getGroupManager()).grant(fulcrumGroup, fulcrumRole2);
- ((MemoryGroupManager) securityService.getGroupManager()).grant(fulcrumGroup2, fulcrumRole2);
+ ((SimpleRoleManager) securityService.getRoleManager()).grant(fulcrumRole, fulcrumPermission);
+ ((SimpleRoleManager) securityService.getRoleManager()).grant(fulcrumRole2, fulcrumPermission2);
+ ((SimpleRoleManager) securityService.getRoleManager()).grant(fulcrumRole2, fulcrumPermission3);
+ ((SimpleGroupManager) securityService.getGroupManager()).grant(fulcrumGroup, fulcrumRole);
+ ((SimpleGroupManager) securityService.getGroupManager()).grant(fulcrumGroup, fulcrumRole2);
+ ((SimpleGroupManager) securityService.getGroupManager()).grant(fulcrumGroup2, fulcrumRole2);
org.apache.fulcrum.security.entity.User fulcrumUser =
securityService.getUserManager().getUserInstance("Jeannie");
securityService.getUserManager().addUser(fulcrumUser, "wyatt");
- ((MemoryUserManager) securityService.getUserManager()).grant(fulcrumUser, fulcrumGroup);
- ((MemoryUserManager) securityService.getUserManager()).grant(fulcrumUser, fulcrumGroup2);
- assertEquals(2, ((MemoryUser) fulcrumUser).getGroups().size());
+ ((SimpleUserManager) securityService.getUserManager()).grant(fulcrumUser, fulcrumGroup);
+ ((SimpleUserManager) securityService.getUserManager()).grant(fulcrumUser, fulcrumGroup2);
+ assertEquals(2, ((SimpleUser) fulcrumUser).getGroups().size());
GroupSet groupSet = TurbineSecurity.getService().getAllGroups();
assertEquals(2, groupSet.size());
RoleSet roleSet = TurbineSecurity.getService().getAllRoles();
@@ -183,7 +166,36 @@
User turbineUser = TurbineSecurity.getService().getUser("Jeannie");
AccessControlList acl = TurbineSecurity.getService().getACL(turbineUser);
assertNotNull(acl);
- assertEquals(3,acl.getPermissions().size());
+ assertEquals(3, acl.getPermissions().size());
+ MockHttpSession session = new MockHttpSession();
+ session.setupGetAttribute(User.SESSION_KEY, turbineUser);
+ turbineUser = getUserFromRunData(session);
+ assertNotNull(turbineUser);
+ assertFalse(TurbineSecurity.getService().isAnonymousUser(turbineUser));
+ }
+ private User getUserFromRunData(HttpSession session) throws Exception
+ {
+ RunDataService rds = (RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME);
+ BetterMockHttpServletRequest request = new BetterMockHttpServletRequest();
+ request.setupServerName("bob");
+ request.setupGetProtocol("http");
+ request.setupScheme("scheme");
+ request.setupPathInfo("damn");
+ request.setupGetServletPath("damn2");
+ request.setupGetContextPath("wow");
+ request.setupGetContentType("html/text");
+ request.setupAddHeader("Content-type", "html/text");
+ Vector v = new Vector();
+ request.setupGetParameterNames(v.elements());
+ request.setSession(session);
+ HttpServletResponse response = new MockHttpServletResponse();
+ ServletConfig config = new MockServletConfig();
+ RunData rd = rds.getRunData(request, response, config);
+ SessionValidator sessionValidator = new DefaultSessionValidator();
+ sessionValidator.doPerform(rd);
+ User turbineUser = rd.getUser();
+ assertNotNull(turbineUser);
+ return turbineUser;
}
public void tearDown()
{
1.2 +46 -46 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
Index: AccessControlListTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AccessControlListTest.java 23 Aug 2003 03:56:24 -0000 1.1
+++ AccessControlListTest.java 23 Aug 2003 15:30:48 -0000 1.2
@@ -9,11 +9,11 @@
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.impl.memory.MemoryGroupManager;
-import org.apache.fulcrum.security.impl.memory.MemoryRoleManager;
-import org.apache.fulcrum.security.impl.memory.MemoryUserManager;
-import org.apache.fulcrum.security.impl.memory.entity.MemoryGroup;
-import org.apache.fulcrum.security.impl.memory.entity.MemoryRole;
+import org.apache.fulcrum.security.model.simple.entity.SimpleGroup;
+import org.apache.fulcrum.security.model.simple.entity.SimpleRole;
+import org.apache.fulcrum.security.model.simple.manager.SimpleRoleManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleUserManager;
+import org.apache.fulcrum.security.model.simple.manager.SimpleGroupManager;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.RoleSet;
@@ -26,9 +26,9 @@
public class AccessControlListTest extends BaseUnitTest
{
private FactoryService factoryService = null;
- private MemoryUserManager userManager;
- private MemoryGroupManager groupManager;
- private MemoryRoleManager roleManager;
+ private SimpleUserManager userManager;
+ private SimpleGroupManager groupManager;
+ private SimpleRoleManager roleManager;
private PermissionManager permissionManager;
private AccessControlList acl;
private static int counter = 1;
@@ -55,9 +55,9 @@
this.setConfigurationFileName("src/test/AccessControlList.xml");
factoryService = (FactoryService) this.lookup(FactoryService.ROLE);
SecurityService securityService = (SecurityService) lookup(SecurityService.ROLE);
- userManager = (MemoryUserManager) securityService.getUserManager();
- groupManager = (MemoryGroupManager) securityService.getGroupManager();
- roleManager = (MemoryRoleManager) securityService.getRoleManager();
+ userManager = (SimpleUserManager) securityService.getUserManager();
+ groupManager = (SimpleGroupManager) securityService.getGroupManager();
+ roleManager = (SimpleRoleManager) securityService.getRoleManager();
permissionManager = securityService.getPermissionManager();
}
catch (ComponentException e)
@@ -118,7 +118,7 @@
groupManager.grant(group, role2);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
acl = new DefaultAccessControlList(roleSets, permissionSets);
RoleSet resultRoleSet = acl.getRoles(group);
assertTrue(resultRoleSet.contains(role));
@@ -141,8 +141,8 @@
groupManager.grant(group2, role3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
acl = new DefaultAccessControlList(roleSets, permissionSets);
RoleSet resultRoleSet = acl.getRoles();
assertTrue(resultRoleSet.contains(role));
@@ -173,8 +173,8 @@
roleManager.grant(role2, permission3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- permissionSets.put(role, ((MemoryRole) role).getPermissions());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ permissionSets.put(role, ((SimpleRole) role).getPermissions());
acl = new DefaultAccessControlList(roleSets, permissionSets);
PermissionSet resultPermissionSet = acl.getPermissions(group);
assertEquals(3, resultPermissionSet.size());
@@ -207,11 +207,11 @@
roleManager.grant(role2, permission3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
- permissionSets.put(role, ((MemoryRole) role).getPermissions());
- permissionSets.put(role2, ((MemoryRole) role2).getPermissions());
- permissionSets.put(role3, ((MemoryRole) role3).getPermissions());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
+ permissionSets.put(role, ((SimpleRole) role).getPermissions());
+ permissionSets.put(role2, ((SimpleRole) role2).getPermissions());
+ permissionSets.put(role3, ((SimpleRole) role3).getPermissions());
acl = new DefaultAccessControlList(roleSets, permissionSets);
PermissionSet resultPermissionSet = acl.getPermissions();
assertEquals(3, resultPermissionSet.size());
@@ -232,8 +232,8 @@
groupManager.grant(group2, role3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
acl = new DefaultAccessControlList(roleSets, permissionSets);
assertTrue(acl.hasRole(role, group));
assertTrue(acl.hasRole(role, group2));
@@ -259,8 +259,8 @@
groupManager.grant(group2, role3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
acl = new DefaultAccessControlList(roleSets, permissionSets);
GroupSet groupSet = new GroupSet();
groupSet.add(group);
@@ -289,8 +289,8 @@
groupManager.grant(group2, role3);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
acl = new DefaultAccessControlList(roleSets, permissionSets);
assertTrue(acl.hasRole(role.getName(), group.getName()));
assertTrue(acl.hasRole(role.getName(), group2.getName()));
@@ -325,11 +325,11 @@
roleManager.grant(role3, permission4);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
- permissionSets.put(role, ((MemoryRole) role).getPermissions());
- permissionSets.put(role2, ((MemoryRole) role2).getPermissions());
- permissionSets.put(role3, ((MemoryRole) role3).getPermissions());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
+ permissionSets.put(role, ((SimpleRole) role).getPermissions());
+ permissionSets.put(role2, ((SimpleRole) role2).getPermissions());
+ permissionSets.put(role3, ((SimpleRole) role3).getPermissions());
acl = new DefaultAccessControlList(roleSets, permissionSets);
assertTrue(acl.hasPermission(permission, group));
assertTrue(acl.hasPermission(permission2, group));
@@ -368,13 +368,13 @@
roleManager.grant(role4, permission5);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
- roleSets.put(group3, ((MemoryGroup) group3).getRoles());
- permissionSets.put(role, ((MemoryRole) role).getPermissions());
- permissionSets.put(role2, ((MemoryRole) role2).getPermissions());
- permissionSets.put(role3, ((MemoryRole) role3).getPermissions());
- permissionSets.put(role4, ((MemoryRole) role4).getPermissions());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
+ roleSets.put(group3, ((SimpleGroup) group3).getRoles());
+ permissionSets.put(role, ((SimpleRole) role).getPermissions());
+ permissionSets.put(role2, ((SimpleRole) role2).getPermissions());
+ permissionSets.put(role3, ((SimpleRole) role3).getPermissions());
+ permissionSets.put(role4, ((SimpleRole) role4).getPermissions());
acl = new DefaultAccessControlList(roleSets, permissionSets);
GroupSet groupSet = new GroupSet();
groupSet.add(group);
@@ -414,13 +414,13 @@
roleManager.grant(role4, permission5);
Map roleSets = new HashMap();
Map permissionSets = new HashMap();
- roleSets.put(group, ((MemoryGroup) group).getRoles());
- roleSets.put(group2, ((MemoryGroup) group2).getRoles());
- roleSets.put(group3, ((MemoryGroup) group3).getRoles());
- permissionSets.put(role, ((MemoryRole) role).getPermissions());
- permissionSets.put(role2, ((MemoryRole) role2).getPermissions());
- permissionSets.put(role3, ((MemoryRole) role3).getPermissions());
- permissionSets.put(role4, ((MemoryRole) role4).getPermissions());
+ roleSets.put(group, ((SimpleGroup) group).getRoles());
+ roleSets.put(group2, ((SimpleGroup) group2).getRoles());
+ roleSets.put(group3, ((SimpleGroup) group3).getRoles());
+ permissionSets.put(role, ((SimpleRole) role).getPermissions());
+ permissionSets.put(role2, ((SimpleRole) role2).getPermissions());
+ permissionSets.put(role3, ((SimpleRole) role3).getPermissions());
+ permissionSets.put(role4, ((SimpleRole) role4).getPermissions());
acl = new DefaultAccessControlList(roleSets, permissionSets);
assertTrue(acl.hasPermission(permission));
assertTrue(acl.hasPermission(permission2));