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 2019/01/11 10:11:52 UTC
svn commit: r1851025 [1/2] - in /turbine/fulcrum/trunk/security: ./
api/src/test/org/apache/fulcrum/security/model/basic/test/
api/src/test/org/apache/fulcrum/security/model/dynamic/test/
api/src/test/org/apache/fulcrum/security/model/test/ api/src/tes...
Author: gk
Date: Fri Jan 11 10:11:51 2019
New Revision: 1851025
URL: http://svn.apache.org/viewvc?rev=1851025&view=rev
Log:
- update to JUnit 5, in eclipse parallel execution of hibernate tests may not succeed if called all at once (same for memory, but fixed).
Modified:
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/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java
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/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
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/acl/TurbineAccessControlListTest.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/pom.xml
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/AbstractTurbineUserManagerTest.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/TurbineDefaultModelManagerLazyTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -19,7 +19,7 @@ package org.apache.fulcrum.security.mode
* under the License.
*/
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.fulcrum.security.GroupManager;
import org.apache.fulcrum.security.SecurityService;
@@ -30,14 +30,14 @@ 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.BaseUnit4Test;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Eric Pugh
*/
-public abstract class AbstractModelManagerTest extends BaseUnit4Test
+public abstract class AbstractModelManagerTest extends BaseUnit5Test
{
protected Role role;
protected BasicModelManager modelManager;
@@ -45,7 +45,7 @@ public abstract class AbstractModelManag
protected UserManager userManager;
protected SecurityService securityService;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
userManager = securityService.getUserManager();
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,10 @@
package org.apache.fulcrum.security.model.dynamic.test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -42,18 +47,17 @@ 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.BaseUnit4Test;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Eric Pugh
* @author <a href="mailto:ben@gidley.co.uk">Ben Gidley </a>
*
*/
-public abstract class AbstractDynamicModelManagerTest extends BaseUnit4Test
+public abstract class AbstractDynamicModelManagerTest extends BaseUnit5Test
{
private static final String ONLY_BORRIS_PERMISSION = "ONLY_BORRIS_PERMISSION";
@@ -79,7 +83,7 @@ public abstract class AbstractDynamicMod
protected SecurityService securityService;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
roleManager = securityService.getRoleManager();
@@ -91,7 +95,7 @@ public abstract class AbstractDynamicMod
@Override
- @After
+ @AfterEach
public void tearDown()
{
this.release(roleManager);
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,12 @@
package org.apache.fulcrum.security.model.test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,14 +33,13 @@ 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.BaseUnit4Test;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
/**
* @author Eric Pugh
*/
-public abstract class AbstractGroupManagerTest extends BaseUnit4Test
+public abstract class AbstractGroupManagerTest extends BaseUnit5Test
{
protected Group group;
protected GroupManager groupManager;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -28,15 +28,15 @@ 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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author Eric Pugh
*/
-public abstract class AbstractPermissionManagerTest extends BaseUnit4Test
+public abstract class AbstractPermissionManagerTest extends BaseUnit5Test
{
protected Permission permission;
protected PermissionManager permissionManager;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,13 +18,12 @@ package org.apache.fulcrum.security.mode
* 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.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.SecurityService;
@@ -32,13 +31,14 @@ import org.apache.fulcrum.security.entit
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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
+
/**
* @author Eric Pugh
*/
-public abstract class AbstractRoleManagerTest extends BaseUnit4Test
+public abstract class AbstractRoleManagerTest extends BaseUnit5Test
{
protected Role role;
protected RoleManager roleManager;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,13 +18,12 @@ package org.apache.fulcrum.security.mode
* 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.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
@@ -34,13 +33,14 @@ 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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
+
/**
* @author Eric Pugh
*/
-public abstract class AbstractUserManagerTest extends BaseUnit4Test
+public abstract class AbstractUserManagerTest extends BaseUnit5Test
{
protected User user;
protected UserManager userManager;
Modified: 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?rev=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,11 +18,10 @@ package org.apache.fulcrum.security.mode
* 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.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Set;
@@ -42,16 +41,16 @@ import org.apache.fulcrum.security.model
import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.UserSet;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Initialization of services in implementing tests
* @author Eric Pugh
*
*/
-public abstract class AbstractTurbineModelManagerTest extends BaseUnit4Test
+public abstract class AbstractTurbineModelManagerTest extends BaseUnit5Test
{
protected Role role;
@@ -67,7 +66,7 @@ public abstract class AbstractTurbineMod
protected SecurityService securityService;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
securityService = (SecurityService) lookup(SecurityService.ROLE);
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,13 +18,13 @@ package org.apache.fulcrum.security.hibe
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -33,7 +33,7 @@ import org.junit.Before;
*/
public class HibernateGroupManagerTest extends AbstractGroupManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -52,7 +52,7 @@ public class HibernateGroupManagerTest e
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -21,8 +21,9 @@ 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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: HibernatePermissionManagerTest.java 1169862 2011-09-12
@@ -30,7 +31,7 @@ import org.junit.Before;
*/
public class HibernatePermissionManagerTest extends AbstractPermissionManagerTest
{
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -44,7 +45,7 @@ public class HibernatePermissionManagerT
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
permission = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -21,12 +21,10 @@ package org.apache.fulcrum.security.hibe
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -34,7 +32,7 @@ import org.junit.Test;
*/
public class HibernateRoleManagerTest extends AbstractRoleManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -53,7 +51,7 @@ public class HibernateRoleManagerTest ex
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -21,12 +21,10 @@ package org.apache.fulcrum.security.hibe
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractUserManagerTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -34,7 +32,7 @@ import org.junit.Test;
*/
public class HibernateUserManagerTest extends AbstractUserManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -53,7 +51,7 @@ public class HibernateUserManagerTest ex
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,20 +18,19 @@ package org.apache.fulcrum.security.hibe
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
import org.hibernate.Session;
-import org.junit.Test;
+import org.junit.jupiter.api.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 BaseUnit4Test
+public class PersistenceHelperDefaultImplTest extends BaseUnit5Test
{
@SuppressWarnings("unused")
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -23,15 +23,16 @@ import static org.junit.Assert.assertTru
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.dynamic.DynamicModelManager;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.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 BaseUnit4Test
+public class StartingSecurityServicesTest extends BaseUnit5Test
{
private SecurityService securityService = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -27,12 +27,11 @@ import org.apache.fulcrum.security.hiber
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest;
import org.hibernate.Transaction;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -42,7 +41,7 @@ import org.junit.Test;
public class HibernateBasicModelManagerTest extends AbstractModelManagerTest
{
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
this.setRoleFileName("src/test/BasicHibernateRoleConfig.xml");
@@ -67,7 +66,7 @@ public class HibernateBasicModelManagerT
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.hibernate.basic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,13 +25,8 @@ 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.test.AbstractGroupManagerTest;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: HibernateGroupManagerTest.java 1169862 2011-09-12 18:41:35Z tv
@@ -37,7 +34,7 @@ import org.junit.Test;
*/
public class HibernateGroupManagerTest extends AbstractGroupManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -56,7 +53,7 @@ public class HibernateGroupManagerTest e
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,15 +18,15 @@ package org.apache.fulcrum.security.hibe
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.fail;
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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -34,7 +34,7 @@ import org.junit.Before;
*/
public class HibernateUserManagerTest extends AbstractUserManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -53,7 +53,7 @@ public class HibernateUserManagerTest ex
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.hibernate.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,12 +25,9 @@ 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.dynamic.test.AbstractDynamicModelManagerTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-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>
@@ -38,7 +37,7 @@ import org.junit.Test;
public class HibernateDynamicModelManagerTest extends AbstractDynamicModelManagerTest
{
@Override
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -57,7 +56,7 @@ public class HibernateDynamicModelManage
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.hibernate.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,12 +25,8 @@ 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.test.AbstractGroupManagerTest;
-
-import static org.junit.Assert.*;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -37,7 +35,7 @@ import org.junit.Test;
*/
public class HibernateExtendedUserGroupManagerTest extends AbstractGroupManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -56,7 +54,7 @@ public class HibernateExtendedUserGroupM
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -23,10 +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 org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
/**
* @author Eric Pugh
@@ -37,7 +37,7 @@ public class HibernateTurbineModelManage
{
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -57,7 +57,7 @@ public class HibernateTurbineModelManage
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
super.tearDown();
Modified: turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryGroupManagerImpl.java Fri Jan 11 10:11:51 2019
@@ -25,7 +25,6 @@ import org.apache.fulcrum.security.Group
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.spi.AbstractGroupManager;
import org.apache.fulcrum.security.util.DataBackendException;
-import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
@@ -38,7 +37,13 @@ import org.apache.fulcrum.security.util.
*/
public class MemoryGroupManagerImpl extends AbstractGroupManager implements GroupManager
{
+ // static to simulate database ?
private static List<Group> groups = new ArrayList<Group>();
+
+ public MemoryGroupManagerImpl() {
+ // reset
+ groups = new ArrayList<Group>();
+ }
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified: turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java Fri Jan 11 10:11:51 2019
@@ -38,7 +38,12 @@ import org.apache.fulcrum.security.util.
*/
public class MemoryPermissionManagerImpl extends AbstractPermissionManager
{
+ // static to simulate database ?
private static List<Permission> permissions = new ArrayList<Permission>();
+
+ public MemoryPermissionManagerImpl() {
+ permissions.clear();
+ }
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified: turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java Fri Jan 11 10:11:51 2019
@@ -40,6 +40,11 @@ public class MemoryRoleManagerImpl exten
{
/** List to store all our roles in */
private static List<Role> roles = new ArrayList<Role>();
+
+ public MemoryRoleManagerImpl() {
+ // reset
+ roles.clear();
+ }
/** Our Unique ID counter */
// private static int uniqueId = 0;
Modified: turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryUserManagerImpl.java Fri Jan 11 10:11:51 2019
@@ -39,6 +39,11 @@ public class MemoryUserManagerImpl exten
// TODO Need to load up Crypto component and actually encrypt passwords!
private static List<User> users = new ArrayList<User>();
+
+ public MemoryUserManagerImpl() {
+ // reset
+ users.clear();
+ }
/** Our Unique ID counter */
// private static int uniqueId = 0;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,8 +18,8 @@ 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 static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.fulcrum.security.memory.MemoryGroupManagerImpl;
@@ -29,8 +29,9 @@ 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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
+
/**
* @author <a href="mailto:marco@intermeta.de">Marco Knüttel</a>
@@ -38,19 +39,18 @@ import org.junit.Test;
* tv $
*/
-public class StartingSecurityServicesTest extends BaseUnit4Test
+public class StartingSecurityServicesTest extends BaseUnit5Test
{
private SecurityService securityService = null;
-
@Test
public void testStartingDynamicModel() throws Exception
{
this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
- assertTrue(securityService.getClass().getName(), securityService.getUserManager() instanceof MemoryUserManagerImpl);
+ assertTrue(securityService.getUserManager() instanceof MemoryUserManagerImpl, "check class:" + securityService.getClass().getName());
assertTrue(securityService.getRoleManager() instanceof MemoryRoleManagerImpl);
assertTrue(securityService.getPermissionManager() instanceof MemoryPermissionManagerImpl);
assertTrue(securityService.getGroupManager() instanceof MemoryGroupManagerImpl);
@@ -95,7 +95,8 @@ public class StartingSecurityServicesTes
}
catch (RuntimeException re)
{
- assertTrue("Type was " + re.getCause().getClass().getName(), re.getCause() instanceof ServiceException);
+ assertTrue( re.getCause() instanceof ServiceException,
+ "Type was " + re.getCause().getClass().getName());
}
}
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.acl;
+import static org.junit.jupiter.api.Assertions.*;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +20,7 @@ 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.io.Serializable;
import java.util.HashMap;
@@ -44,9 +44,10 @@ 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.BaseUnit4Test;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* Test that we can generate AccessControlLists from the Factory
@@ -54,7 +55,7 @@ import org.junit.Test;
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class AccessControlListTest extends BaseUnit4Test
+public class AccessControlListTest extends BaseUnit5Test
{
private UserManager userManager;
@@ -66,11 +67,10 @@ public class AccessControlListTest exten
private static int counter = 1;
private User user;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
-
this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
Modified: turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java (original)
+++ turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/acl/TurbineAccessControlListTest.java Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.acl;
+import static org.junit.jupiter.api.Assertions.*;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +20,7 @@ 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.io.Serializable;
import java.util.HashMap;
@@ -41,9 +41,11 @@ 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.BaseUnit4Test;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* Test that we can generate AccessControlLists from the Factory
@@ -51,7 +53,7 @@ import org.junit.Test;
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id: AccessControlListTest.java 1791100 2017-04-12 09:48:44Z gk $
*/
-public class TurbineAccessControlListTest extends BaseUnit4Test
+public class TurbineAccessControlListTest extends BaseUnit5Test
{
private UserManager userManager;
@@ -63,7 +65,7 @@ public class TurbineAccessControlListTes
private static int counter = 1;
private User user;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -82,7 +84,18 @@ public class TurbineAccessControlListTes
userManager.addUser(user, "secretpassword");
}
-
+ }
+
+ @Override
+ @AfterEach
+ public void tearDown()
+ {
+ userManager = null;
+ groupManager = null;
+ roleManager = null;
+ modelManager = null;
+ permissionManager = null;
+ user = null;
}
@Test
@@ -111,7 +124,8 @@ public class TurbineAccessControlListTes
assertTrue(dacl.hasPermission(permission,group));
assertEquals(dacl.getPermissions(group).toString(),permissionSets.get(group).toString());
Serializable serDeSer = SerializationUtils.roundtrip(acl);
- assertTrue("Expected RoleSet: [role 4 -> 4]", ((TurbineAccessControlList)serDeSer).getRoles().toString().equals(dacl.getRoles().toString()));
+ assertTrue( ((TurbineAccessControlList)serDeSer).getRoles().toString().equals(dacl.getRoles().toString()),
+ "Expected RoleSet: [role 4 -> 4]");
}
@Test
@@ -270,23 +284,28 @@ public class TurbineAccessControlListTes
@Test
public void testHasRoleStringString() throws Exception
{
- Group group = getGroup();
- Group group2 = getGroup();
- Role role = getRole();
- Role role2 = getRole();
- Role role3 = getRole();
- modelManager.grant(user, group, role);
- modelManager.grant(user, group, role2);
- modelManager.grant(user, group2, role);
- modelManager.grant(user, group2, role3);
- acl = userManager.getACL(user);
- assertTrue(acl.hasRole(role.getName(), group.getName()));
- assertTrue(acl.hasRole(role.getName(), group2.getName()));
- assertTrue(acl.hasRole(role2.getName(), group.getName()));
- assertFalse(acl.hasRole(role2.getName(), group2.getName()));
- assertTrue(acl.hasRole(role.getName(), group2.getName()));
- assertFalse(acl.hasRole(role2.getName(), group2.getName()));
- assertTrue(acl.hasRole(role3.getName(), group2.getName()));
+ try {
+ Group group = getGroup();
+ Group group2 = getGroup();
+ Role role = getRole();
+ Role role2 = getRole();
+ Role role3 = getRole();
+ modelManager.grant(user, group, role);
+ modelManager.grant(user, group, role2);
+ modelManager.grant(user, group2, role);
+ modelManager.grant(user, group2, role3);
+ acl = userManager.getACL(user);
+ assertTrue(acl.hasRole(role.getName(), group.getName()));
+ assertTrue(acl.hasRole(role.getName(), group2.getName()));
+ assertTrue(acl.hasRole(role2.getName(), group.getName()));
+ assertFalse(acl.hasRole(role2.getName(), group2.getName()));
+ assertTrue(acl.hasRole(role.getName(), group2.getName()));
+ assertFalse(acl.hasRole(role2.getName(), group2.getName()));
+ assertTrue(acl.hasRole(role3.getName(), group2.getName()));
+ } catch (Exception e) {
+ fail("failed with " + e.getMessage());
+ }
+
}
/*
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,6 +1,7 @@
package org.apache.fulcrum.security.memory.basic;
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.fail;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +24,9 @@ import static org.junit.Assert.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -36,7 +38,7 @@ public class MemoryBasicModelManagerTest
@Override
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -54,7 +56,7 @@ public class MemoryBasicModelManagerTest
}
@Override
- @After
+ @AfterEach
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.basic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,11 +23,8 @@ 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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author Eric Pugh
@@ -36,7 +35,7 @@ public class MemoryGroupManagerTest exte
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -53,7 +52,7 @@ public class MemoryGroupManagerTest exte
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
group = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.basic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,11 +21,12 @@ 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;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author Eric Pugh
@@ -33,7 +36,7 @@ import org.junit.Before;
public class MemoryUserManagerTest extends AbstractUserManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,6 +1,7 @@
package org.apache.fulcrum.security.memory.dynamic;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +24,9 @@ import static org.junit.Assert.fail;
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.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
@@ -37,7 +39,7 @@ public class MemoryDynamicModelManagerTe
@Override
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -55,7 +57,7 @@ public class MemoryDynamicModelManagerTe
}
@Override
- @After
+ @AfterEach
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,10 +23,9 @@ 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 org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.*;
/**
* @author Eric Pugh
@@ -34,7 +35,7 @@ import static org.junit.Assert.*;
public class MemoryGroupManagerTest extends AbstractGroupManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -51,7 +52,7 @@ public class MemoryGroupManagerTest exte
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
group = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,9 +22,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.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author Eric Pugh
@@ -33,7 +35,7 @@ public class MemoryPermissionManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -50,7 +52,7 @@ public class MemoryPermissionManagerTest
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
permission = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,10 +23,9 @@ 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 org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.*;
/**
* @author Eric Pugh
@@ -34,7 +35,7 @@ import static org.junit.Assert.*;
public class MemoryRoleManagerTest extends AbstractRoleManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -51,7 +52,7 @@ public class MemoryRoleManagerTest exten
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
role = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.memory.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,14 +21,13 @@ 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 org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
-import static org.junit.Assert.*;
/**
* @author Eric Pugh
@@ -35,7 +36,7 @@ import static org.junit.Assert.*;
*/
public class MemoryUserManagerTest extends AbstractUserManagerTest
{
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -52,7 +53,7 @@ public class MemoryUserManagerTest exten
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
user = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -21,8 +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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author Eric Pugh
@@ -33,7 +33,7 @@ public class MemoryTurbineModelManagerTe
{
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -45,7 +45,7 @@ public class MemoryTurbineModelManagerTe
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
super.tearDown();
Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Fri Jan 11 10:11:51 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -110,7 +110,7 @@
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<!-- junit 5 seems to have problems to find unit tests in test scoped jar org.apache.fulcrum:fulcrum-security-api:test-jar, downgraded from 1.0.8-SNAPSHOT, classpath loading issue? -->
- <version>1.0.7</version>
+ <version>1.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,7 +18,8 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.dynamic.DynamicModelManager;
@@ -26,15 +27,16 @@ import org.apache.fulcrum.security.torqu
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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
+
/**
* @author <a href="mailto:marco@intermeta.de">Marco Knüttel</a>
* @version $Id: StartingSecurityServicesTest.java 223140 2004-11-01 13:29:25Z epugh $
*/
-public class StartingSecurityServicesTest extends BaseUnit4Test
+public class StartingSecurityServicesTest extends BaseUnit5Test
{
private SecurityService securityService = null;
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,12 +18,13 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractGroupManagerTest;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -33,7 +34,7 @@ public class TorqueGroupManagerTest exte
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -58,7 +59,7 @@ public class TorqueGroupManagerTest exte
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
/* // cleanup tables
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -20,8 +20,9 @@ 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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -32,7 +33,7 @@ public class TorquePermissionManagerTest
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
hsqlDB = new HsqlDB("src/test/fulcrum-dynamic-schema.sql");
@@ -49,7 +50,7 @@ public class TorquePermissionManagerTest
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
/*
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -20,11 +20,11 @@ package org.apache.fulcrum.security.torq
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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -35,7 +35,7 @@ public class TorqueRoleManagerTest exten
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -58,7 +58,7 @@ public class TorqueRoleManagerTest exten
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
/*
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,11 +18,12 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractUserManagerTest;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -34,7 +35,7 @@ public class TorqueUserManagerTest exten
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp()
{
try
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,9 +18,8 @@ package org.apache.fulcrum.security.torq
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.entity.User;
@@ -33,8 +32,9 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -46,7 +46,7 @@ public class TorqueBasicModelManagerTest
protected static HsqlDB hsqlDB = null;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
if(hsqlDB == null)
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.security.torque.dynamic;
+import static org.junit.jupiter.api.Assertions.fail;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -32,10 +34,8 @@ 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.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
@@ -48,7 +48,7 @@ public class TorqueDynamicModelManagerTe
protected static HsqlDB hsqlDB = null;
@Override
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -69,7 +69,7 @@ public class TorqueDynamicModelManagerTe
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
// cleanup tables
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java Fri Jan 11 10:11:51 2019
@@ -19,12 +19,12 @@ package org.apache.fulcrum.security.torq
* 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.UserManager;
@@ -41,8 +41,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.BaseUnit4Test;
-import org.junit.Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.Test;
/**
* @author Eric Pugh
@@ -51,7 +51,7 @@ import org.junit.Test;
* Same as {@link AbstractUserManagerTest} in Fulcrum API module, but with user-group-role-sets added and checked
*
*/
-public abstract class AbstractTurbineUserManagerTest extends BaseUnit4Test
+public abstract class AbstractTurbineUserManagerTest extends BaseUnit5Test
{
protected User user;
protected UserManager userManager;