You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2017/04/12 09:48:46 UTC
svn commit: r1791100 [1/2] - in /turbine/fulcrum/trunk/security: api/
api/src/java/org/apache/fulcrum/security/model/turbine/
api/src/java/org/apache/fulcrum/security/spi/ api/src/test/
api/src/test/org/apache/fulcrum/security/authenticator/ api/src/te...
Author: gk
Date: Wed Apr 12 09:48:44 2017
New Revision: 1791100
URL: http://svn.apache.org/viewvc?rev=1791100&view=rev
Log:
- Update all Tests to JUnit 4
- allow global group in Turbne (and dynamic) model, cft TurbineModelManager, AbstractTurbineModelManager
- allow optional second level permission check by allowing to NOT implement TurbineRole (and TurbineGroup), cft. api TurbineAccessControlListImpl and torque TorqueTurbineModelManagerImpl
- require only TurbineUser not TurbineGroup/TurbineRole in TorqueTurbineModelManagerImpl (redundant?)
Added:
turbine/fulcrum/trunk/security/api/src/test/ACLModelComponentConfig.xml
- copied, changed from r1790970, turbine/fulcrum/trunk/security/api/src/test/ACLComponentConfig.xml
turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleModelConfig.xml
- copied, changed from r1791099, turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleConfig.xml
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java (with props)
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
- copied, changed from r1790970, turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java (with props)
Removed:
turbine/fulcrum/trunk/security/api/src/test/ACLComponentConfig.xml
turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleConfig.xml
Modified:
turbine/fulcrum/trunk/security/api/pom.xml
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineACLFactory.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
turbine/fulcrum/trunk/security/api/src/test/DynamicACLRoleConfig.xml
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/ACLFactoryTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/basic/test/AbstractModelManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateGroupManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateRoleManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateUserManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperDefaultImplTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/StartingSecurityServicesTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java
turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/ldap/pom.xml
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/acl/AccessControlListTest.java
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPBasicModelManagerTest.java
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPUserManagerTest.java
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPUserManagerTest.java
turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/nt/pom.xml
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/StartingSecurityServicesTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Wed Apr 12 09:48:44 2017
@@ -56,6 +56,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/AbstractTurbineModelManager.java Wed Apr 12 09:48:44 2017
@@ -19,6 +19,8 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
@@ -39,24 +41,40 @@ import org.apache.fulcrum.security.util.
* @version $Id: AbstractDynamicModelManager.java,v 1.2 2004/07/07 18:18:09
* epugh Exp $
*/
-public abstract class AbstractTurbineModelManager extends AbstractManager implements TurbineModelManager
+public abstract class AbstractTurbineModelManager extends AbstractManager implements TurbineModelManager, Configurable
{
+
+
+ private String globalGroupName;
+ // ---------------- Avalon Lifecycle Methods ---------------------
+ /**
+ * Avalon component lifecycle method
+ */
+ @Override
+ public void configure(Configuration conf)
+ {
+ globalGroupName = conf.getAttribute(
+ TurbineModelManager.GLOBAL_GROUP_ATTR_NAME,
+ TurbineModelManager.GLOBAL_GROUP_NAME);
+ }
+
/**
* Provides a reference to the Group object that represents the <a
* href="#global">global group </a>.
*
* @return A Group object that represents the global group.
*/
- public Group getGlobalGroup() throws DataBackendException
+ @Override
+ public Group getGlobalGroup() throws DataBackendException
{
Group g = null;
try
{
- g = getGroupManager().getGroupByName(GLOBAL_GROUP_NAME);
+ g = getGroupManager().getGroupByName(globalGroupName);
}
catch (UnknownEntityException uee)
{
- g = getGroupManager().getGroupInstance(GLOBAL_GROUP_NAME);
+ g = getGroupManager().getGroupInstance(globalGroupName);
try
{
getGroupManager().addGroup(g);
@@ -82,7 +100,8 @@ public abstract class AbstractTurbineMod
* @throws UnknownEntityException
* if the Role is not present.
*/
- public synchronized void revokeAll(Role role) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void revokeAll(Role role) throws DataBackendException, UnknownEntityException
{
boolean roleExists = false;
roleExists = getRoleManager().checkExists(role);
@@ -114,7 +133,8 @@ public abstract class AbstractTurbineMod
* @throws UnknownEntityException
* if the Role is not present.
*/
- public synchronized void revokeAll(User user) throws DataBackendException, UnknownEntityException
+ @Override
+ public synchronized void revokeAll(User user) throws DataBackendException, UnknownEntityException
{
boolean userExists = false;
userExists = getUserManager().checkExists(user);
@@ -134,4 +154,9 @@ public abstract class AbstractTurbineMod
}
}
+
+ @Override
+ public String getGlobalGroupName() {
+ return globalGroupName;
+ }
}
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineACLFactory.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineACLFactory.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineACLFactory.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineACLFactory.java Wed Apr 12 09:48:44 2017
@@ -20,7 +20,9 @@ package org.apache.fulcrum.security.mode
*/
import java.util.Set;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.security.GroupManager;
+import org.apache.fulcrum.security.ModelManager;
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.entity.Group;
@@ -43,6 +45,29 @@ import org.apache.fulcrum.security.util.
*/
public class TurbineACLFactory extends AbstractManager implements ACLFactory
{
+
+ private TurbineModelManager modelManager;
+
+ /**
+ * @return
+ */
+ protected TurbineModelManager getTurbineModelManager() throws DataBackendException
+ {
+ if (modelManager == null)
+ {
+ try
+ {
+ modelManager = (TurbineModelManager) manager.lookup(ModelManager.ROLE);
+
+ }
+ catch (ServiceException ce)
+ {
+ throw new DataBackendException(ce.getMessage(), ce);
+ }
+ }
+ return modelManager;
+ }
+
/**
* @see org.apache.fulcrum.security.model.ACLFactory#getAccessControlList(org.apache.fulcrum.security.entity.User)
*/
@@ -81,11 +106,13 @@ public class TurbineACLFactory extends A
{
GroupManager groupManager = null;
RoleManager roleManager = null;
+ TurbineModelManager modelManager = null;
try
{
roleManager = getRoleManager();
groupManager = getGroupManager();
+ modelManager = getTurbineModelManager();
// make sure the global group exists
if (groupManager != null)
@@ -93,11 +120,11 @@ public class TurbineACLFactory extends A
Group g = null;
try
{
- g = groupManager.getGroupByName(TurbineModelManager.GLOBAL_GROUP_NAME);
+ g = groupManager.getGroupByName(modelManager.getGlobalGroupName());
}
catch (UnknownEntityException uee)
{
- g = groupManager.getGroupInstance(TurbineModelManager.GLOBAL_GROUP_NAME);
+ g = groupManager.getGroupInstance(modelManager.getGlobalGroupName());
try
{
groupManager.addGroup(g);
@@ -119,7 +146,7 @@ public class TurbineACLFactory extends A
{
accessControlList =
new TurbineAccessControlListImpl(turbineUserGroupRoleSet,
- groupManager, roleManager);
+ groupManager, roleManager, modelManager);
}
catch (FulcrumSecurityException e)
{
@@ -127,4 +154,5 @@ public class TurbineACLFactory extends A
}
return accessControlList;
}
+
}
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java Wed Apr 12 09:48:44 2017
@@ -85,12 +85,13 @@ public class TurbineAccessControlListImp
* The set of user/group/role relations that this acl is built from
* @param groupManager the Group manager
* @param roleManager the Role manager
+ * @param modelManager he model Manager
*
* @throws FulcrumSecurityException if the global group cannot be retrieved
*/
public TurbineAccessControlListImpl(
Set<? extends TurbineUserGroupRole> turbineUserGroupRoleSet,
- GroupManager groupManager, RoleManager roleManager) throws FulcrumSecurityException
+ GroupManager groupManager, RoleManager roleManager, TurbineModelManager modelManager) throws FulcrumSecurityException
{
this.roleSets = new HashMap<Group, RoleSet>();
this.permissionSets = new HashMap<Group, PermissionSet>();
@@ -101,7 +102,7 @@ public class TurbineAccessControlListImp
Group group = ugr.getGroup();
groupSet.add(group);
- TurbineRole role = (TurbineRole)ugr.getRole();
+ Role role = ugr.getRole();
if (!roleSet.containsId(role.getId()))
{
// get fresh reference from role manager to make sure the related
@@ -114,7 +115,7 @@ public class TurbineAccessControlListImp
}
else
{
- role = (TurbineRole)roleSet.getById(role.getId());
+ role = roleSet.getById(role.getId());
}
if (roleSets.containsKey(group))
{
@@ -126,22 +127,24 @@ public class TurbineAccessControlListImp
rs.add(role);
roleSets.put(group, rs);
}
-
- PermissionSet ps = role.getPermissions();
- permissionSet.add(ps);
- if (permissionSets.containsKey(group))
- {
- permissionSets.get(group).add(ps);
- }
- else
- {
- permissionSets.put(group, ps);
+ // if required, otherwise skip
+ if (role instanceof TurbineRole) {
+ PermissionSet ps = ((TurbineRole) role).getPermissions();
+ permissionSet.add(ps);
+ if (permissionSets.containsKey(group))
+ {
+ permissionSets.get(group).add(ps);
+ }
+ else
+ {
+ permissionSets.put(group, ps);
+ }
}
}
if (groupManager != null)
{
- this.globalGroup = groupManager.getGroupByName(TurbineModelManager.GLOBAL_GROUP_NAME);
+ this.globalGroup = groupManager.getGroupByName(modelManager.getGlobalGroupName());
}
else
{
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java Wed Apr 12 09:48:44 2017
@@ -35,10 +35,17 @@ import org.apache.fulcrum.security.util.
*/
public interface TurbineModelManager extends ModelManager
{
+
+
+ /**
+ * attribute where global group name could be set
+ */
+ String GLOBAL_GROUP_ATTR_NAME = "globalGroup";
+
/**
- * The name of the <a href="#global">global group</a>
+ * The name of the <a href="#global">global group</a>, if no global group name is set in model manager
*/
- String GLOBAL_GROUP_NAME = "global";
+ public String GLOBAL_GROUP_NAME = "global";
/**
* Provides a reference to the Group object that represents the <a
@@ -47,6 +54,12 @@ public interface TurbineModelManager ext
* @return A Group object that represents the global group.
*/
Group getGlobalGroup() throws DataBackendException;
+
+ /**
+ *
+ * @return the configured global group name, by default {@link #GLOBAL_GROUP_ATTR_NAME}
+ */
+ public String getGlobalGroupName();
/**
* Puts a permission in a role
Modified: turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java (original)
+++ turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java Wed Apr 12 09:48:44 2017
@@ -25,6 +25,7 @@ import org.apache.avalon.framework.servi
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.fulcrum.security.GroupManager;
+import org.apache.fulcrum.security.ModelManager;
import org.apache.fulcrum.security.PermissionManager;
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.UserManager;
@@ -42,7 +43,7 @@ public abstract class AbstractManager ex
{
boolean composed = false;
- private ServiceManager manager = null;
+ protected ServiceManager manager = null;
private PermissionManager permissionManager;
private RoleManager roleManager;
private GroupManager groupManager;
@@ -139,13 +140,15 @@ public abstract class AbstractManager ex
/**
* Avalon Service lifecycle method
*/
- public void service(ServiceManager manager) throws ServiceException
+ @Override
+ public void service(ServiceManager manager) throws ServiceException
{
this.manager = manager;
}
- public void dispose()
+ @Override
+ public void dispose()
{
release(roleManager);
release(permissionManager);
Copied: turbine/fulcrum/trunk/security/api/src/test/ACLModelComponentConfig.xml (from r1790970, turbine/fulcrum/trunk/security/api/src/test/ACLComponentConfig.xml)
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/ACLModelComponentConfig.xml?p2=turbine/fulcrum/trunk/security/api/src/test/ACLModelComponentConfig.xml&p1=turbine/fulcrum/trunk/security/api/src/test/ACLComponentConfig.xml&r1=1790970&r2=1791100&rev=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/ACLComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/test/ACLModelComponentConfig.xml Wed Apr 12 09:48:44 2017
@@ -19,4 +19,5 @@
-->
<componentConfig>
<acl/>
+ <modelManager globalGroup="dumb"/>
</componentConfig>
Modified: turbine/fulcrum/trunk/security/api/src/test/DynamicACLRoleConfig.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/DynamicACLRoleConfig.xml?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/DynamicACLRoleConfig.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/test/DynamicACLRoleConfig.xml Wed Apr 12 09:48:44 2017
@@ -23,4 +23,8 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="acl"
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
+ <role
+ name="org.apache.fulcrum.security.ModelManager"
+ shorthand="modelManager"
+ default-class="org.apache.fulcrum.security.model.dynamic.test.ModelManagerDummyImpl"/>
</role-list>
Copied: turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleModelConfig.xml (from r1791099, turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleConfig.xml)
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleModelConfig.xml?p2=turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleModelConfig.xml&p1=turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleConfig.xml&r1=1791099&r2=1791100&rev=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleConfig.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/test/TurbineACLRoleModelConfig.xml Wed Apr 12 09:48:44 2017
@@ -23,4 +23,9 @@
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="acl"
default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
+
+ <role
+ name="org.apache.fulcrum.security.ModelManager"
+ shorthand="modelManager"
+ default-class="org.apache.fulcrum.security.model.turbine.test.ModelManagerDummyImpl"/>
</role-list>
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java Wed Apr 12 09:48:44 2017
@@ -19,31 +19,27 @@ package org.apache.fulcrum.security.auth
* under the License.
*/
+import static org.junit.Assert.*;
+
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Before;
+import org.junit.Test;
/**
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class CryptoAuthenticatorTest extends BaseUnitTest
+public class CryptoAuthenticatorTest extends BaseUnit4Test
+
{
private static final String preDefinedInput = "Oeltanks";
private static final String preDefinedResult = "uVDiJHaavRYX8oWt5ctkaa7j1cw=";
- /**
- * Constructor for CryptoAuthenticatorTest.
- *
- * @param arg0
- */
- public CryptoAuthenticatorTest(String arg0)
- {
- super(arg0);
- }
- @Override
+ @Before
public void setUp()
{
try
@@ -57,6 +53,7 @@ public class CryptoAuthenticatorTest ext
}
}
+ @Test
public void testAuthenticate() throws Exception
{
User user = new DynamicUserImpl();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java Wed Apr 12 09:48:44 2017
@@ -19,18 +19,21 @@ package org.apache.fulcrum.security.auth
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
/**
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class NoOpAuthenticatorTest extends TestCase
+public class NoOpAuthenticatorTest
{
+ @Test
public void testAuthenticate() throws Exception
{
User user = new DynamicUserImpl();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java Wed Apr 12 09:48:44 2017
@@ -19,19 +19,22 @@ package org.apache.fulcrum.security.auth
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
/**
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: TextMatchAuthenticatorTest.java 535465 2007-05-05 06:58:06Z tv
* $
*/
-public class TextMatchAuthenticatorTest extends TestCase
+public class TextMatchAuthenticatorTest
{
+ @Test
public void testAuthenticate() throws Exception
{
User user = new DynamicUserImpl();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/entity/impl/SecurityEntityImplTest.java Wed Apr 12 09:48:44 2017
@@ -18,9 +18,10 @@ package org.apache.fulcrum.security.enti
* specific language governing permissions and limitations
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.SecurityEntity;
+import static org.junit.Assert.*;
+import org.junit.Test;
/**
* Test the SecurityEntityImple
@@ -28,24 +29,15 @@ import org.apache.fulcrum.security.entit
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class SecurityEntityImplTest extends TestCase
+public class SecurityEntityImplTest
{
/**
- * Constructor for SecurityEntityImplTest.
- *
- * @param arg0
- */
- public SecurityEntityImplTest(String arg0)
- {
- super(arg0);
- }
-
- /**
* Make sure lowercasing logic works properly.
*
* @throws Exception
*/
+ @Test
public void testSettingGettingName() throws Exception
{
SecurityEntity se = new SecurityEntityImpl();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/ACLFactoryTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/ACLFactoryTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/ACLFactoryTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/ACLFactoryTest.java Wed Apr 12 09:48:44 2017
@@ -19,6 +19,7 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import org.apache.fulcrum.security.ModelManager;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.model.basic.BasicAccessControlList;
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
@@ -35,6 +36,7 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicRoleImpl;
import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
+import org.apache.fulcrum.security.model.turbine.TurbineModelManager;
import org.apache.fulcrum.security.model.turbine.entity.TurbineGroup;
import org.apache.fulcrum.security.model.turbine.entity.TurbinePermission;
import org.apache.fulcrum.security.model.turbine.entity.TurbineRole;
@@ -59,12 +61,17 @@ public class ACLFactoryTest extends Base
super(arg0);
}
- public void testCreatingTurbineACL() throws Exception
+ public void testCreatingTurbineACLandModel() throws Exception
{
- this.setRoleFileName("src/test/TurbineACLRoleConfig.xml");
- this.setConfigurationFileName("src/test/ACLComponentConfig.xml");
+ this.setRoleFileName("src/test/TurbineACLRoleModelConfig.xml");
+ this.setConfigurationFileName("src/test/ACLModelComponentConfig.xml");
ACLFactory factory = (ACLFactory) lookup(ACLFactory.ROLE);
+
+ TurbineModelManager modelManager = (TurbineModelManager) lookup(TurbineModelManager.ROLE);
+ assertTrue(modelManager.getGlobalGroupName().equals("dumb"));
+
+ //factory.ge
TurbineUser user = new TurbineUserImpl();
user.setName("bob");
user.setId(new Integer(1));
@@ -92,9 +99,13 @@ public class ACLFactoryTest extends Base
public void testCreatingDynamicACL() throws Exception
{
this.setRoleFileName("src/test/DynamicACLRoleConfig.xml");
- this.setConfigurationFileName("src/test/ACLComponentConfig.xml");
-
+ this.setConfigurationFileName("src/test/ACLModelComponentConfig.xml");
+
+ ModelManager modelManager = (ModelManager) lookup(ModelManager.ROLE);
+ assertTrue(modelManager != null);
+
ACLFactory factory = (ACLFactory) lookup(ACLFactory.ROLE);
+
DynamicUser user = new DynamicUserImpl();
user.setName("bob");
user.setId(new Integer(1));
@@ -119,7 +130,7 @@ public class ACLFactoryTest extends Base
public void testCreatingBasicACL() throws Exception
{
this.setRoleFileName("src/test/BasicACLRoleConfig.xml");
- this.setConfigurationFileName("src/test/ACLComponentConfig.xml");
+ this.setConfigurationFileName("src/test/ACLModelComponentConfig.xml");
ACLFactory factory = (ACLFactory) lookup(ACLFactory.ROLE);
BasicUser user = new BasicUserImpl();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/basic/test/AbstractModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/basic/test/AbstractModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/basic/test/AbstractModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/basic/test/AbstractModelManagerTest.java Wed Apr 12 09:48:44 2017
@@ -19,6 +19,8 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import static org.junit.Assert.*;
+
import org.apache.fulcrum.security.GroupManager;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
@@ -28,7 +30,9 @@ import org.apache.fulcrum.security.entit
import org.apache.fulcrum.security.model.basic.BasicModelManager;
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author Eric Pugh
@@ -36,7 +40,7 @@ import org.apache.fulcrum.testcontainer.
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public abstract class AbstractModelManagerTest extends BaseUnitTest
+public abstract class AbstractModelManagerTest extends BaseUnit4Test
{
protected Role role;
protected BasicModelManager modelManager;
@@ -44,25 +48,15 @@ public abstract class AbstractModelManag
protected UserManager userManager;
protected SecurityService securityService;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
userManager = securityService.getUserManager();
groupManager = securityService.getGroupManager();
modelManager = (BasicModelManager) securityService.getModelManager();
}
- /**
- * Constructor for AbstractRoleManagerTest.
- *
- * @param arg0
- */
- public AbstractModelManagerTest(String arg0)
- {
- super(arg0);
- }
-
+ @Test
public void testRevokeAllUser() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -83,7 +77,7 @@ public abstract class AbstractModelManag
assertFalse(((BasicGroup) group).getUsersAsSet().contains(user));
assertFalse(((BasicGroup) group2).getUsers().contains(user));
}
-
+ @Test
public void testGrantUserGroup() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -95,7 +89,7 @@ public abstract class AbstractModelManag
assertTrue(((BasicUser) user).getGroups().contains(group));
assertTrue(((BasicGroup) group).getUsers().contains(user));
}
-
+ @Test
public void testRevokeUserGroup() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/AbstractDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017
@@ -42,14 +42,18 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.UserSet;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
/**
* @author Eric Pugh
* @author <a href="mailto:ben@gidley.co.uk">Ben Gidley </a>
*
*/
-public abstract class AbstractDynamicModelManagerTest extends BaseUnitTest
+public abstract class AbstractDynamicModelManagerTest extends BaseUnit4Test
{
private static final String ONLY_BORRIS_PERMISSION = "ONLY_BORRIS_PERMISSION";
@@ -75,10 +79,9 @@ public abstract class AbstractDynamicMod
protected SecurityService securityService;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
roleManager = securityService.getRoleManager();
userManager = securityService.getUserManager();
groupManager = securityService.getGroupManager();
@@ -86,7 +89,9 @@ public abstract class AbstractDynamicMod
modelManager = (DynamicModelManager) securityService.getModelManager();
}
- @Override
+
+ @Override
+ @After
public void tearDown()
{
this.release(roleManager);
@@ -96,16 +101,8 @@ public abstract class AbstractDynamicMod
this.release(modelManager);
}
- /**
- * Constructor for AbstractRoleManagerTest.
- *
- * @param arg0
- */
- public AbstractDynamicModelManagerTest(String arg0)
- {
- super(arg0);
- }
+ @Test
public void testGrantRolePermission() throws Exception
{
Permission permission = permissionManager.getPermissionInstance();
@@ -119,7 +116,7 @@ public abstract class AbstractDynamicMod
assertEquals(1, permissions.size());
assertTrue(((DynamicRole) role).getPermissions().contains(permission));
}
-
+ @Test
public void testRevokeRolePermission() throws Exception
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
@@ -137,7 +134,7 @@ public abstract class AbstractDynamicMod
assertEquals(0, permissions.size());
assertFalse(((DynamicRole) role).getPermissions().contains(permission));
}
-
+ @Test
public void testRevokeAllRole() throws Exception
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
@@ -158,7 +155,7 @@ public abstract class AbstractDynamicMod
permissions = ((DynamicRole) role).getPermissions();
assertEquals(0, permissions.size());
}
-
+ @Test
public void testRevokeAllGroup() throws Exception
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
@@ -179,7 +176,7 @@ public abstract class AbstractDynamicMod
permissions = ((DynamicRole) role).getPermissions();
assertEquals(0, permissions.size());
}
-
+ @Test
public void testRevokeAllUser() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -205,7 +202,7 @@ public abstract class AbstractDynamicMod
assertFalse(((DynamicRole) role).getGroups().contains(group));
}
-
+ @Test
public void testRevokeAllPermission() throws Exception
{
Role role = securityService.getRoleManager().getRoleInstance();
@@ -226,7 +223,7 @@ public abstract class AbstractDynamicMod
roles = ((DynamicPermission) permission).getRoles();
assertEquals(0, roles.size());
}
-
+ @Test
public void testGrantUserGroup() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -238,7 +235,7 @@ public abstract class AbstractDynamicMod
assertTrue(((DynamicUser) user).getGroups().contains(group));
assertTrue(((DynamicGroup) group).getUsers().contains(user));
}
-
+ @Test
public void testRevokeUserGroup() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -252,7 +249,7 @@ public abstract class AbstractDynamicMod
user = userManager.getUser("Lima");
assertFalse(((DynamicUser) user).getGroups().contains(group));
}
-
+ @Test
public void testGrantGroupRole() throws Exception
{
Role role = securityService.getRoleManager().getRoleInstance();
@@ -266,7 +263,7 @@ public abstract class AbstractDynamicMod
assertTrue(((DynamicRole) role).getGroups().contains(group));
}
-
+ @Test
public void testRevokeGroupRole() throws Exception
{
Role role = securityService.getRoleManager().getRoleInstance();
@@ -280,7 +277,7 @@ public abstract class AbstractDynamicMod
assertFalse(((DynamicGroup) group).getRoles().contains(role));
assertFalse(((DynamicRole) role).getGroups().contains(group));
}
-
+ @Test
public void testRetrieveingUsersByGroup() throws Exception
{
User user = userManager.getUserInstance("Joe3");
@@ -322,7 +319,7 @@ public abstract class AbstractDynamicMod
assertTrue(found);
assertTrue(users.contains(user));
}
-
+ @Test
public void testAddRemoveDelegate() throws Exception
{
DynamicUser borris = (DynamicUser) userManager.getUserInstance(USERNAME_BORRIS);
Added: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java?rev=1791100&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java (added)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java Wed Apr 12 09:48:44 2017
@@ -0,0 +1,9 @@
+package org.apache.fulcrum.security.model.dynamic.test;
+
+import org.apache.fulcrum.security.ModelManager;
+
+public class ModelManagerDummyImpl implements ModelManager
+{
+
+
+}
Propchange: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/dynamic/test/ModelManagerDummyImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractGroupManagerTest.java Wed Apr 12 09:48:44 2017
@@ -26,7 +26,9 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import static org.junit.Assert.*;
+import org.junit.Test;
/**
* @author Eric Pugh
@@ -34,25 +36,17 @@ import org.apache.fulcrum.testcontainer.
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public abstract class AbstractGroupManagerTest extends BaseUnitTest
+public abstract class AbstractGroupManagerTest extends BaseUnit4Test
{
protected Group group;
protected GroupManager groupManager;
protected SecurityService securityService;
- /**
- * Constructor for AbstractTurbineModelManagerTest.
- *
- * @param arg0
- */
- public AbstractGroupManagerTest(String arg0)
- {
- super(arg0);
- }
/*
* Class to test for Group getGroupInstance()
*/
+ @Test
public void testGetGroupInstance() throws Exception
{
group = groupManager.getGroupInstance();
@@ -63,12 +57,13 @@ public abstract class AbstractGroupManag
/*
* Class to test for Group getGroupInstance(String)
*/
+ @Test
public void testGetGroupInstanceString() throws Exception
{
group = groupManager.getGroupInstance("DOG_CATCHER");
assertEquals("DOG_CATCHER".toLowerCase(), group.getName());
}
-
+ @Test
public void testGetGroup() throws Exception
{
group = groupManager.getGroupInstance("DOG_CATCHER2");
@@ -76,7 +71,7 @@ public abstract class AbstractGroupManag
Group group2 = groupManager.getGroupByName("DOG_CATCHER2");
assertEquals(group.getName(), group2.getName());
}
-
+ @Test
public void testGetGroupByName() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_KENNEL");
@@ -86,7 +81,7 @@ public abstract class AbstractGroupManag
group2 = groupManager.getGroupByName("Clean_KeNNel");
assertEquals(group.getName(), group2.getName());
}
-
+ @Test
public void testGetGroupById() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_KENNEL_A");
@@ -94,7 +89,7 @@ public abstract class AbstractGroupManag
Group group2 = groupManager.getGroupById(group.getId());
assertEquals(group.getName(), group2.getName());
}
-
+ @Test
public void testGetAllGroups() throws Exception
{
int size = groupManager.getAllGroups().size();
@@ -103,7 +98,7 @@ public abstract class AbstractGroupManag
GroupSet groupSet = groupManager.getAllGroups();
assertEquals(size + 1, groupSet.size());
}
-
+ @Test
public void testRemoveGroup() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_KENNEL_K");
@@ -126,7 +121,7 @@ public abstract class AbstractGroupManag
}
assertEquals(size - 1, groupManager.getAllGroups().size());
}
-
+ @Test
public void testRenameGroup() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_KENNEL_X");
@@ -137,7 +132,7 @@ public abstract class AbstractGroupManag
assertEquals("CLEAN_GROOMING_ROOM".toLowerCase(), group2.getName());
assertEquals(size, groupManager.getAllGroups().size());
}
-
+ @Test
public void testCheckExists() throws Exception
{
group = groupManager.getGroupInstance("GREET_PEOPLE");
@@ -146,7 +141,7 @@ public abstract class AbstractGroupManag
Group group2 = groupManager.getGroupInstance("WALK_DOGS");
assertFalse(groupManager.checkExists(group2));
}
-
+ @Test
public void testCheckExistsWithString() throws Exception
{
group = groupManager.getGroupInstance("GREET_PEOPLE2");
@@ -159,6 +154,7 @@ public abstract class AbstractGroupManag
/*
* Class to test for boolean checkExists(string)
*/
+ @Test
public void testAddGroupTwiceFails() throws Exception
{
group = groupManager.getGroupInstance("EATLUNCH");
@@ -174,7 +170,7 @@ public abstract class AbstractGroupManag
// good
}
}
-
+ @Test
public void testAddGroup() throws Exception
{
group = groupManager.getGroupInstance("CLEAN_RABBIT_HUTCHES");
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractPermissionManagerTest.java Wed Apr 12 09:48:44 2017
@@ -28,7 +28,10 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
/**
* @author Eric Pugh
@@ -36,26 +39,16 @@ import org.apache.fulcrum.testcontainer.
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public abstract class AbstractPermissionManagerTest extends BaseUnitTest
+public abstract class AbstractPermissionManagerTest extends BaseUnit4Test
{
protected Permission permission;
protected PermissionManager permissionManager;
protected SecurityService securityService;
- /**
- * Constructor for PermissionManagerTest.
- *
- * @param arg0
- */
- public AbstractPermissionManagerTest(String arg0)
-
- {
- super(arg0);
- }
-
/*
* Class to test for Permission getPermissionInstance()
*/
+ @Test
public void testGetPermissionInstance() throws Exception
{
permission = permissionManager.getPermissionInstance();
@@ -66,12 +59,13 @@ public abstract class AbstractPermission
/*
* Class to test for Permission getPermissionInstance(String)
*/
+ @Test
public void testGetPermissionInstanceString() throws Exception
{
permission = permissionManager.getPermissionInstance("CAN_TREAT_ANIMALS");
assertEquals("can_treat_animals", permission.getName());
}
-
+ @Test
public void testGetPermissionByName() throws Exception
{
permission = permissionManager.getPermissionInstance("CLEAN_KENNEL");
@@ -79,7 +73,7 @@ public abstract class AbstractPermission
Permission permission2 = permissionManager.getPermissionByName("CLEAN_KENNEL");
assertEquals(permission.getName(), permission2.getName());
}
-
+ @Test
public void testGetPermissionById() throws Exception
{
permission = permissionManager.getPermissionInstance("ADMINSTER_DRUGS");
@@ -87,7 +81,7 @@ public abstract class AbstractPermission
Permission permission2 = permissionManager.getPermissionById(permission.getId());
assertEquals(permission.getName(), permission2.getName());
}
-
+ @Test
public void testGetAllPermissions() throws Exception
{
int size = permissionManager.getAllPermissions().size();
@@ -96,7 +90,7 @@ public abstract class AbstractPermission
PermissionSet permissionSet = permissionManager.getAllPermissions();
assertEquals(size + 1, permissionSet.size());
}
-
+ @Test
public void testRenamePermission() throws Exception
{
permission = permissionManager.getPermissionInstance("CLEAN_FRONT_OFFICE");
@@ -107,7 +101,7 @@ public abstract class AbstractPermission
assertEquals("CLEAN_GROOMING_ROOM".toLowerCase(), permission2.getName());
assertEquals(size, permissionManager.getAllPermissions().size());
}
-
+ @Test
public void testRemovePermission() throws Exception
{
permission = permissionManager.getPermissionInstance("CLEAN_CAT_HOUSE");
@@ -123,7 +117,7 @@ public abstract class AbstractPermission
// good
}
}
-
+ @Test
public void testAddPermission() throws Exception
{
permission = permissionManager.getPermissionInstance("CLEAN_BIG_KENNEL");
@@ -137,6 +131,7 @@ public abstract class AbstractPermission
/*
* Class to test for PermissionSet getPermissions(Role)
*/
+ @Test
public void testGetPermissionsRole() throws Exception
{
permission = permissionManager.getPermissionInstance("GREET_PEOPLE");
@@ -155,6 +150,7 @@ public abstract class AbstractPermission
/*
* Class to test for boolean checkExists(permission)
*/
+ @Test
public void testCheckExistsPermission() throws Exception
{
permission = permissionManager.getPermissionInstance("OPEN_OFFICE");
@@ -167,6 +163,7 @@ public abstract class AbstractPermission
/*
* Class to test for boolean checkExists(string)
*/
+ @Test
public void testCheckExistsPermissionWithString() throws Exception
{
permission = permissionManager.getPermissionInstance("OPEN_OFFICE2");
@@ -179,6 +176,7 @@ public abstract class AbstractPermission
/*
* Class to test for boolean checkExists(string)
*/
+ @Test
public void testAddPermissionTwiceFails() throws Exception
{
permission = permissionManager.getPermissionInstance("EATLUNCH");
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractRoleManagerTest.java Wed Apr 12 09:48:44 2017
@@ -19,13 +19,21 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Test;
/**
* @author Eric Pugh
@@ -33,26 +41,16 @@ import org.apache.fulcrum.testcontainer.
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public abstract class AbstractRoleManagerTest extends BaseUnitTest
+public abstract class AbstractRoleManagerTest extends BaseUnit4Test
{
protected Role role;
protected RoleManager roleManager;
protected SecurityService securityService;
- /**
- * Constructor for AbstractRoleManagerTest.
- *
- * @param arg0
- */
- public AbstractRoleManagerTest(String arg0)
-
- {
- super(arg0);
- }
-
/*
* Class to test for Role getRoleInstance()
*/
+ @Test
public void testGetRoleInstance() throws Exception
{
role = roleManager.getRoleInstance();
@@ -63,12 +61,13 @@ public abstract class AbstractRoleManage
/*
* Class to test for Role getRoleInstance(String)
*/
+ @Test
public void testGetRoleInstanceString() throws Exception
{
role = roleManager.getRoleInstance("DOG_CATCHER");
assertEquals("dog_catcher", role.getName());
}
-
+ @Test
public void testGetRoleByName() throws Exception
{
role = roleManager.getRoleInstance("DOG_CATCHERd");
@@ -76,7 +75,7 @@ public abstract class AbstractRoleManage
Role role2 = roleManager.getRoleByName("DOG_CATCHERd");
assertEquals(role.getName(), role2.getName());
}
-
+ @Test
public void testGetRoleById() throws Exception
{
role = roleManager.getRoleInstance("CLEAN_KENNEL_A");
@@ -84,7 +83,7 @@ public abstract class AbstractRoleManage
Role role2 = roleManager.getRoleById(role.getId());
assertEquals(role.getName(), role2.getName());
}
-
+ @Test
public void testRenameRole() throws Exception
{
role = roleManager.getRoleInstance("CLEAN_KENNEL_X");
@@ -95,7 +94,7 @@ public abstract class AbstractRoleManage
assertEquals("clean_grooming_room", role2.getName());
assertEquals(size, roleManager.getAllRoles().size());
}
-
+ @Test
public void testGetAllRoles() throws Exception
{
int size = roleManager.getAllRoles().size();
@@ -104,7 +103,7 @@ public abstract class AbstractRoleManage
RoleSet roleSet = roleManager.getAllRoles();
assertEquals(size + 1, roleSet.size());
}
-
+ @Test
public void testAddRole() throws Exception
{
role = roleManager.getRoleInstance("DOG_NAPPER");
@@ -113,7 +112,7 @@ public abstract class AbstractRoleManage
assertNotNull(role.getId());
assertNotNull(roleManager.getRoleById(role.getId()));
}
-
+ @Test
public void testRemoveRole() throws Exception
{
role = roleManager.getRoleInstance("CLEAN_KENNEL_K");
@@ -131,7 +130,7 @@ public abstract class AbstractRoleManage
}
assertEquals(size - 1, roleManager.getAllRoles().size());
}
-
+ @Test
public void testCheckExists() throws Exception
{
role = roleManager.getRoleInstance("GREET_PEOPLE");
@@ -140,7 +139,7 @@ public abstract class AbstractRoleManage
Role role2 = roleManager.getRoleInstance("WALK_DOGS");
assertFalse(roleManager.checkExists(role2));
}
-
+ @Test
public void testCheckExistsWithString() throws Exception
{
role = roleManager.getRoleInstance("GREET_PEOPLE2");
@@ -153,6 +152,7 @@ public abstract class AbstractRoleManage
/*
* Class to test for boolean checkExists(string)
*/
+ @Test
public void testAddRoleTwiceFails() throws Exception
{
role = roleManager.getRoleInstance("EATLUNCH");
Modified: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/test/AbstractUserManagerTest.java Wed Apr 12 09:48:44 2017
@@ -19,6 +19,13 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.acl.AccessControlList;
@@ -27,7 +34,8 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.UserSet;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Test;
/**
* @author Eric Pugh
@@ -35,22 +43,13 @@ import org.apache.fulcrum.testcontainer.
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public abstract class AbstractUserManagerTest extends BaseUnitTest
+public abstract class AbstractUserManagerTest extends BaseUnit4Test
{
protected User user;
protected UserManager userManager;
protected SecurityService securityService;
- /**
- * Constructor for AbstractUserManagerTest.
- *
- * @param arg0
- */
- public AbstractUserManagerTest(String arg0)
- {
- super(arg0);
- }
-
+ @Test
public void testCheckExists() throws Exception
{
user = userManager.getUserInstance("Philip");
@@ -61,7 +60,7 @@ public abstract class AbstractUserManage
user = userManager.getUserInstance("ImaginaryFriend");
assertFalse(userManager.checkExists(user));
}
-
+ @Test
public void testCheckExistsWithString() throws Exception
{
user = userManager.getUserInstance("Philip2");
@@ -76,6 +75,7 @@ public abstract class AbstractUserManage
/*
* Class to test for User retrieve(String)
*/
+ @Test
public void testGetUserString() throws Exception
{
user = userManager.getUserInstance("QuietMike");
@@ -83,7 +83,7 @@ public abstract class AbstractUserManage
user = userManager.getUser("QuietMike");
assertNotNull(user);
}
-
+ @Test
public void testGetUserById() throws Exception
{
user = userManager.getUserInstance("QuietMike2");
@@ -96,6 +96,7 @@ public abstract class AbstractUserManage
/*
* Class to test for User retrieve(String, String)
*/
+ @Test
public void testGetUserStringString() throws Exception
{
user = userManager.getUserInstance("Richard");
@@ -114,7 +115,7 @@ public abstract class AbstractUserManage
// good
}
}
-
+ @Test
public void testGetAllUsers() throws Exception
{
int size = userManager.getAllUsers().size();
@@ -123,7 +124,7 @@ public abstract class AbstractUserManage
UserSet userSet = userManager.getAllUsers();
assertEquals(size + 1, userSet.size());
}
-
+ @Test
public void testAuthenticate() throws Exception
{
user = userManager.getUserInstance("Kay");
@@ -139,7 +140,7 @@ public abstract class AbstractUserManage
// good
}
}
-
+ @Test
public void testChangePassword() throws Exception
{
user = userManager.getUserInstance("Jonathan");
@@ -156,7 +157,7 @@ public abstract class AbstractUserManage
userManager.changePassword(user, "jc", "JC");
userManager.authenticate(user, "JC");
}
-
+ @Test
public void testForcePassword() throws Exception
{
user = userManager.getUserInstance("Connor");
@@ -168,6 +169,7 @@ public abstract class AbstractUserManage
/*
* Class to test for User getUserInstance()
*/
+ @Test
public void testGetUserInstance() throws Exception
{
user = userManager.getUserInstance();
@@ -178,6 +180,7 @@ public abstract class AbstractUserManage
/*
* Class to test for User getUserInstance(String)
*/
+ @Test
public void testGetUserInstanceString() throws Exception
{
user = userManager.getUserInstance("Philip");
@@ -191,6 +194,7 @@ public abstract class AbstractUserManage
* @todo figur out what to do here...
* @throws Exception
*/
+ @Test
public void testSaveUser() throws Exception
{
user = userManager.getUserInstance("Kate");
@@ -224,7 +228,7 @@ public abstract class AbstractUserManage
// good
}
}
-
+ @Test
public void testAddUser() throws Exception
{
user = userManager.getUserInstance("Joe1");
@@ -263,7 +267,7 @@ public abstract class AbstractUserManage
// good
}
}
-
+ @Test
public void testCheckUserCaseSensitiveExists() throws Exception
{
user = userManager.getUserInstance("borrisJohnson");
Copied: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java (from r1790970, turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java)
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java?p2=turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java&p1=turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java&r1=1790970&r2=1791100&rev=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017
@@ -19,6 +19,11 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Set;
import org.apache.fulcrum.security.GroupManager;
@@ -36,13 +41,15 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.util.PermissionSet;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author Eric Pugh
*
*/
-public abstract class AbstractTurbineModelManagerTest extends BaseUnitTest
+public abstract class AbstractTurbineModelManagerTest extends BaseUnit4Test
{
protected Role role;
@@ -58,34 +65,26 @@ public abstract class AbstractTurbineMod
protected SecurityService securityService;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
+ securityService = (SecurityService) lookup(SecurityService.ROLE);
roleManager = securityService.getRoleManager();
userManager = securityService.getUserManager();
groupManager = securityService.getGroupManager();
permissionManager = securityService.getPermissionManager();
- modelManager = (TurbineModelManager) securityService.getModelManager();
+ modelManager = (TurbineModelManager) securityService.getModelManager();
}
- /**
- * Constructor for AbstractTurbineModelManagerTest.
- *
- * @param arg0
- */
- public AbstractTurbineModelManagerTest(String arg0)
- {
- super(arg0);
- }
+ @Test
public void testGetGlobalGroup() throws Exception
{
Group global = modelManager.getGlobalGroup();
assertNotNull(global);
- assertEquals(global.getName(), TurbineModelManager.GLOBAL_GROUP_NAME);
+ assertEquals(global.getName(), modelManager.getGlobalGroupName());
}
-
+ @Test
public void testGrantRolePermission() throws Exception
{
Permission permission = permissionManager.getPermissionInstance();
@@ -99,7 +98,7 @@ public abstract class AbstractTurbineMod
assertEquals(1, permissions.size());
assertTrue(((TurbineRole) role).getPermissions().contains(permission));
}
-
+ @Test
public void testRevokeRolePermission() throws Exception
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
@@ -117,7 +116,7 @@ public abstract class AbstractTurbineMod
assertEquals(0, permissions.size());
assertFalse(((TurbineRole) role).getPermissions().contains(permission));
}
-
+ @Test
public void testRevokeAllRole() throws Exception
{
Permission permission = securityService.getPermissionManager().getPermissionInstance();
@@ -138,7 +137,7 @@ public abstract class AbstractTurbineMod
permissions = ((TurbineRole) role).getPermissions();
assertEquals(0, permissions.size());
}
-
+ @Test
public void testRevokeAllUser() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -166,7 +165,7 @@ public abstract class AbstractTurbineMod
// assertFalse(((TurbineRole) role).getGroups().contains(group));
}
-
+ @Test
public void testGrantUserGroupRole() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
@@ -194,7 +193,7 @@ public abstract class AbstractTurbineMod
assertTrue(ugrTest.getUser().equals(user));
}
-
+ @Test
public void testRevokeUserGroupRole() throws Exception
{
Group group = securityService.getGroupManager().getGroupInstance();
Added: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java?rev=1791100&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java (added)
+++ turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java Wed Apr 12 09:48:44 2017
@@ -0,0 +1,38 @@
+package org.apache.fulcrum.security.model.turbine.test;
+
+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.entity.User;
+import org.apache.fulcrum.security.model.turbine.AbstractTurbineModelManager;
+import org.apache.fulcrum.security.util.DataBackendException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
+
+public class ModelManagerDummyImpl extends AbstractTurbineModelManager
+{
+
+ @Override
+ public void grant(Role role, Permission permission)
+ throws DataBackendException, UnknownEntityException {
+ throw new DataBackendException("not yet implemented, just a test ");
+ }
+
+ @Override
+ public void revoke(Role role, Permission permission)
+ throws DataBackendException, UnknownEntityException {
+ throw new DataBackendException("not yet implemented, just a test ");
+ }
+
+ @Override
+ public void grant(User user, Group group, Role role)
+ throws DataBackendException, UnknownEntityException {
+ throw new DataBackendException("not yet implemented, just a test ");
+ }
+
+ @Override
+ public void revoke(User user, Group group, Role role)
+ throws DataBackendException, UnknownEntityException {
+ throw new DataBackendException("not yet implemented, just a test ");
+ }
+
+}
Propchange: turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/model/turbine/test/ModelManagerDummyImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Wed Apr 12 09:48:44 2017
@@ -102,6 +102,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateGroupManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateGroupManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateGroupManagerTest.java Wed Apr 12 09:48:44 2017
@@ -19,8 +19,12 @@ package org.apache.fulcrum.security.hibe
* under the License.
*/
+import static org.junit.Assert.fail;
+
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest;
+import org.junit.After;
+import org.junit.Before;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -29,7 +33,7 @@ import org.apache.fulcrum.security.model
*/
public class HibernateGroupManagerTest extends AbstractGroupManagerTest
{
- @Override
+ @Before
public void setUp()
{
try
@@ -48,6 +52,7 @@ public class HibernateGroupManagerTest e
}
@Override
+ @After
public void tearDown()
{
try
@@ -64,13 +69,4 @@ public class HibernateGroupManagerTest e
securityService = null;
}
- /**
- * Constructor for HibernatePermissionManagerTest.
- *
- * @param arg0
- */
- public HibernateGroupManagerTest(String arg0)
- {
- super(arg0);
- }
}
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernatePermissionManagerTest.java Wed Apr 12 09:48:44 2017
@@ -21,7 +21,8 @@ package org.apache.fulcrum.security.hibe
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractPermissionManagerTest;
-
+import org.junit.After;
+import org.junit.Before;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: HibernatePermissionManagerTest.java 1169862 2011-09-12
@@ -29,7 +30,7 @@ import org.apache.fulcrum.security.model
*/
public class HibernatePermissionManagerTest extends AbstractPermissionManagerTest
{
- @Override
+ @Before
public void setUp() throws Exception
{
@@ -43,6 +44,7 @@ public class HibernatePermissionManagerT
}
@Override
+ @After
public void tearDown()
{
permission = null;
@@ -50,13 +52,4 @@ public class HibernatePermissionManagerT
securityService = null;
}
- /**
- * Constructor for HibernatePermissionManagerTest.
- *
- * @param arg0
- */
- public HibernatePermissionManagerTest(String arg0)
- {
- super(arg0);
- }
}
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateRoleManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateRoleManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateRoleManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateRoleManagerTest.java Wed Apr 12 09:48:44 2017
@@ -22,13 +22,19 @@ package org.apache.fulcrum.security.hibe
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class HibernateRoleManagerTest extends AbstractRoleManagerTest
{
- @Override
+ @Before
public void setUp()
{
try
@@ -47,6 +53,7 @@ public class HibernateRoleManagerTest ex
}
@Override
+ @After
public void tearDown()
{
try
@@ -63,13 +70,5 @@ public class HibernateRoleManagerTest ex
securityService = null;
}
- /**
- * Constructor for HibernatePermissionManagerTest.
- *
- * @param arg0
- */
- public HibernateRoleManagerTest(String arg0)
- {
- super(arg0);
- }
+
}
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/HibernateUserManagerTest.java Wed Apr 12 09:48:44 2017
@@ -22,13 +22,19 @@ package org.apache.fulcrum.security.hibe
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractUserManagerTest;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class HibernateUserManagerTest extends AbstractUserManagerTest
{
- @Override
+ @Before
public void setUp()
{
try
@@ -47,6 +53,7 @@ public class HibernateUserManagerTest ex
}
@Override
+ @After
public void tearDown()
{
try
@@ -63,13 +70,4 @@ public class HibernateUserManagerTest ex
securityService = null;
}
- /**
- * Constructor for HibernatePermissionManagerTest.
- *
- * @param arg0
- */
- public HibernateUserManagerTest(String arg0)
- {
- super(arg0);
- }
}
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperDefaultImplTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperDefaultImplTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperDefaultImplTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/PersistenceHelperDefaultImplTest.java Wed Apr 12 09:48:44 2017
@@ -19,28 +19,23 @@ package org.apache.fulcrum.security.hibe
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
import org.hibernate.Session;
+import org.junit.Test;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: PersistenceHelperDefaultImplTest.java 1374014 2012-08-16
* 19:47:27Z tv $
*/
-public class PersistenceHelperDefaultImplTest extends BaseUnitTest
+public class PersistenceHelperDefaultImplTest extends BaseUnit4Test
{
- /**
- * Constructor for PersistenceHelperDefaultImplTest.
- *
- * @param arg0
- */
- public PersistenceHelperDefaultImplTest(String arg0)
- {
- super(arg0);
- }
@SuppressWarnings("unused")
+ @Test
public void testPassingInExternalHibernateService() throws Exception
{
this.setRoleFileName("src/test/PersistenceHelperDefaultImplRoleConfig.xml");
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/StartingSecurityServicesTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/StartingSecurityServicesTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/StartingSecurityServicesTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/StartingSecurityServicesTest.java Wed Apr 12 09:48:44 2017
@@ -19,25 +19,24 @@ package org.apache.fulcrum.security.hibe
* under the License.
*/
+import static org.junit.Assert.assertTrue;
+
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.dynamic.DynamicModelManager;
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
-
+import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.junit.Test;
/**
* @author <a href="mailto:marco@intermeta.de">Marco Knüttel</a>
* @version $Id: StartingSecurityServicesTest.java 535465 2007-05-05 06:58:06Z
* tv $
*/
-public class StartingSecurityServicesTest extends BaseUnitTest
+public class StartingSecurityServicesTest extends BaseUnit4Test
{
private SecurityService securityService = null;
- public StartingSecurityServicesTest(String name)
- {
- super(name);
- }
+ @Test
public void testStartingHibernateSecurity() throws Exception
{
this.setRoleFileName("src/test/DynamicHibernateRoleConfig.xml");
Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateBasicModelManagerTest.java Wed Apr 12 09:48:44 2017
@@ -28,6 +28,12 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest;
import org.hibernate.Transaction;
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: HibernateBasicModelManagerTest.java 1169862 2011-09-12
@@ -36,6 +42,7 @@ import org.hibernate.Transaction;
public class HibernateBasicModelManagerTest extends AbstractModelManagerTest
{
@Override
+ @Before
public void setUp() throws Exception
{
this.setRoleFileName("src/test/BasicHibernateRoleConfig.xml");
@@ -47,6 +54,7 @@ public class HibernateBasicModelManagerT
}
@Override
+ @Test
public void testRevokeAllUser() throws Exception
{
super.testRevokeAllUser();
@@ -59,6 +67,7 @@ public class HibernateBasicModelManagerT
}
@Override
+ @After
public void tearDown()
{
try
@@ -74,13 +83,4 @@ public class HibernateBasicModelManagerT
securityService = null;
}
- /**
- * Constructor for HibernatePermissionManagerTest.
- *
- * @param arg0
- */
- public HibernateBasicModelManagerTest(String arg0)
- {
- super(arg0);
- }
}