Migrate to JUnit5

repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java

@@ -22,21 +22,21 @@
  */
 package com.iluwatar.repository;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.google.common.collect.Lists;
@@ -46,7 +46,7 @@ import com.google.common.collect.Lists;
  * by {@link org.springframework.data.jpa.domain.Specification} are also test.
  * 
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = { AppConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class AnnotationBasedRepositoryTest {
 
@@ -63,7 +63,7 @@ public class AnnotationBasedRepositoryTest {
   /**
    * Prepare data for test
    */
-  @Before
+  @BeforeEach
   public void setup() {
 
     repository.save(persons);
@@ -123,7 +123,7 @@ public class AnnotationBasedRepositoryTest {
     assertEquals(terry, actual);
   }
 
-  @After
+  @AfterEach
   public void cleanup() {
 
     repository.deleteAll();

repository/src/test/java/com/iluwatar/repository/AppConfigTest.java

@@ -22,19 +22,19 @@
  */
 package com.iluwatar.repository;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
  * This case is Just for test the Annotation Based configuration
  * 
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = { AppConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class AppConfigTest {
 

repository/src/test/java/com/iluwatar/repository/AppTest.java

@@ -22,7 +22,7 @@
  */
 package com.iluwatar.repository;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

repository/src/test/java/com/iluwatar/repository/RepositoryTest.java

@@ -22,21 +22,21 @@
  */
 package com.iluwatar.repository;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.google.common.collect.Lists;
 
@@ -44,7 +44,7 @@ import com.google.common.collect.Lists;
  * Test case to test the functions of {@link PersonRepository}, beside the CRUD functions, the query
  * by {@link org.springframework.data.jpa.domain.Specification} are also test.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = { "classpath:applicationContext.xml" })
 public class RepositoryTest {
 
@@ -61,7 +61,7 @@ public class RepositoryTest {
   /**
    * Prepare data for test
    */
-  @Before
+  @BeforeEach
   public void setup() {
 
     repository.save(persons);
@@ -121,7 +121,7 @@ public class RepositoryTest {
     assertEquals(terry, actual);
   }
 
-  @After
+  @AfterEach
   public void cleanup() {
 
     repository.deleteAll();