Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java (original) +++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateGroupManagerTest.java Wed Apr 12 09:48:44 2017 @@ -24,6 +24,12 @@ import org.apache.fulcrum.security.hiber import org.apache.fulcrum.security.hibernate.PersistenceHelper; import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest; +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id: HibernateGroupManagerTest.java 1169862 2011-09-12 18:41:35Z tv @@ -31,7 +37,7 @@ import org.apache.fulcrum.security.model */ public class HibernateGroupManagerTest extends AbstractGroupManagerTest { - @Override + @Before public void setUp() { try @@ -50,6 +56,7 @@ public class HibernateGroupManagerTest e } @Override + @After public void tearDown() { try @@ -66,13 +73,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/basic/HibernateUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/basic/HibernateUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,10 +19,14 @@ package org.apache.fulcrum.security.hibe * under the License. */ +import static org.junit.Assert.*; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.hibernate.HibernateHelper; import org.apache.fulcrum.security.hibernate.PersistenceHelper; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; +import org.junit.After; +import org.junit.Before; /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> @@ -30,7 +34,7 @@ import org.apache.fulcrum.security.model */ public class HibernateUserManagerTest extends AbstractUserManagerTest { - @Override + @Before public void setUp() { try @@ -49,6 +53,7 @@ public class HibernateUserManagerTest ex } @Override + @After public void tearDown() { try @@ -65,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/dynamic/HibernateDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -24,6 +24,12 @@ import org.apache.fulcrum.security.hiber import org.apache.fulcrum.security.hibernate.PersistenceHelper; import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest; +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id: HibernateDynamicModelManagerTest.java 1169862 2011-09-12 @@ -32,6 +38,7 @@ import org.apache.fulcrum.security.model public class HibernateDynamicModelManagerTest extends AbstractDynamicModelManagerTest { @Override + @Before public void setUp() { try @@ -50,6 +57,7 @@ public class HibernateDynamicModelManage } @Override + @After public void tearDown() { try @@ -65,13 +73,5 @@ public class HibernateDynamicModelManage securityService = null; } - /** - * Constructor for HibernatePermissionManagerTest. - * - * @param arg0 - */ - public HibernateDynamicModelManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java (original) +++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/dynamic/HibernateExtendedUserGroupManagerTest.java Wed Apr 12 09:48:44 2017 @@ -24,6 +24,12 @@ import org.apache.fulcrum.security.hiber import org.apache.fulcrum.security.hibernate.PersistenceHelper; import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest; +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id: HibernateExtendedUserGroupManagerTest.java 1169862 2011-09-12 @@ -31,7 +37,7 @@ import org.apache.fulcrum.security.model */ public class HibernateExtendedUserGroupManagerTest extends AbstractGroupManagerTest { - @Override + @Before public void setUp() { try @@ -50,6 +56,7 @@ public class HibernateExtendedUserGroupM } @Override + @After public void tearDown() { try @@ -66,13 +73,4 @@ public class HibernateExtendedUserGroupM securityService = null; } - /** - * Constructor for HibernatePermissionManagerTest. - * - * @param arg0 - */ - public HibernateExtendedUserGroupManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/hibernate/src/test/org/apache/fulcrum/security/hibernate/turbine/HibernateTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -23,6 +23,10 @@ import org.apache.fulcrum.security.Secur import org.apache.fulcrum.security.hibernate.HibernateHelper; import org.apache.fulcrum.security.hibernate.PersistenceHelper; import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest; +import org.junit.After; +import org.junit.Before; + +import static org.junit.Assert.fail; /** * @author Eric Pugh @@ -33,6 +37,7 @@ public class HibernateTurbineModelManage { @Override + @Before public void setUp() throws Exception { @@ -52,6 +57,7 @@ public class HibernateTurbineModelManage } @Override + @After public void tearDown() { super.tearDown(); @@ -59,13 +65,4 @@ public class HibernateTurbineModelManage securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public HibernateTurbineModelManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/ldap/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/pom.xml (original) +++ turbine/fulcrum/trunk/security/ldap/pom.xml Wed Apr 12 09:48:44 2017 @@ -16,17 +16,17 @@ limitations under the License. --> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <parent> - <artifactId>fulcrum-security-parent</artifactId> + <parent> + <artifactId>fulcrum-security</artifactId> <groupId>org.apache.fulcrum</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-ldap</artifactId> <name>Fulcrum Security LDAP Impl</name> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <url>http://turbine.apache.org/fulcrum/fulcrum-security/fulcrum-security-ldap</url> <scm> @@ -74,38 +74,32 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-api</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-security-memory</artifactId> - <version>1.1.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> + <version>1.1.1-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-testcontainer</artifactId> - <version>1.0.6</version> + <version>1.0.7</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <version>1.0.6</version> - <scope>test</scope> + <groupId>org.apache.turbine</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.7</version> + <scope>test</scope> </dependency> </dependencies> </project> Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/acl/AccessControlListTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/acl/AccessControlListTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/acl/AccessControlListTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/acl/AccessControlListTest.java Wed Apr 12 09:48:44 2017 @@ -17,6 +17,11 @@ package org.apache.fulcrum.security.ldap * specific language governing permissions and limitations * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -36,13 +41,14 @@ import org.apache.fulcrum.security.model import org.apache.fulcrum.security.model.dynamic.DynamicModelManager; import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup; import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole; -import org.apache.fulcrum.security.util.DataBackendException; import org.apache.fulcrum.security.util.GroupSet; import org.apache.fulcrum.security.util.PermissionSet; 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; /** * Test that we can generate AccessControlLists from the Factory @@ -50,7 +56,7 @@ import org.apache.fulcrum.testcontainer. * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id:AccessControlListTest.java 535465 2007-05-05 06:58:06Z tv $ */ -public class AccessControlListTest extends BaseUnitTest +public class AccessControlListTest extends BaseUnit4Test { private UserManager userManager; @@ -61,22 +67,10 @@ public class AccessControlListTest exten private DynamicAccessControlList acl; private static int counter = 1; private User user; - /** - * Defines the testcase name for JUnit. - * - * @param name the testcase's name. - */ - public AccessControlListTest(String name) - { - super(name); - } - public static void main(String[] args) - { - junit.textui.TestRunner.run(AccessControlListTest.class); - } + + @Before public void setUp() throws Exception { - super.setUp(); this.setRoleFileName("src/test/DynamicLDAPRoleConfig.xml"); this.setConfigurationFileName("src/test/DynamicLDAPComponentConfig.xml"); @@ -96,7 +90,9 @@ public class AccessControlListTest exten * * @see org.apache.fulcrum.testcontainer.BaseUnitTest#tearDown() */ - protected void tearDown() + @Override + @After + public void tearDown() { try { @@ -117,6 +113,7 @@ public class AccessControlListTest exten super.tearDown(); } + @Test public void testCreatingDefaultAccessControlListViaFactory() throws Exception { @@ -142,7 +139,7 @@ public class AccessControlListTest exten assertTrue(dacl.hasRole(role)); assertTrue(dacl.hasPermission(permission)); - } + } @Test public void testGetRolesGroup() throws Exception { Group group = getGroup(); @@ -163,6 +160,7 @@ public class AccessControlListTest exten /* * Class to test for RoleSet getRoles() */ + @Test public void testGetRoles() throws Exception { Group group = getGroup(); @@ -188,6 +186,7 @@ public class AccessControlListTest exten /* * Class to test for PermissionSet getPermissions(Group) */ + @Test public void testGetPermissionsGroup() throws Exception { Group group = getGroup(); @@ -222,6 +221,7 @@ public class AccessControlListTest exten /* * Class to test for PermissionSet getPermissions() */ + @Test public void testGetPermissions() throws Exception { Group group = getGroup(); @@ -254,6 +254,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(Role, Group) */ + @Test public void testHasRoleRoleGroup() throws Exception { Group group = getGroup(); @@ -281,6 +282,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(Role, GroupSet) */ + @Test public void testHasRoleRoleGroupSet() throws Exception { Group group = getGroup(); @@ -311,6 +313,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(String, String) */ + @Test public void testHasRoleStringString() throws Exception { Group group = getGroup(); @@ -338,6 +341,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission, Group) */ + @Test public void testHasPermissionPermissionGroup() throws Exception { Group group = getGroup(); @@ -376,6 +380,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission, GroupSet) */ + @Test public void testHasPermissionPermissionGroupSet() throws Exception { Group group = getGroup(); @@ -422,6 +427,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission) */ + @Test public void testHasPermissionPermission() throws Exception { Group group = getGroup(); Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPBasicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPBasicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPBasicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPBasicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -26,6 +26,11 @@ import org.apache.fulcrum.security.Secur import org.apache.fulcrum.security.entity.User; import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest; import org.apache.fulcrum.security.util.UserSet; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> @@ -33,13 +38,9 @@ import org.apache.fulcrum.security.util. */ public class LDAPBasicModelManagerTest extends AbstractModelManagerTest { - /** - * @param arg0 - */ - public LDAPBasicModelManagerTest(String arg0) - { - super(arg0); - } + + @Override + @Before public void setUp() { try @@ -55,7 +56,9 @@ public class LDAPBasicModelManagerTest e fail(e.toString()); } } - public void tearDown() + @Override + @After + public void tearDown() { try { Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/basic/LDAPUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -24,6 +24,11 @@ import org.apache.fulcrum.security.Secur import org.apache.fulcrum.security.entity.User; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; import org.apache.fulcrum.security.util.UserSet; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; /** * @author Eric Pugh * @@ -32,6 +37,7 @@ import org.apache.fulcrum.security.util. public class LDAPUserManagerTest extends AbstractUserManagerTest { + @Before public void setUp() { try @@ -52,7 +58,9 @@ public class LDAPUserManagerTest extends * * @see org.apache.fulcrum.testcontainer.BaseUnitTest#tearDown() */ - protected void tearDown() + @Override + @After + public void tearDown() { try { @@ -73,19 +81,14 @@ public class LDAPUserManagerTest extends super.tearDown(); } - /** - * Constructor for MemoryPermissionManagerTest. - * @param arg0 - */ - public LDAPUserManagerTest(String arg0) - { - super(arg0); - } + /** * @see org.apache.fulcrum.security.model.test.AbstractUserManagerTest#testChangePassword() */ - public void testChangePassword() throws Exception + @Override + @Test + public void testChangePassword() throws Exception { // Not supported } @@ -93,7 +96,9 @@ public class LDAPUserManagerTest extends /** * @see org.apache.fulcrum.security.model.test.AbstractUserManagerTest#testForcePassword() */ - public void testForcePassword() throws Exception + @Override + @Test + public void testForcePassword() throws Exception { // Not supported } Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -25,20 +25,20 @@ import org.apache.fulcrum.security.entit import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest; import org.apache.fulcrum.security.util.UserSet; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id:LDAPDynamicModelManagerTest.java 535465 2007-05-05 06:58:06Z tv $ */ public class LDAPDynamicModelManagerTest extends AbstractDynamicModelManagerTest { - /** - * @param arg0 - */ - public LDAPDynamicModelManagerTest(String arg0) - { - super(arg0); - } - public void setUp() + + @Override + public void setUp() { try { @@ -53,7 +53,8 @@ public class LDAPDynamicModelManagerTest fail(e.toString()); } } - public void tearDown() + @Override + public void tearDown() { try { Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/dynamic/LDAPUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -24,6 +24,11 @@ import org.apache.fulcrum.security.Secur import org.apache.fulcrum.security.entity.User; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; import org.apache.fulcrum.security.util.UserSet; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; /** * @author Eric Pugh * @@ -32,6 +37,7 @@ import org.apache.fulcrum.security.util. public class LDAPUserManagerTest extends AbstractUserManagerTest { + @Before public void setUp() { try @@ -46,7 +52,9 @@ public class LDAPUserManagerTest extends fail(e.toString()); } } - public void tearDown() + @Override + @After + public void tearDown() { try { @@ -68,12 +76,5 @@ public class LDAPUserManagerTest extends userManager = null; securityService = null; } - /** - * Constructor for LDAPPermissionManagerTest. - * @param arg0 - */ - public LDAPUserManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/ldap/src/test/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -22,15 +22,13 @@ import java.util.Iterator; import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.entity.User; -import org - .apache - .fulcrum - .security - .model - .turbine - .test +import org.apache.fulcrum.security.model.turbine.test .AbstractTurbineModelManagerTest; import org.apache.fulcrum.security.util.UserSet; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; /** * @author Eric Pugh @@ -41,7 +39,9 @@ public class LDAPTurbineModelManagerTest extends AbstractTurbineModelManagerTest { - public void setUp() throws Exception + @Override + @Before + public void setUp() throws Exception { this.setRoleFileName("src/test/TurbineLDAPRoleConfig.xml"); @@ -50,7 +50,9 @@ public class LDAPTurbineModelManagerTest super.setUp(); } - public void tearDown() + @Override + @After + public void tearDown() { try { @@ -72,12 +74,5 @@ public class LDAPTurbineModelManagerTest modelManager = null; securityService = null; } - /** - * Constructor for LDAPPermissionManagerTest. - * @param arg0 - */ - public LDAPTurbineModelManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/memory/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/pom.xml (original) +++ turbine/fulcrum/trunk/security/memory/pom.xml Wed Apr 12 09:48:44 2017 @@ -76,6 +76,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/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java Wed Apr 12 09:48:44 2017 @@ -18,6 +18,9 @@ package org.apache.fulcrum.security; * specific language governing permissions and limitations * under the License. */ +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.avalon.framework.service.ServiceException; import org.apache.fulcrum.security.memory.MemoryGroupManagerImpl; import org.apache.fulcrum.security.memory.MemoryPermissionManagerImpl; @@ -26,7 +29,8 @@ import org.apache.fulcrum.security.memor import org.apache.fulcrum.security.model.basic.BasicModelManager; import org.apache.fulcrum.security.model.dynamic.DynamicModelManager; import org.apache.fulcrum.security.model.turbine.TurbineModelManager; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.junit.Test; /** * @author <a href="mailto:[email protected]";>Marco Knüttel</a> @@ -34,15 +38,13 @@ import org.apache.fulcrum.testcontainer. * tv $ */ -public class StartingSecurityServicesTest extends BaseUnitTest +public class StartingSecurityServicesTest extends BaseUnit4Test { private SecurityService securityService = null; - public StartingSecurityServicesTest(String name) - { - super(name); - } + + @Test public void testStartingDynamicModel() throws Exception { this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml"); @@ -54,7 +56,7 @@ public class StartingSecurityServicesTes assertTrue(securityService.getGroupManager() instanceof MemoryGroupManagerImpl); assertTrue(securityService.getModelManager() instanceof DynamicModelManager); } - + @Test public void testStartingTurbineModel() throws Exception { this.setRoleFileName("src/test/TurbineMemoryRoleConfig.xml"); @@ -68,7 +70,7 @@ public class StartingSecurityServicesTes assertTrue(securityService.getModelManager() instanceof org.apache.fulcrum.security.memory.turbine.MemoryTurbineModelManagerImpl); assertTrue(securityService.getModelManager() instanceof TurbineModelManager); } - + @Test public void testStartingBasicModel() throws Exception { @@ -79,7 +81,7 @@ public class StartingSecurityServicesTes assertTrue(securityService.getGroupManager() instanceof MemoryGroupManagerImpl); assertTrue(securityService.getModelManager() instanceof BasicModelManager); } - + @Test public void testLazyLoadingOfServices() throws Exception { this.setRoleFileName("src/test/LazyLoadRoleConfig.xml"); Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java Wed Apr 12 09:48:44 2017 @@ -18,6 +18,10 @@ package org.apache.fulcrum.security.acl; * specific language governing permissions and limitations * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.HashMap; import java.util.Map; @@ -38,7 +42,9 @@ import org.apache.fulcrum.security.model import org.apache.fulcrum.security.util.GroupSet; import org.apache.fulcrum.security.util.PermissionSet; import org.apache.fulcrum.security.util.RoleSet; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.junit.Before; +import org.junit.Test; /** * Test that we can generate AccessControlLists from the Factory @@ -46,7 +52,7 @@ import org.apache.fulcrum.testcontainer. * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id$ */ -public class AccessControlListTest extends BaseUnitTest +public class AccessControlListTest extends BaseUnit4Test { private UserManager userManager; @@ -58,26 +64,10 @@ public class AccessControlListTest exten private static int counter = 1; private User user; - /** - * Defines the testcase name for JUnit. - * - * @param name - * the testcase's name. - */ - public AccessControlListTest(String name) - { - super(name); - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(AccessControlListTest.class); - } - - @Override + @Before public void setUp() throws Exception { - super.setUp(); + this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml"); this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml"); @@ -91,6 +81,7 @@ public class AccessControlListTest exten } + @Test public void testCreatingDefaultAccessControlListViaFactory() throws Exception { Group group = getGroup(); @@ -116,7 +107,7 @@ public class AccessControlListTest exten assertTrue(dacl.hasPermission(permission)); } - + @Test public void testGetRolesGroup() throws Exception { Group group = getGroup(); @@ -138,6 +129,7 @@ public class AccessControlListTest exten /* * Class to test for RoleSet getRoles() */ + @Test public void testGetRoles() throws Exception { Group group = getGroup(); @@ -164,6 +156,7 @@ public class AccessControlListTest exten /* * Class to test for PermissionSet getPermissions(Group) */ + @Test public void testGetPermissionsGroup() throws Exception { Group group = getGroup(); @@ -199,6 +192,7 @@ public class AccessControlListTest exten /* * Class to test for PermissionSet getPermissions() */ + @Test public void testGetPermissions() throws Exception { Group group = getGroup(); @@ -232,6 +226,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(Role, Group) */ + @Test public void testHasRoleRoleGroup() throws Exception { Group group = getGroup(); @@ -260,6 +255,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(Role, GroupSet) */ + @Test public void testHasRoleRoleGroupSet() throws Exception { Group group = getGroup(); @@ -291,6 +287,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasRole(String, String) */ + @Test public void testHasRoleStringString() throws Exception { Group group = getGroup(); @@ -319,6 +316,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission, Group) */ + @Test public void testHasPermissionPermissionGroup() throws Exception { Group group = getGroup(); @@ -358,6 +356,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission, GroupSet) */ + @Test public void testHasPermissionPermissionGroupSet() throws Exception { Group group = getGroup(); @@ -405,6 +404,7 @@ public class AccessControlListTest exten /* * Class to test for boolean hasPermission(Permission) */ + @Test public void testHasPermissionPermission() throws Exception { Group group = getGroup(); Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -22,6 +22,12 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest; +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id: MemoryBasicModelManagerTest.java 535465 2007-05-05 06:58:06Z tv @@ -29,15 +35,10 @@ import org.apache.fulcrum.security.model */ public class MemoryBasicModelManagerTest extends AbstractModelManagerTest { - /** - * @param arg0 - */ - public MemoryBasicModelManagerTest(String arg0) - { - super(arg0); - } + @Override + @Before public void setUp() { try @@ -55,6 +56,7 @@ public class MemoryBasicModelManagerTest } @Override + @After public void tearDown() { super.tearDown(); Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java Wed Apr 12 09:48:44 2017 @@ -21,6 +21,11 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest; +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * @author Eric Pugh @@ -29,12 +34,9 @@ import org.apache.fulcrum.security.model */ public class MemoryGroupManagerTest extends AbstractGroupManagerTest { - public static void main(String[] args) - { - junit.textui.TestRunner.run(MemoryGroupManagerTest.class); - } - @Override + + @Before public void setUp() { try @@ -51,6 +53,7 @@ public class MemoryGroupManagerTest exte } @Override + @After public void tearDown() { group = null; @@ -58,13 +61,5 @@ public class MemoryGroupManagerTest exte securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryGroupManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,8 +19,11 @@ package org.apache.fulcrum.security.memo * under the License. */ +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; +import org.junit.Before; /** * @author Eric Pugh @@ -30,7 +33,7 @@ import org.apache.fulcrum.security.model public class MemoryUserManagerTest extends AbstractUserManagerTest { - @Override + @Before public void setUp() { try @@ -46,13 +49,4 @@ public class MemoryUserManagerTest exten } } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryUserManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -21,6 +21,12 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + /** * @author <a href="mailto:[email protected]";>Eric Pugh</a> @@ -29,15 +35,10 @@ import org.apache.fulcrum.security.model */ public class MemoryDynamicModelManagerTest extends AbstractDynamicModelManagerTest { - /** - * @param arg0 - */ - public MemoryDynamicModelManagerTest(String arg0) - { - super(arg0); - } + @Override + @Before public void setUp() { try @@ -55,6 +56,7 @@ public class MemoryDynamicModelManagerTe } @Override + @After public void tearDown() { super.tearDown(); Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java Wed Apr 12 09:48:44 2017 @@ -21,6 +21,10 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest; +import org.junit.After; +import org.junit.Before; + +import static org.junit.Assert.*; /** * @author Eric Pugh @@ -29,12 +33,8 @@ import org.apache.fulcrum.security.model */ public class MemoryGroupManagerTest extends AbstractGroupManagerTest { - public static void main(String[] args) - { - junit.textui.TestRunner.run(MemoryGroupManagerTest.class); - } - @Override + @Before public void setUp() { try @@ -51,6 +51,7 @@ public class MemoryGroupManagerTest exte } @Override + @After public void tearDown() { group = null; @@ -58,13 +59,4 @@ public class MemoryGroupManagerTest exte securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryGroupManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java Wed Apr 12 09:48:44 2017 @@ -20,6 +20,9 @@ package org.apache.fulcrum.security.memo */ import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractPermissionManagerTest; +import org.junit.After; +import org.junit.Before; +import static org.junit.Assert.*; /** * @author Eric Pugh @@ -29,7 +32,8 @@ import org.apache.fulcrum.security.model public class MemoryPermissionManagerTest extends AbstractPermissionManagerTest { - @Override + + @Before public void setUp() { try @@ -46,6 +50,7 @@ public class MemoryPermissionManagerTest } @Override + @After public void tearDown() { permission = null; @@ -53,13 +58,4 @@ public class MemoryPermissionManagerTest securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryPermissionManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java Wed Apr 12 09:48:44 2017 @@ -21,6 +21,10 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest; +import org.junit.After; +import org.junit.Before; + +import static org.junit.Assert.*; /** * @author Eric Pugh @@ -30,7 +34,7 @@ import org.apache.fulcrum.security.model public class MemoryRoleManagerTest extends AbstractRoleManagerTest { - @Override + @Before public void setUp() { try @@ -47,6 +51,7 @@ public class MemoryRoleManagerTest exten } @Override + @After public void tearDown() { role = null; @@ -54,13 +59,4 @@ public class MemoryRoleManagerTest exten securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryRoleManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,8 +19,14 @@ package org.apache.fulcrum.security.memo * under the License. */ +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; +import org.junit.After; +import org.junit.Before; + +import static org.junit.Assert.*; /** * @author Eric Pugh @@ -29,8 +35,7 @@ import org.apache.fulcrum.security.model */ public class MemoryUserManagerTest extends AbstractUserManagerTest { - - @Override + @Before public void setUp() { try @@ -47,6 +52,7 @@ public class MemoryUserManagerTest exten } @Override + @After public void tearDown() { user = null; @@ -54,13 +60,4 @@ public class MemoryUserManagerTest exten securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryUserManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -21,6 +21,8 @@ package org.apache.fulcrum.security.memo import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest; +import org.junit.After; +import org.junit.Before; /** * @author Eric Pugh @@ -31,6 +33,7 @@ public class MemoryTurbineModelManagerTe { @Override + @Before public void setUp() throws Exception { @@ -42,6 +45,7 @@ public class MemoryTurbineModelManagerTe } @Override + @After public void tearDown() { super.tearDown(); @@ -49,13 +53,5 @@ public class MemoryTurbineModelManagerTe securityService = null; } - /** - * Constructor for MemoryPermissionManagerTest. - * - * @param arg0 - */ - public MemoryTurbineModelManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/nt/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/nt/pom.xml (original) +++ turbine/fulcrum/trunk/security/nt/pom.xml Wed Apr 12 09:48:44 2017 @@ -11,10 +11,10 @@ language governing permissions and limitations under the License. --> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <parent> - <artifactId>fulcrum-security</artifactId> - <groupId>org.apache.fulcrum</groupId> - <version>1.1.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <artifactId>fulcrum-security</artifactId> + <groupId>org.apache.fulcrum</groupId> + <version>1.1.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>fulcrum-security-nt</artifactId> @@ -49,12 +49,14 @@ <dependency> <groupId>org.apache.fulcrum</groupId> <artifactId>fulcrum-testcontainer</artifactId> + <version>1.0.7</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.fulcrum</groupId> - <artifactId>fulcrum-yaafi</artifactId> - <scope>test</scope> + <groupId>org.apache.turbine</groupId> + <artifactId>fulcrum-yaafi</artifactId> + <version>1.0.7</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.fulcrum</groupId> Modified: turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java (original) +++ turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicACLTest.java Wed Apr 12 09:48:44 2017 @@ -19,6 +19,9 @@ package org.apache.fulcrum.security.nt.d * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.UserManager; import org.apache.fulcrum.security.acl.AccessControlList; @@ -26,7 +29,10 @@ import org.apache.fulcrum.security.entit import org.apache.fulcrum.security.model.basic.BasicAccessControlList; import org.apache.fulcrum.security.util.DataBackendException; import org.apache.fulcrum.security.util.UnknownEntityException; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * @@ -36,7 +42,7 @@ import org.apache.fulcrum.testcontainer. * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id$ */ -public class NTBasicACLTest extends BaseUnitTest implements TestConstants +public class NTBasicACLTest extends BaseUnit4Test implements TestConstants { private static final String DOMAIN = "IQUITOS"; private static final String GUESTUSER = DOMAIN + "/" + "Guest"; @@ -44,7 +50,7 @@ public class NTBasicACLTest extends Base private UserManager userManager; private User user; - @Override + @Before public void setUp() throws Exception { this.setRoleFileName("src/test/BasicNTRoleConfig.xml"); @@ -54,23 +60,15 @@ public class NTBasicACLTest extends Base } @Override + @After public void tearDown() { user = null; userManager = null; securityService = null; } - - /** - * Constructor for NTBasicACLTest. - * - * @param arg0 - */ - public NTBasicACLTest(String arg0) - { - super(arg0); - } - + + @Test public void testLoadingUpGroupsForBasicModelACL() throws Exception { try Modified: turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTBasicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,6 +19,9 @@ package org.apache.fulcrum.security.nt.d * under the License. */ +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.entity.Group; @@ -26,7 +29,11 @@ import org.apache.fulcrum.security.entit import org.apache.fulcrum.security.model.basic.BasicModelManager; import org.apache.fulcrum.security.util.DataBackendException; import org.apache.fulcrum.security.util.UnknownEntityException; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + /** * @@ -36,14 +43,14 @@ import org.apache.fulcrum.testcontainer. * @author <a href="mailto:[email protected]";>Eric Pugh</a> * @version $Id$ */ -public class NTBasicModelManagerTest extends BaseUnitTest implements TestConstants +public class NTBasicModelManagerTest extends BaseUnit4Test implements TestConstants { private BasicModelManager modelManager; private SecurityService securityService; private UserManager userManager; private User user; - @Override + @Before public void setUp() throws Exception { this.setRoleFileName("src/test/BasicNTRoleConfig.xml"); @@ -54,23 +61,16 @@ public class NTBasicModelManagerTest ext } @Override + @After public void tearDown() { user = null; userManager = null; securityService = null; } + - /** - * Constructor for NTBasicModelManagerTest. - * - * @param arg0 - */ - public NTBasicModelManagerTest(String arg0) - { - super(arg0); - } - + @Test public void testRevokeAll() throws Exception { try @@ -93,7 +93,7 @@ public class NTBasicModelManagerTest ext System.out.println("Unit test not being run due to missing NT DLL"); } } - + @Test public void testGrantUserGroup() throws Exception { user = userManager.getUserInstance("domain/BOB"); @@ -119,7 +119,7 @@ public class NTBasicModelManagerTest ext System.out.println("Unit test not being run due to missing NT DLL"); } } - + @Test public void testRevokeUserGroup() throws Exception { try Modified: turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -26,7 +26,13 @@ import org.apache.fulcrum.security.entit import org.apache.fulcrum.security.model.dynamic.DynamicModelManager; import org.apache.fulcrum.security.util.DataBackendException; import org.apache.fulcrum.security.util.UnknownEntityException; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +import org.apache.fulcrum.testcontainer.BaseUnit4Test; /** * @@ -37,14 +43,14 @@ import org.apache.fulcrum.testcontainer. * @version $Id: NTDynamicModelManagerTest.java 1374015 2012-08-16 19:48:54Z tv * $ */ -public class NTDynamicModelManagerTest extends BaseUnitTest implements TestConstants +public class NTDynamicModelManagerTest extends BaseUnit4Test implements TestConstants { private DynamicModelManager modelManager; private SecurityService securityService; private UserManager userManager; private User user; - @Override + @Before public void setUp() throws Exception { this.setRoleFileName("src/test/DynamicNTRoleConfig.xml"); @@ -55,6 +61,7 @@ public class NTDynamicModelManagerTest e } @Override + @After public void tearDown() { user = null; @@ -62,16 +69,8 @@ public class NTDynamicModelManagerTest e securityService = null; } - /** - * Constructor for NTDynamicModelManagerTest. - * - * @param arg0 - */ - public NTDynamicModelManagerTest(String arg0) - { - super(arg0); - } + @Test public void testRevokeAll() throws Exception { try @@ -95,6 +94,7 @@ public class NTDynamicModelManagerTest e } } + @Test public void testGrantUserGroup() throws Exception { user = userManager.getUserInstance("domain/BOB"); @@ -121,6 +121,7 @@ public class NTDynamicModelManagerTest e } } + @Test public void testRevokeUserGroup() throws Exception { try Modified: turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/nt/src/test/org/apache/fulcrum/security/nt/dynamic/NTUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,12 +19,20 @@ package org.apache.fulcrum.security.nt.d * under the License. */ +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.acl.AccessControlList; import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser; import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; import org.apache.fulcrum.security.util.DataBackendException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import com.tagish.auth.win32.NTSystem; @@ -44,7 +52,7 @@ public class NTUserManagerTest extends A private static final String PASSWORD = ""; private static final String GUESTUSER = DOMAIN + "/" + "Guest"; - @Override + @Before public void setUp() throws Exception { this.setRoleFileName("src/test/DynamicNTRoleConfig.xml"); @@ -54,6 +62,7 @@ public class NTUserManagerTest extends A } @Override + @After public void tearDown() { user = null; @@ -61,17 +70,8 @@ public class NTUserManagerTest extends A securityService = null; } - /** - * Constructor for NTUserManagerTest. - * - * @param arg0 - */ - public NTUserManagerTest(String arg0) - { - super(arg0); - } - @Override + @Test public void testCheckExists() throws Exception { try @@ -89,7 +89,7 @@ public class NTUserManagerTest extends A System.out.println("Unit test not being run due to missing NT DLL"); } } - + @Test public void testCheckExistsFails() throws Exception { try @@ -108,6 +108,7 @@ public class NTUserManagerTest extends A /** * tests getting an NT username */ + @Test public void testNTGetName() throws Exception { try @@ -140,6 +141,7 @@ public class NTUserManagerTest extends A /** * tests logging on a different user */ + @Test public void OFFtestLoginAsUser() throws Exception { try @@ -182,6 +184,7 @@ public class NTUserManagerTest extends A } @Override + @Test public void testAuthenticate() throws Exception { try @@ -196,6 +199,7 @@ public class NTUserManagerTest extends A } @Override + @Test public void testGetACL() throws Exception { try @@ -216,6 +220,7 @@ public class NTUserManagerTest extends A * test for User retrieve(String, String) */ @Override + @Test public void testGetAllUsers() throws Exception { try Modified: turbine/fulcrum/trunk/security/torque/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/pom.xml (original) +++ turbine/fulcrum/trunk/security/torque/pom.xml Wed Apr 12 09:48:44 2017 @@ -70,14 +70,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <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/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java (original) +++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerImpl.java Wed Apr 12 09:48:44 2017 @@ -60,9 +60,13 @@ public class TorqueTurbineModelManagerIm if (roleExists && permissionExists) { - ((TurbineRole)role).addPermission(permission); - ((TurbinePermission)permission).addRole(role); - + if (role instanceof TurbineRole ) { + ((TurbineRole)role).addPermission(permission); + } + if (permission instanceof TurbinePermission) { + ((TurbinePermission)permission).addRole(role); + } + Connection con = null; try @@ -118,9 +122,13 @@ public class TorqueTurbineModelManagerIm if (roleExists && permissionExists) { - ((TurbineRole)role).removePermission(permission); - ((TurbinePermission)permission).removeRole(role); - + if (role instanceof TurbineRole ) { + ((TurbineRole)role).removePermission(permission); + } + if (permission instanceof TurbinePermission) { + ((TurbinePermission)permission).removeRole(role); + } + Connection con = null; try @@ -173,8 +181,12 @@ public class TorqueTurbineModelManagerIm user_group_role.setGroup(group); user_group_role.setRole(role); ((TurbineUser) user).addUserGroupRole(user_group_role); - ((TurbineGroup) group).addUserGroupRole(user_group_role); - ((TurbineRole) role).addUserGroupRole(user_group_role); + if (group instanceof TurbineGroup ) { + ((TurbineGroup) group).addUserGroupRole(user_group_role); + } + if (role instanceof TurbineRole ) { + ((TurbineRole) role).addUserGroupRole(user_group_role); + } Connection con = null; @@ -243,8 +255,12 @@ public class TorqueTurbineModelManagerIm { ugrFound = true; ((TurbineUser)user).removeUserGroupRole(user_group_role); - ((TurbineGroup)group).removeUserGroupRole(user_group_role); - ((TurbineRole)role).removeUserGroupRole(user_group_role); + if (group instanceof TurbineGroup ) { + ((TurbineGroup)group).removeUserGroupRole(user_group_role); + } + if (role instanceof TurbineRole ) { + ((TurbineRole)role).removeUserGroupRole(user_group_role); + } break; } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/StartingSecurityServicesTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/StartingSecurityServicesTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/StartingSecurityServicesTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/StartingSecurityServicesTest.java Wed Apr 12 09:48:44 2017 @@ -18,28 +18,27 @@ package org.apache.fulcrum.security.torq * 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.security.torque.dynamic.TorqueDynamicGroupManagerImpl; import org.apache.fulcrum.security.torque.dynamic.TorqueDynamicPermissionManagerImpl; import org.apache.fulcrum.security.torque.dynamic.TorqueDynamicRoleManagerImpl; import org.apache.fulcrum.security.torque.dynamic.TorqueDynamicUserManagerImpl; -import org.apache.fulcrum.testcontainer.BaseUnitTest; +import org.apache.fulcrum.testcontainer.BaseUnit4Test; +import org.junit.Test; /** * @author <a href="mailto:[email protected]";>Marco Knüttel</a> * @version $Id: StartingSecurityServicesTest.java 223140 2004-11-01 13:29:25Z epugh $ */ -public class StartingSecurityServicesTest extends BaseUnitTest +public class StartingSecurityServicesTest extends BaseUnit4Test { private SecurityService securityService = null; - public StartingSecurityServicesTest(String name) - { - super(name); - } - + @Test public void testStartingTorqueSecurity() throws Exception { this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml"); Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,8 +18,12 @@ package org.apache.fulcrum.security.torq * 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:[email protected]";>Thomas Vandahl</a> @@ -29,6 +33,7 @@ public class TorqueGroupManagerTest exte { protected static HsqlDB hsqlDB = null; + @Before public void setUp() { try @@ -52,7 +57,9 @@ public class TorqueGroupManagerTest exte } } - public void tearDown() + @Override + @After + public void tearDown() { /* // cleanup tables try @@ -99,12 +106,4 @@ public class TorqueGroupManagerTest exte securityService = null; } - /** - * Constructor for TorqueGroupManagerTest. - * @param arg0 - */ - public TorqueGroupManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java Wed Apr 12 09:48:44 2017 @@ -20,6 +20,8 @@ package org.apache.fulcrum.security.torq 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:[email protected]";>Thomas Vandahl</a> @@ -30,6 +32,7 @@ public class TorquePermissionManagerTest { protected static HsqlDB hsqlDB = null; + @Before public void setUp() throws Exception { hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-dynamic-schema.sql"); @@ -45,7 +48,9 @@ public class TorquePermissionManagerTest } - public void tearDown() + @Override + @After + public void tearDown() { /* * // cleanup tables @@ -93,12 +98,4 @@ public class TorquePermissionManagerTest securityService = null; } - /** - * Constructor for TorquePermissionManagerTest. - * @param arg0 - */ - public TorquePermissionManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,9 +18,13 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.RoleManager; import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest; +import org.junit.After; +import org.junit.Before; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -31,6 +35,7 @@ public class TorqueRoleManagerTest exten { protected static HsqlDB hsqlDB = null; + @Before public void setUp() { try @@ -44,7 +49,7 @@ public class TorqueRoleManagerTest exten this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml"); this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml"); securityService = (SecurityService) lookup(SecurityService.ROLE); - roleManager = (RoleManager) securityService.getRoleManager(); + roleManager = securityService.getRoleManager(); } catch (Exception e) { @@ -52,7 +57,9 @@ public class TorqueRoleManagerTest exten } } - public void tearDown() + @Override + @After + public void tearDown() { /* * // cleanup tables @@ -100,12 +107,4 @@ public class TorqueRoleManagerTest exten securityService = null; } - /** - * Constructor for TorqueRoleManagerTest. - * @param arg0 - */ - public TorqueRoleManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,8 +18,11 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.test.AbstractUserManagerTest; +import org.junit.Before; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -31,6 +34,7 @@ public class TorqueUserManagerTest exten { protected static HsqlDB hsqlDB = null; + @Before public void setUp() { try @@ -54,7 +58,8 @@ public class TorqueUserManagerTest exten } } - public void tearDown() + @Override + public void tearDown() { /* * // cleanup tables @@ -102,12 +107,5 @@ public class TorqueUserManagerTest exten securityService = null; } - /** - * Constructor for TorqueUserManagerTest. - * @param arg0 - */ - public TorqueUserManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -19,6 +19,9 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.entity.User; import org.apache.fulcrum.security.model.basic.entity.BasicUser; @@ -29,6 +32,9 @@ import org.apache.fulcrum.security.torqu import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -39,6 +45,8 @@ public class TorqueBasicModelManagerTest { protected static HsqlDB hsqlDB = null; + @Override + @Before public void setUp() throws Exception { if(hsqlDB == null) @@ -54,14 +62,18 @@ public class TorqueBasicModelManagerTest super.setUp(); } - public void testRevokeAllUser() throws Exception + @Override + @Test + public void testRevokeAllUser() throws Exception { super.testRevokeAllUser(); User user = userManager.getUserInstance("Clint2"); assertEquals(0, ((BasicUser) user).getGroups().size()); } - public void tearDown() + @Override + @After + public void tearDown() { // cleanup tables try @@ -88,13 +100,5 @@ public class TorqueBasicModelManagerTest securityService = null; } - /** - * Constructor for TorqueBasicModelManagerTest. - * - * @param arg0 - */ - public TorqueBasicModelManagerTest(String arg0) - { - super(arg0); - } + } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -32,6 +32,11 @@ import org.apache.fulcrum.security.torqu import org.apache.fulcrum.security.torque.om.TorqueDynamicUserPeer; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; +import org.junit.After; +import org.junit.Before; + +import static org.junit.Assert.*; + /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -42,6 +47,8 @@ public class TorqueDynamicModelManagerTe { protected static HsqlDB hsqlDB = null; + @Override + @Before public void setUp() { try @@ -61,7 +68,9 @@ public class TorqueDynamicModelManagerTe } } - public void tearDown() + @Override + @After + public void tearDown() { // cleanup tables try @@ -106,13 +115,4 @@ public class TorqueDynamicModelManagerTe securityService = null; } - /** - * Constructor for TorqueDynamicModelManagerTest. - * - * @param arg0 - */ - public TorqueDynamicModelManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,6 +18,8 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.*; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest; import org.apache.fulcrum.security.torque.HsqlDB; @@ -56,7 +58,6 @@ public class TorquePeerTurbineModelManag @Override public void setUp() throws Exception { - try { hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-schema.sql"); @@ -79,7 +80,7 @@ public class TorquePeerTurbineModelManag } catch (Exception e) { - fail(e.toString()); + fail(e.toString()); } } @@ -143,19 +144,11 @@ public class TorquePeerTurbineModelManag } catch (TorqueException e) { - fail(e.toString()); + fail(e.toString()); } modelManager = null; securityService = null; } - /** - * Constructor for TorqueTurbineModelManagerTest. - * @param arg0 - */ - public TorquePeerTurbineModelManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,6 +18,8 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.fail; + import org.apache.fulcrum.security.SecurityService; import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest; import org.apache.fulcrum.security.torque.HsqlDB; @@ -29,6 +31,9 @@ import org.apache.fulcrum.security.torqu import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -40,10 +45,10 @@ public class TorqueTurbineModelManagerTe { protected static HsqlDB hsqlDB = null; - @Override + @Override + @Before public void setUp() throws Exception { - try { hsqlDB = new HsqlDB("jdbc:hsqldb:.", "src/test/fulcrum-turbine-schema.sql"); @@ -57,13 +62,13 @@ public class TorqueTurbineModelManagerTe } catch (Exception e) { - fail(e.toString()); + Assert.fail(e.toString()); } } - - @Override + @Override + @After public void tearDown() { // cleanup tables @@ -95,19 +100,11 @@ public class TorqueTurbineModelManagerTe } catch (TorqueException e) { - fail(e.toString()); + fail(e.toString()); } modelManager = null; securityService = null; } - /** - * Constructor for TorqueTurbineModelManagerTest. - * @param arg0 - */ - public TorqueTurbineModelManagerTest(String arg0) - { - super(arg0); - } } Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java?rev=1791100&r1=1791099&r2=1791100&view=diff ============================================================================== --- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java (original) +++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java Wed Apr 12 09:48:44 2017 @@ -18,6 +18,8 @@ package org.apache.fulcrum.security.torq * under the License. */ +import static org.junit.Assert.fail; + import java.sql.Connection; import java.sql.SQLException; @@ -30,10 +32,11 @@ import org.apache.fulcrum.security.torqu import org.apache.fulcrum.security.torque.om.TurbineRolePermissionPeer; import org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer; import org.apache.fulcrum.security.torque.om.TurbineUserPeer; -import org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.apache.torque.util.Transaction; +import org.junit.After; +import org.junit.Before; /** * @author <a href="mailto:[email protected]";>Thomas Vandahl</a> @@ -46,6 +49,7 @@ public class TurbineDefaultModelManagerT protected static HsqlDB hsqlDB = null; @Override + @Before public void setUp() throws Exception { @@ -69,6 +73,7 @@ public class TurbineDefaultModelManagerT @Override + @After public void tearDown() { // cleanup tables @@ -107,7 +112,7 @@ public class TurbineDefaultModelManagerT } catch (TorqueException e) { - fail(e.toString()); + fail(e.toString()); } catch (SQLException e) { if (con != null) { @@ -120,12 +125,4 @@ public class TurbineDefaultModelManagerT securityService = null; } - /** - * Constructor for TurbineDefaultModelManagerTest. - * @param arg0 - */ - public TurbineDefaultModelManagerTest(String arg0) - { - super(arg0); - } }
