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 [2/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...
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,7 +18,9 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+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.model.turbine.test.AbstractTurbineModelManagerTest;
@@ -40,6 +42,9 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.peer.managers.PeerUserManager;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test with @link {@link #customPeers} requires at least Torque version 4.1.
@@ -56,6 +61,7 @@ public class TorquePeerTurbineModelManag
public static boolean customPeers = false;
@Override
+ @BeforeEach
public void setUp() throws Exception
{
try
@@ -85,27 +91,32 @@ public class TorquePeerTurbineModelManag
}
+ @Test
public void testCustomPeerSet() {
if (roleManager instanceof TorqueAbstractRoleManager) {
- assertTrue( "If a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager.", ((PeerRoleManager)roleManager).getCustomPeer() == customPeers);
+ assertTrue( ((PeerRoleManager)roleManager).getCustomPeer() == customPeers,
+ "If a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager.");
}
if (roleManager instanceof PeerManagable) {
assertNotNull(((PeerManagable)roleManager).getPeerManager());
}
if (userManager instanceof TorqueAbstractUserManager) {
- assertTrue( "If a custom Peer for UserManager should be tested, a peerClassName element should be set in the configuration file for userManager.", ((PeerUserManager)userManager).getCustomPeer() == customPeers);
+ assertTrue( ((PeerUserManager)userManager).getCustomPeer() == customPeers,
+ "If a custom Peer for UserManager should be tested, a peerClassName element should be set in the configuration file for userManager.");
}
if (userManager instanceof PeerManagable) {
assertNotNull(((PeerManagable)userManager).getPeerManager());
}
if (groupManager instanceof TorqueAbstractGroupManager) {
- assertTrue( "If a custom Peer for GroupManager should be tested, a peerClassName element should be set in the configuration file for groupManager.", ((PeerGroupManager)groupManager).getCustomPeer() == customPeers);
+ assertTrue( ((PeerGroupManager)groupManager).getCustomPeer() == customPeers,
+ "If a custom Peer for GroupManager should be tested, a peerClassName element should be set in the configuration file for groupManager.");
}
if (groupManager instanceof PeerManagable) {
assertNotNull(((PeerManagable)groupManager).getPeerManager());
}
if (permissionManager instanceof TorqueAbstractPermissionManager) {
- assertTrue( "If a custom Peer for PermissionManager should be tested, a peerClassName element should be set in the configuration file for permissionManager.", ((PeerPermissionManager)permissionManager).getCustomPeer() == customPeers);
+ assertTrue( ((PeerPermissionManager)permissionManager).getCustomPeer() == customPeers,
+ "If a custom Peer for PermissionManager should be tested, a peerClassName element should be set in the configuration file for permissionManager.");
}
if (permissionManager instanceof PeerManagable) {
assertNotNull(((PeerManagable)permissionManager).getPeerManager());
@@ -113,6 +124,7 @@ public class TorquePeerTurbineModelManag
}
@Override
+ @AfterEach
public void tearDown()
{
// cleanup tables
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=1851025&r1=1851024&r2=1851025&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 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.fail;
+
+import static org.junit.jupiter.api.Assertions.fail;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
@@ -31,9 +32,8 @@ 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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -46,7 +46,7 @@ public class TorqueTurbineModelManagerTe
protected static HsqlDB hsqlDB = null;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
try
@@ -62,13 +62,13 @@ public class TorqueTurbineModelManagerTe
}
catch (Exception e)
{
- Assert.fail(e.toString());
+ fail(e.toString());
}
}
@Override
- @After
+ @AfterEach
public void tearDown()
{
// cleanup tables
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerLazyTest.java Fri Jan 11 10:11:51 2019
@@ -18,7 +18,7 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,8 +35,8 @@ import org.apache.fulcrum.security.torqu
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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -49,7 +49,7 @@ public class TurbineDefaultModelManagerL
protected static HsqlDB hsqlDB = null;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -74,7 +74,7 @@ public class TurbineDefaultModelManagerL
@Override
- @After
+ @AfterEach
public void tearDown()
{
// cleanup tables
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=1851025&r1=1851024&r2=1851025&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 Fri Jan 11 10:11:51 2019
@@ -18,7 +18,7 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,8 +35,8 @@ import org.apache.fulcrum.security.torqu
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;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
@@ -49,7 +49,7 @@ public class TurbineDefaultModelManagerT
protected static HsqlDB hsqlDB = null;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
@@ -73,7 +73,7 @@ public class TurbineDefaultModelManagerT
@Override
- @After
+ @AfterEach
public void tearDown()
{
// cleanup tables
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java Fri Jan 11 10:11:51 2019
@@ -18,7 +18,9 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+
+
+import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.SQLException;
@@ -36,7 +38,9 @@ import org.apache.fulcrum.security.util.
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.util.Transaction;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* Test user with attached object (user-role-goup relationship)
@@ -49,7 +53,7 @@ public class TurbineUserManagerDefaultPe
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -79,6 +83,7 @@ public class TurbineUserManagerDefaultPe
@Override
+ @AfterEach
public void tearDown()
{
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java?rev=1851025&r1=1851024&r2=1851025&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerTest.java Fri Jan 11 10:11:51 2019
@@ -18,7 +18,9 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
-import static org.junit.Assert.fail;
+
+
+import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.SQLException;
@@ -34,7 +36,9 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.util.Transaction;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
/**
* Test user with attached object (user-role-goup relationship)
@@ -47,7 +51,7 @@ public class TurbineUserManagerTest exte
{
protected static HsqlDB hsqlDB = null;
- @Before
+ @BeforeEach
public void setUp()
{
try
@@ -74,11 +78,11 @@ public class TurbineUserManagerTest exte
{
fail(e.toString());
}
- }
-
+ }
@Override
+ @AfterEach
public void tearDown()
{