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/26 00:50:46 UTC
cvs commit: jakarta-turbine-fulcrum/security/src/test hibernate.cfg.xml SimpleHibernate.hbm.xml
epugh 2003/08/25 15:50:46
Modified: security/src/test/org/apache/fulcrum/security/model/simple/manager
AbstractGroupManagerTest.java
AbstractRoleManagerTest.java
AbstractPermissionManagerTest.java
AbstractUserManagerTest.java
security/src/test/org/apache/fulcrum/security/spi/memory/simple
MemoryRoleManagerTest.java
MemoryPermissionManagerTest.java
MemoryGroupManagerTest.java
MemoryUserManagerTest.java
security/src/test/org/apache/fulcrum/security/spi/hibernate/simple
HibernatePermissionManagerTest.java
HibernateRoleManagerTest.java
HibernateUserManagerTest.java
HibernateGroupManagerTest.java
security/src/test/org/apache/fulcrum/security/spi/nt/simple
NTUserManagerTest.java
security/src/test hibernate.cfg.xml SimpleHibernate.hbm.xml
Log:
Refactorted tests so setUp and tearDown are in non Abstract class. doCustomSetup was
rapidly being joing by doCustomPostSetup and was more confusing then helpful.
Also, new tests.
Revision Changes Path
1.3 +10 -25 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractGroupManagerTest.java
Index: AbstractGroupManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractGroupManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractGroupManagerTest.java 25 Aug 2003 15:31:40 -0000 1.2
+++ AbstractGroupManagerTest.java 25 Aug 2003 22:50:45 -0000 1.3
@@ -14,6 +14,7 @@
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
+
/**
* @author Eric Pugh
*
@@ -22,30 +23,12 @@
*/
public abstract class AbstractGroupManagerTest extends BaseUnitTest
{
- private Group group;
- private GroupManager groupManager;
- private SecurityService securityService;
- public abstract void doCustomSetup() throws Exception;
- public void setUp()
+ protected Group group;
+ protected GroupManager groupManager;
+ protected SecurityService securityService;
+
- {
- try
- {
- doCustomSetup();
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- groupManager = securityService.getGroupManager();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
- }
- public void tearDown()
- {
- group = null;
- groupManager = null;
- securityService = null;
- }
+
/**
* Constructor for AbstractGroupManagerTest.
* @param arg0
@@ -150,10 +133,10 @@
Role role = securityService.getRoleManager().getRoleInstance();
role.setName("TEST_PERMISSION");
securityService.getRoleManager().addRole(role);
- group = groupManager.getGroupInstance("TEST_ROLE");
+ group = groupManager.getGroupInstance("TEST_GROUP");
groupManager.addGroup(group);
((SimpleGroupManager) groupManager).grant(group, role);
- group = groupManager.getGroupByName("TEST_ROLE");
+ group = groupManager.getGroupByName("TEST_GROUP");
assertTrue(((SimpleGroup) group).getRoles().contains(role));
assertTrue(((SimpleRole) role).getGroups().contains(group));
@@ -171,4 +154,6 @@
assertFalse(((SimpleGroup) group).getRoles().contains(role));
assertFalse(((SimpleRole) role).getGroups().contains(group));
}
+
+
}
1.4 +5 -23 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractRoleManagerTest.java
Index: AbstractRoleManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractRoleManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractRoleManagerTest.java 25 Aug 2003 15:31:40 -0000 1.3
+++ AbstractRoleManagerTest.java 25 Aug 2003 22:50:45 -0000 1.4
@@ -21,10 +21,10 @@
*/
public abstract class AbstractRoleManagerTest extends BaseUnitTest
{
- private Role role;
- private SimpleRoleManager roleManager;
- private SecurityService securityService;
- public abstract void doCustomSetup() throws Exception;
+ protected Role role;
+ protected SimpleRoleManager roleManager;
+ protected SecurityService securityService;
+
/**
* Constructor for AbstractRoleManagerTest.
* @param arg0
@@ -34,25 +34,7 @@
{
super(arg0);
}
- public void setUp()
- {
- try
- {
- doCustomSetup();
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- roleManager = (SimpleRoleManager)securityService.getRoleManager();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
- }
- public void tearDown()
- {
- role = null;
- roleManager = null;
- securityService = null;
- }
+
/*
* Class to test for Role getRoleInstance()
*/
1.3 +10 -30 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractPermissionManagerTest.java
Index: AbstractPermissionManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractPermissionManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPermissionManagerTest.java 25 Aug 2003 01:06:14 -0000 1.2
+++ AbstractPermissionManagerTest.java 25 Aug 2003 22:50:45 -0000 1.3
@@ -20,39 +20,20 @@
*/
public abstract class AbstractPermissionManagerTest extends BaseUnitTest
{
- private Permission permission;
- private PermissionManager permissionManager;
- private SecurityService securityService;
-
- public abstract void doCustomSetup() throws Exception;
+ protected Permission permission;
+ protected PermissionManager permissionManager;
+ protected SecurityService securityService;
+
/**
* Constructor for PermissionManagerTest.
* @param arg0
*/
public AbstractPermissionManagerTest(String arg0)
+
{
super(arg0);
}
- public void setUp()
- {
- try
- {
- doCustomSetup();
-
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- permissionManager = securityService.getPermissionManager();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
- }
- public void tearDown()
- {
- permission = null;
- permissionManager = null;
- securityService = null;
- }
+
/*
* Class to test for Permission getPermissionInstance()
*/
@@ -86,11 +67,11 @@
}
public void testGetAllPermissions() throws Exception
{
- int size = permissionManager.getAllPermissions().size();
+ int size = permissionManager.getAllPermissions().size();
permission = permissionManager.getPermissionInstance("WALK_DOGS");
permissionManager.addPermission(permission);
PermissionSet permissionSet = permissionManager.getAllPermissions();
- assertEquals(size+1, permissionSet.size());
+ assertEquals(size + 1, permissionSet.size());
}
public void testRenamePermission() throws Exception
{
@@ -102,7 +83,6 @@
assertEquals("CLEAN_GROOMING_ROOM".toLowerCase(), permission2.getName());
assertEquals(size, permissionManager.getAllPermissions().size());
}
-
public void testRemovePermission() throws Exception
{
permission = permissionManager.getPermissionInstance("CLEAN_CAT_HOUSE");
@@ -122,7 +102,7 @@
{
permission = permissionManager.getPermissionInstance("CLEAN_BIG_KENNEL");
permissionManager.addPermission(permission);
- assertTrue(permission.getId()>0);
+ assertTrue(permission.getId() > 0);
permission = permissionManager.getPermissionById(permission.getId());
assertNotNull(permission);
}
@@ -137,7 +117,7 @@
permissionManager.addPermission(permission2);
Role role = securityService.getRoleManager().getRoleInstance("VET_TECH");
securityService.getRoleManager().addRole(role);
- ((SimpleRoleManager)securityService.getRoleManager()).grant(role, permission);
+ ((SimpleRoleManager) securityService.getRoleManager()).grant(role, permission);
PermissionSet permissionSet = permissionManager.getPermissions(role);
assertEquals(1, permissionSet.size());
assertTrue(permissionSet.contains(permission));
1.4 +59 -32 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractUserManagerTest.java
Index: AbstractUserManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractUserManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractUserManagerTest.java 25 Aug 2003 15:31:40 -0000 1.3
+++ AbstractUserManagerTest.java 25 Aug 2003 22:50:45 -0000 1.4
@@ -5,6 +5,11 @@
* Window>Preferences>Java>Code Generation>Code and Comments
*/
package org.apache.fulcrum.security.model.simple.manager;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.fulcrum.security.GroupManager;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.acl.AccessControlList;
@@ -24,37 +29,16 @@
public abstract class AbstractUserManagerTest extends BaseUnitTest
{
protected User user;
- protected UserManager userManager;
- protected SecurityService securityService;
- public abstract void doCustomSetup() throws Exception;
+ protected UserManager userManager;
+ protected SecurityService securityService;
/**
* Constructor for AbstractUserManagerTest.
* @param arg0
*/
public AbstractUserManagerTest(String arg0)
-
{
super(arg0);
}
- public void setUp()
- {
- try
- {
- doCustomSetup();
- securityService = (SecurityService) lookup(SecurityService.ROLE);
- userManager = securityService.getUserManager();
- }
- catch (Exception e)
- {
- fail(e.toString());
- }
- }
- public void tearDown()
- {
- user = null;
- userManager = null;
- securityService = null;
- }
public void testCheckExists() throws Exception
{
user = userManager.getUserInstance("Philip");
@@ -163,12 +147,13 @@
userManager.addUser(user, "clint");
((SimpleUserManager) userManager).grant(user, group);
((SimpleUserManager) userManager).grant(user, group2);
+
userManager.revokeAll(user);
- assertEquals(0, ((SimpleUser) user).getGroups().size());
- group = securityService.getGroupManager().getGroupByName("TEST_REVOKEALL");
- group2 = securityService.getGroupManager().getGroupByName("TEST_REVOKEALL2");
- assertFalse(((SimpleGroup) group).getUsers().contains(user));
- assertFalse(((SimpleGroup) group2).getUsers().contains(user));
+ assertEquals(0, ((SimpleUser) user).getGroups().size());
+ group = securityService.getGroupManager().getGroupByName("TEST_REVOKEALL");
+ group2 = securityService.getGroupManager().getGroupByName("TEST_REVOKEALL2");
+ assertFalse(((SimpleGroup) group).getUsers().contains(user));
+ assertFalse(((SimpleGroup) group2).getUsers().contains(user));
}
/**
* Need to figure out if save is something we want..
@@ -194,8 +179,7 @@
userManager.addUser(user, "clint");
((SimpleUserManager) userManager).grant(user, group);
assertTrue(((SimpleUser) user).getGroups().contains(group));
- assertTrue(((SimpleGroup)group).getUsers().contains(user));
-
+ assertTrue(((SimpleGroup) group).getUsers().contains(user));
}
public void testRevokeUserGroup() throws Exception
{
@@ -206,9 +190,10 @@
userManager.addUser(user, "pet");
((SimpleUserManager) userManager).revoke(user, group);
assertFalse(((SimpleUser) user).getGroups().contains(group));
- assertFalse(((SimpleGroup)group).getUsers().contains(user));
+ assertFalse(((SimpleGroup) group).getUsers().contains(user));
+ user = userManager.getUser("Lima");
+ assertFalse(((SimpleUser) user).getGroups().contains(group));
}
-
public void testGetACL() throws Exception
{
user = userManager.getUserInstance("Tony");
@@ -239,5 +224,47 @@
userManager.addUser(user, "mc");
assertTrue(user.getId() > 0);
assertNotNull(userManager.getUser(user.getName()));
+ }
+ public void testRetrieveingUsersByGroup() throws Exception
+ {
+ user = userManager.getUserInstance("Joe3");
+ userManager.addUser(user, "mc");
+ String GROUP_NAME = "oddbug2";
+ Group group = null;
+ GroupManager groupManager = securityService.getGroupManager();
+ try
+ {
+ group = groupManager.getGroupByName("");
+ }
+ catch (UnknownEntityException uue)
+ {
+ group = groupManager.getGroupInstance(GROUP_NAME);
+ groupManager.addGroup(group);
+ }
+ assertNotNull(group);
+ User user = null;
+ UserManager userManager = securityService.getUserManager();
+ user = userManager.getUser("joe3");
+ ((SimpleUserManager) userManager).grant(user, group);
+ assertTrue(((SimpleGroup) group).getUsers().contains(user));
+ group = groupManager.getGroupByName(GROUP_NAME);
+ Set users = ((SimpleGroup) group).getUsers();
+ int size = users.size();
+ assertEquals(1, size);
+ // assertTrue("Check class:" + users.getClass().getName(),users instanceof UserSet);
+ boolean found = false;
+ Set newSet = new HashSet();
+ for (Iterator i = users.iterator(); i.hasNext();)
+ {
+ User u = (User) i.next();
+ System.out.println(u);
+ if (u.equals(user))
+ {
+ found = true;
+ newSet.add(u);
+ }
+ }
+ assertTrue(found);
+ assertTrue(users.contains(user));
}
}
1.3 +20 -3 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryRoleManagerTest.java
Index: MemoryRoleManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryRoleManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryRoleManagerTest.java 25 Aug 2003 01:06:14 -0000 1.2
+++ MemoryRoleManagerTest.java 25 Aug 2003 22:50:46 -0000 1.3
@@ -3,7 +3,9 @@
*
*/
package org.apache.fulcrum.security.spi.memory.simple;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractRoleManagerTest;
+import org.apache.fulcrum.security.model.simple.manager.SimpleRoleManager;
/**
* @author Eric Pugh
*
@@ -15,10 +17,25 @@
{
junit.textui.TestRunner.run(MemoryRoleManagerTest.class);
}
- public void doCustomSetup()
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ roleManager = (SimpleRoleManager) securityService.getRoleManager();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ role = null;
+ roleManager = null;
+ securityService = null;
}
/**
* Constructor for MemoryPermissionManagerTest.
1.3 +19 -3 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryPermissionManagerTest.java
Index: MemoryPermissionManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryPermissionManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryPermissionManagerTest.java 25 Aug 2003 01:06:14 -0000 1.2
+++ MemoryPermissionManagerTest.java 25 Aug 2003 22:50:46 -0000 1.3
@@ -3,6 +3,7 @@
*
*/
package org.apache.fulcrum.security.spi.memory.simple;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractPermissionManagerTest;
/**
* @author Eric Pugh
@@ -15,10 +16,25 @@
{
junit.textui.TestRunner.run(MemoryPermissionManagerTest.class);
}
- public void doCustomSetup()
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ permissionManager = securityService.getPermissionManager();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ permission = null;
+ permissionManager = null;
+ securityService = null;
}
/**
* Constructor for MemoryPermissionManagerTest.
1.3 +21 -5 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryGroupManagerTest.java
Index: MemoryGroupManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryGroupManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryGroupManagerTest.java 25 Aug 2003 01:06:14 -0000 1.2
+++ MemoryGroupManagerTest.java 25 Aug 2003 22:50:46 -0000 1.3
@@ -3,6 +3,7 @@
*
*/
package org.apache.fulcrum.security.spi.memory.simple;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractGroupManagerTest;
/**
* @author Eric Pugh
@@ -15,11 +16,26 @@
{
junit.textui.TestRunner.run(MemoryGroupManagerTest.class);
}
- public void doCustomSetup()
- {
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleMemory.xml");
- }
+ public void setUp()
+ {
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ groupManager = securityService.getGroupManager();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ group = null;
+ groupManager = null;
+ securityService = null;
+ }
/**
* Constructor for MemoryPermissionManagerTest.
* @param arg0
1.3 +19 -3 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryUserManagerTest.java
Index: MemoryUserManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/memory/simple/MemoryUserManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryUserManagerTest.java 25 Aug 2003 01:06:14 -0000 1.2
+++ MemoryUserManagerTest.java 25 Aug 2003 22:50:46 -0000 1.3
@@ -3,6 +3,7 @@
*
*/
package org.apache.fulcrum.security.spi.memory.simple;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractUserManagerTest;
/**
* @author Eric Pugh
@@ -15,10 +16,25 @@
{
junit.textui.TestRunner.run(MemoryUserManagerTest.class);
}
- public void doCustomSetup()
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleMemory.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ userManager = securityService.getUserManager();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ user = null;
+ userManager = null;
+ securityService = null;
}
/**
* Constructor for MemoryPermissionManagerTest.
1.2 +30 -6 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerTest.java
Index: HibernatePermissionManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernatePermissionManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernatePermissionManagerTest.java 24 Aug 2003 19:52:06 -0000 1.1
+++ HibernatePermissionManagerTest.java 25 Aug 2003 22:50:46 -0000 1.2
@@ -4,7 +4,7 @@
*/
package org.apache.fulcrum.security.spi.hibernate.simple;
import net.sf.hibernate.avalon.HibernateService;
-
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractPermissionManagerTest;
import org.apache.fulcrum.security.spi.hibernate.HibernateHelper;
/**
@@ -15,12 +15,36 @@
*/
public class HibernatePermissionManagerTest extends AbstractPermissionManagerTest
{
- public void doCustomSetup() throws Exception
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleHibernate.xml");
- HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
- HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleHibernate.xml");
+ HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
+ HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ permissionManager = securityService.getPermissionManager();
+ ((BaseHibernateManager) permissionManager).setHibernateSession(hibernateService.openSession());
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ try
+ {
+ ((BaseHibernateManager) permissionManager).getHibernateSession().close();
+ }
+ catch (Exception e)
+ {
+ fail(e.getMessage());
+ }
+ permission = null;
+ permissionManager = null;
+ securityService = null;
}
/**
* Constructor for HibernatePermissionManagerTest.
1.2 +31 -6 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerTest.java
Index: HibernateRoleManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateRoleManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateRoleManagerTest.java 24 Aug 2003 19:52:06 -0000 1.1
+++ HibernateRoleManagerTest.java 25 Aug 2003 22:50:46 -0000 1.2
@@ -4,8 +4,9 @@
*/
package org.apache.fulcrum.security.spi.hibernate.simple;
import net.sf.hibernate.avalon.HibernateService;
-
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractRoleManagerTest;
+import org.apache.fulcrum.security.model.simple.manager.SimpleRoleManager;
import org.apache.fulcrum.security.spi.hibernate.HibernateHelper;
/**
* @author Eric Pugh
@@ -15,12 +16,36 @@
*/
public class HibernateRoleManagerTest extends AbstractRoleManagerTest
{
- public void doCustomSetup() throws Exception
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleHibernate.xml");
- HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
- HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleHibernate.xml");
+ HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
+ HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ roleManager = (SimpleRoleManager) securityService.getRoleManager();
+ ((BaseHibernateManager) roleManager).setHibernateSession(hibernateService.openSession());
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ try
+ {
+ ((BaseHibernateManager) roleManager).getHibernateSession().close();
+ }
+ catch (Exception e)
+ {
+ fail(e.getMessage());
+ }
+ role = null;
+ roleManager = null;
+ securityService = null;
}
/**
* Constructor for HibernatePermissionManagerTest.
1.2 +31 -5 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerTest.java
Index: HibernateUserManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateUserManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateUserManagerTest.java 24 Aug 2003 19:52:06 -0000 1.1
+++ HibernateUserManagerTest.java 25 Aug 2003 22:50:46 -0000 1.2
@@ -5,6 +5,7 @@
package org.apache.fulcrum.security.spi.hibernate.simple;
import net.sf.hibernate.avalon.HibernateService;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractUserManagerTest;
import org.apache.fulcrum.security.spi.hibernate.HibernateHelper;
/**
@@ -15,12 +16,37 @@
*/
public class HibernateUserManagerTest extends AbstractUserManagerTest
{
- public void doCustomSetup() throws Exception
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleHibernate.xml");
- HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
- HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleHibernate.xml");
+ HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
+ HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ userManager = securityService.getUserManager();
+
+ ((BaseHibernateManager) userManager).setHibernateSession(hibernateService.openSession());
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ try
+ {
+ ((BaseHibernateManager) userManager).getHibernateSession().close();
+ }
+ catch (Exception e)
+ {
+ fail(e.getMessage());
+ }
+ user = null;
+ userManager = null;
+ securityService = null;
}
/**
* Constructor for HibernatePermissionManagerTest.
1.2 +30 -5 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerTest.java
Index: HibernateGroupManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/hibernate/simple/HibernateGroupManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateGroupManagerTest.java 24 Aug 2003 19:52:06 -0000 1.1
+++ HibernateGroupManagerTest.java 25 Aug 2003 22:50:46 -0000 1.2
@@ -5,6 +5,7 @@
package org.apache.fulcrum.security.spi.hibernate.simple;
import net.sf.hibernate.avalon.HibernateService;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.simple.manager.AbstractGroupManagerTest;
import org.apache.fulcrum.security.spi.hibernate.HibernateHelper;
/**
@@ -15,12 +16,36 @@
*/
public class HibernateGroupManagerTest extends AbstractGroupManagerTest
{
- public void doCustomSetup() throws Exception
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleHibernate.xml");
- HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
- HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleHibernate.xml");
+ HibernateService hibernateService = (HibernateService) lookup(HibernateService.ROLE);
+ HibernateHelper.exportSchema(hibernateService.getConfiguration());
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ groupManager = securityService.getGroupManager();
+ ((BaseHibernateManager) groupManager).setHibernateSession(hibernateService.openSession());
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ try
+ {
+ ((BaseHibernateManager) groupManager).getHibernateSession().close();
+ }
+ catch (Exception e)
+ {
+ fail(e.getMessage());
+ }
+ group = null;
+ groupManager = null;
+ securityService = null;
}
/**
* Constructor for HibernatePermissionManagerTest.
1.2 +31 -4 jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/nt/simple/NTUserManagerTest.java
Index: NTUserManagerTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/spi/nt/simple/NTUserManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NTUserManagerTest.java 25 Aug 2003 01:06:14 -0000 1.1
+++ NTUserManagerTest.java 25 Aug 2003 22:50:46 -0000 1.2
@@ -5,12 +5,12 @@
package org.apache.fulcrum.security.spi.nt.simple;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
import org.apache.fulcrum.security.model.simple.manager.AbstractUserManagerTest;
import org.apache.fulcrum.security.model.simple.manager.SimpleUserManager;
-
import com.tagish.auth.win32.NTSystem;
/**
* @author Eric Pugh
@@ -30,10 +30,25 @@
{
junit.textui.TestRunner.run(NTUserManagerTest.class);
}
- public void doCustomSetup() throws Exception
+ public void setUp()
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/SimpleNT.xml");
+ try
+ {
+ this.setRoleFileName(null);
+ this.setConfigurationFileName("src/test/SimpleNT.xml");
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
+ userManager = securityService.getUserManager();
+ }
+ catch (Exception e)
+ {
+ fail(e.toString());
+ }
+ }
+ public void tearDown()
+ {
+ user = null;
+ userManager = null;
+ securityService = null;
}
/**
* Constructor for MemoryPermissionManagerTest.
@@ -278,6 +293,18 @@
}
}
public void testAddUser() throws Exception
+ {
+ try
+ {
+ user = userManager.getUserInstance("Joe1");
+ userManager.addUser(user, "mc");
+ }
+ catch (RuntimeException re)
+ {
+ assertTrue(re.getMessage().equals(ERROR_MSG));
+ }
+ }
+ public void testRetrieveingUsersByGroup() throws Exception
{
try
{
1.2 +10 -2 jakarta-turbine-fulcrum/security/src/test/hibernate.cfg.xml
Index: hibernate.cfg.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/hibernate.cfg.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hibernate.cfg.xml 24 Aug 2003 19:46:41 -0000 1.1
+++ hibernate.cfg.xml 25 Aug 2003 22:50:46 -0000 1.2
@@ -13,13 +13,21 @@
<property name="use_outer_join">true</property>
<!-- properties for this SessionFactory only -->
+
<property name="connection.driver_class">com.mckoi.JDBCDriver</property>
<property name="connection.username">test</property>
<property name="connection.password">test</property>
<property name="connection.url">jdbc:mckoi:local://./src/test/mcKoi.conf?create=true</property>
<property name="dialect">net.sf.hibernate.dialect.MckoiDialect</property>
-
- <property name="cglib.use_reflection_optimizer">true</property>
+ <!--
+ <property name="connection.driver_class">com.microsoft.jdbc.sqlserver.SQLServerDriver</property>
+ <property name="connection.username">hibernate</property>
+ <property name="connection.password">hibernate</property>
+ <property name="connection.url">jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=hibernate;SelectMethod=cursor</property>
+ <property name="dialect">net.sf.hibernate.dialect.SybaseDialect</property>
+ <property name="query.substitutions">true=1, false=0</property>
+ -->
+
<!-- mapping files -->
<mapping resource="SimpleHibernate.hbm.xml"/>
</session-factory>
1.3 +6 -6 jakarta-turbine-fulcrum/security/src/test/SimpleHibernate.hbm.xml
Index: SimpleHibernate.hbm.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/SimpleHibernate.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleHibernate.hbm.xml 25 Aug 2003 15:31:41 -0000 1.2
+++ SimpleHibernate.hbm.xml 25 Aug 2003 22:50:46 -0000 1.3
@@ -17,29 +17,29 @@
</id>
<property name="name" column="NAME" type="string"/>
- <set name="hibernatePermissions" lazy="false" table="ROLE_PERMISSION">
+ <set name="hibernatePermissions" lazy="true" table="ROLE_PERMISSION">
<key column="ROLE_ID"/>
<many-to-many class="org.apache.fulcrum.security.model.simple.entity.SimplePermission" column="PERMISSION_ID"/>
</set>
- <set name="hibernateGroups" lazy="false" table="GROUP_ROLE" inverse="true">
+ <set name="hibernateGroups" lazy="true" table="GROUP_ROLE" inverse="true" cascade="none">
<key column="ROLE_ID"/>
<many-to-many class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" column="GROUP_ID"/>
</set>
</class>
- <class name="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" table="GROUP" >
+ <class name="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" table="GROUPS" >
<id name="id" type="long" column="GROUP_ID" unsaved-value="0">
<generator class="native"/>
</id>
<property name="name" column="NAME" type="string"/>
- <set name="hibernateRoles" lazy="false" table="GROUP_ROLE" cascade="save-update">
+ <set name="hibernateRoles" lazy="true" table="GROUP_ROLE" cascade="none" >
<key column="GROUP_ID"/>
<many-to-many class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleRole" column="ROLE_ID"/>
</set>
- <set name="users" lazy="false" table="HIBUSER_GROUP" inverse="true">
+ <set name="hibernateUsers" lazy="true" table="HIBUSER_GROUP" cascade="none" >
<key column="GROUP_ID"/>
<many-to-many class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleUser" column="USER_ID"/>
</set>
@@ -52,7 +52,7 @@
<property name="name" column="USERNAME" type="string"/>
<property name="password" column="PASSWORD" type="string"/>
- <set name="hibernateGroups" lazy="false" table="HIBUSER_GROUP" inverse="true">
+ <set name="hibernateGroups" lazy="true" table="HIBUSER_GROUP" inverse="true" cascade="none">
<key column="USER_ID"/>
<many-to-many class="org.apache.fulcrum.security.spi.hibernate.simple.entity.HibernateSimpleGroup" column="GROUP_ID"/>
</set>