Migrate junit4 to junit5

heowc · heowc · commit d47062e09181 · 2019-11-10T17:13:09.000+09:00
diff --git a/SpringBootCache/src/test/java/com/example/java/SpringBootCacheApplicationTests.java b/SpringBootCache/src/test/java/com/example/java/SpringBootCacheApplicationTests.java
@@ -1,60 +1,56 @@
 package com.example.java;
 
 import com.example.java.component.BookRepository;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringBootCacheApplication.class)
-public class SpringBootCacheApplicationTests {
-
-	@Autowired
-	private BookRepository repository;
-
-	private long startTime;
-
-	private static final Logger logger = LoggerFactory.getLogger(SpringBootCacheApplicationTests.class);
-
-	@Before
-	public void onBefore() {
-		startTime = System.currentTimeMillis();
-	}
-
-	@After
-	public void onAfter() {
-		logger.info("소요시간: {}ms", System.currentTimeMillis() - startTime);
-	}
-
-	@Test
-	public void test1() {
-		repository.getByIsbn("a");
-	}
-
-	@Test
-	public void test2() {
-		repository.getByIsbn("a");
-	}
-
-	@Test
-	public void test3() {
-		repository.getByIsbn("b");
-	}
-
-	@Test
-	public void test4() {
-		repository.getByIsbn("a");
-	}
-
-	@Test
-	public void test5() {
-		repository.refresh("a");
-		repository.getByIsbn("a");
-	}
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
+class SpringBootCacheApplicationTests {
+
+    @Autowired
+    private BookRepository repository;
+
+    private long startTime;
+
+    private static final Logger logger = LoggerFactory.getLogger(SpringBootCacheApplicationTests.class);
+
+    @BeforeEach
+    void onBefore() {
+        startTime = System.currentTimeMillis();
+    }
+
+    @AfterEach
+    void onAfter() {
+        logger.info("소요시간: {}ms", System.currentTimeMillis() - startTime);
+    }
+
+    @Test
+    void test1() {
+        repository.getByIsbn("a");
+    }
+
+    @Test
+    void test2() {
+        repository.getByIsbn("a");
+    }
+
+    @Test
+    void test3() {
+        repository.getByIsbn("b");
+    }
+
+    @Test
+    void test4() {
+        repository.getByIsbn("a");
+    }
+
+    @Test
+    void test5() {
+        repository.refresh("a");
+        repository.getByIsbn("a");
+    }
 }
diff --git a/SpringBootCache/src/test/kotlin/com/example/kotlin/SpringBootCacheApplicationTests.kt b/SpringBootCache/src/test/kotlin/com/example/kotlin/SpringBootCacheApplicationTests.kt
@@ -1,17 +1,13 @@
 package com.example.kotlin
 
 import com.example.kotlin.component.BookRepository
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.*
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringRunner
 
-@RunWith(SpringRunner::class)
 @SpringBootTest
+@TestMethodOrder(MethodOrderer.Alphanumeric::class)
 class SpringBootCacheApplicationTests {
 
     @Autowired
@@ -22,38 +18,38 @@ class SpringBootCacheApplicationTests {
         private val logger = LoggerFactory.getLogger(SpringBootCacheApplicationTests::class.java)
     }
 
-    @Before
-    fun onBefore() {
+    @BeforeEach
+    fun `onBefore`() {
         startTime = System.currentTimeMillis()
     }
 
-    @After
-    fun onAfter() {
+    @AfterEach
+    fun `onAfter`() {
         logger.info("소요시간: {}ms", System.currentTimeMillis() - startTime)
     }
 
     @Test
-    fun test1() {
+    fun `test1`() {
         repository.getByIsbn("a")
     }
 
     @Test
-    fun test2() {
+    fun `test2`() {
         repository.getByIsbn("a")
     }
 
     @Test
-    fun test3() {
+    fun `test3`() {
         repository.getByIsbn("b")
     }
 
     @Test
-    fun test4() {
+    fun `test4`() {
         repository.getByIsbn("a")
     }
 
     @Test
-    fun test5() {
+    fun `test5`() {
         repository.refresh("a")
         repository.getByIsbn("a")
     }
diff --git a/SpringBootConfigurable/build.gradle b/SpringBootConfigurable/build.gradle
@@ -43,6 +43,6 @@ compileTestKotlin {
 }
 
 test {
-    jvmArgs '-javaagent:libs/spring-instrument-5.1.5.RELEASE.jar'
+    jvmArgs '-javaagent:libs/spring-instrument-5.2.1.RELEASE.jar'
 
 }
diff --git a/SpringBootConfigurable/libs/spring-instrument-5.1.5.RELEASE.jar b/SpringBootConfigurable/libs/spring-instrument-5.1.5.RELEASE.jar
diff --git a/SpringBootConfigurable/libs/spring-instrument-5.2.1.RELEASE.jar b/SpringBootConfigurable/libs/spring-instrument-5.2.1.RELEASE.jar
diff --git a/SpringBootConfigurable/src/test/java/com/example/java/AccountTest.java b/SpringBootConfigurable/src/test/java/com/example/java/AccountTest.java
@@ -3,19 +3,17 @@
 import com.example.java.account.Account;
 import com.example.java.config.ConfigurableConfig;
 import com.example.java.config.SecurityConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 @Transactional
 @Import({ConfigurableConfig.class, SecurityConfig.class})
@@ -24,8 +22,9 @@ public class AccountTest {
     @PersistenceContext
     private EntityManager entityManager;
 
+    @DisplayName("Account 비밀번호 리셋 테스트")
     @Test
-    public void test_Account_Configurable_검사() {
+    public void test() {
         // given
         Account account = new Account("heowc", "1234");
         entityManager.persist(account);
diff --git a/SpringBootConfigurable/src/test/kotlin/com/example/kotlin/AccountTest.kt b/SpringBootConfigurable/src/test/kotlin/com/example/kotlin/AccountTest.kt
@@ -3,19 +3,14 @@ package com.example.kotlin
 import com.example.kotlin.account.Account
 import com.example.kotlin.config.ConfigurableConfig
 import com.example.kotlin.config.SecurityConfig
-import org.junit.Test
-import org.junit.runner.RunWith
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Import
-import org.springframework.test.context.junit4.SpringRunner
 import org.springframework.transaction.annotation.Transactional
-
 import javax.persistence.EntityManager
 import javax.persistence.PersistenceContext
 
-import org.assertj.core.api.Assertions.assertThat
-
-@RunWith(SpringRunner::class)
 @SpringBootTest
 @Transactional
 @Import(ConfigurableConfig::class, SecurityConfig::class)
@@ -25,7 +20,7 @@ class AccountTest {
     private lateinit var entityManager: EntityManager
 
     @Test
-    fun test_Account_Configurable_검사() {
+    fun `Account 비밀번호 리셋 테스트`() {
         // given
         val account = Account("heowc", "1234")
         entityManager.persist(account)

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@ compileTestKotlin {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`test {`
`46`		`- jvmArgs '-javaagent:libs/spring-instrument-5.1.5.RELEASE.jar'`
	`46`	`+ jvmArgs '-javaagent:libs/spring-instrument-5.2.1.RELEASE.jar'`
`47`	`47`
`48`	`48`	`}`