svn commit: r1851325 - in /turbine/core/trunk/src/test/org/apache/turbine/services/security: SecurityServiceTest.java TurbineDefaultModelManagerTest.java

[gk...@apache.org]

Author: gk
Date: Tue Jan 15 08:31:30 2019
New Revision: 1851325

URL: http://svn.apache.org/viewvc?rev=1851325&view=rev
Log:
- fix TurbineDefaultModelManagerTest (extends JUnit5)
- update SecurityServiceTest to JUnit5 test

Modified:
    turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java
    turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java

Modified: turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java?rev=1851325&r1=1851324&r2=1851325&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/security/SecurityServiceTest.java Tue Jan 15 08:31:30 2019
@@ -17,8 +17,9 @@ package org.apache.turbine.services.secu
  * specific language governing permissions and limitations
  * under the License.
  */
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.fulcrum.security.SecurityService;
 import org.apache.fulcrum.security.entity.Group;
@@ -31,15 +32,15 @@ import org.apache.fulcrum.security.model
 import org.apache.fulcrum.security.util.DataBackendException;
 import org.apache.fulcrum.security.util.EntityExistsException;
 import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.testcontainer.BaseUnit4Test;
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
 import org.apache.turbine.om.security.User;
 import org.apache.turbine.services.ServiceManager;
 import org.apache.turbine.services.TurbineServices;
 import org.apache.turbine.util.TurbineConfig;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test that the SecurityService works properly by comparing behaviour of Turbine and Fulcrum security services using memory user manager.
@@ -50,7 +51,7 @@ import org.junit.Test;
  * @version $Id$
  */
 
-public class SecurityServiceTest extends BaseUnit4Test
+public class SecurityServiceTest extends BaseUnit5Test
 {
 
     SecurityService fulcrumSecurityService;
@@ -58,7 +59,7 @@ public class SecurityServiceTest extends
     static TurbineConfig tc;
 
 
-    @BeforeClass
+    @BeforeAll
     public static void init() throws Exception
     {
     	tc = new TurbineConfig(".", "/conf/test/CompleteTurbineResources.properties");
@@ -66,7 +67,7 @@ public class SecurityServiceTest extends
 
     }
 
-    @Before
+    @BeforeEach
     public void setUpBefore() throws Exception
     {
 
@@ -171,7 +172,7 @@ public class SecurityServiceTest extends
 	}
 
 
-	@AfterClass
+	@AfterAll
 	public static void setupAfter()
     {
         ServiceManager serviceManager = TurbineServices.getInstance();

Modified: turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java?rev=1851325&r1=1851324&r2=1851325&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/services/security/TurbineDefaultModelManagerTest.java Tue Jan 15 08:31:30 2019
@@ -18,12 +18,14 @@ package org.apache.turbine.services.secu
  * under the License.
  */
 
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 
 /**
  * Test Fulcrum Integration.
@@ -38,7 +40,7 @@ public class TurbineDefaultModelManagerT
 {
 
     @Override
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception
     {
         try
@@ -61,11 +63,12 @@ public class TurbineDefaultModelManagerT
     }
 
     @Override
-    @After
+    @AfterEach
 	public void tearDown()
     {
         modelManager = null;
         securityService = null;
+        super.tearDown();
     }
 
 }