migrate to junit5 (#692)

Author: tokuhirom

build.gradle

@@ -117,9 +117,6 @@ subprojects {
         testImplementation 'org.hibernate.validator:hibernate-validator'
         testImplementation 'org.springframework.boot:spring-boot-starter-test' // MockHttpServletRequest
         testImplementation 'org.springframework.boot:spring-boot-starter-logging'
-        testImplementation("org.junit.vintage:junit-vintage-engine") {
-            exclude group: "org.hamcrest", module: "hamcrest-core"
-        }
     }
 
     compileJava.dependsOn(processResources)

config/checkstyle/checkstyle.xml

@@ -87,6 +87,12 @@
       <message key="import.illegal"
                value="Use AssertJ (org.assertj.core.api.Assumptions.assumeThat) instead." />
     </module>
+    <module name="IllegalImport">
+      <property name="id" value="junitRule" />
+      <property name="illegalClasses" value="org.junit.Rule" />
+      <message key="import.illegal"
+               value="Use Junit5 (ExtendWith) instead." />
+    </module>
     <module name="IllegalImport">
       <property name="id" value="junitExpectedException" />
       <property name="illegalClasses" value="org.junit.rules.ExpectedException" />

line-bot-api-client/src/test/java/com/linecorp/bot/client/AbstractWiremockTest.java

@@ -20,8 +20,8 @@
 
 import java.net.URI;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -40,7 +40,7 @@ public abstract class AbstractWiremockTest {
     protected LineBlobClient lineBlobClient;
     protected ChannelManagementSyncClient channelManagementSyncClient;
 
-    @Before
+    @BeforeEach
     public void setUpWireMock() {
         wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
         wireMockServer.start();
@@ -51,7 +51,7 @@ public void setUpWireMock() {
         channelManagementSyncClient = createChannelManagementSyncClient(wireMockServer);
     }
 
-    @After
+    @AfterEach
     public void shutDownWireMock() {
         wireMockServer.stop();
     }

line-bot-api-client/src/test/java/com/linecorp/bot/client/CallbackAdaptorTest.java

@@ -21,13 +21,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.linecorp.bot.client.LineMessagingClientImpl.CallbackAdaptor;
 import com.linecorp.bot.client.exception.GeneralLineMessagingException;
@@ -36,19 +35,15 @@
 import retrofit2.Call;
 import retrofit2.Response;
 
+@Timeout(10)
+@ExtendWith(MockitoExtension.class)
 public class CallbackAdaptorTest {
     private CallbackAdaptor<Object> target;
 
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
-    @Rule
-    public final Timeout timeoutRule = Timeout.seconds(10);
-
     @Mock
     private Call<Object> call;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         target = new CallbackAdaptor<>();
     }

line-bot-api-client/src/test/java/com/linecorp/bot/client/ChannelManagementSyncClientIntegrationWiremockTest.java

@@ -27,7 +27,8 @@
 
 import java.net.URI;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -41,7 +42,8 @@ public class ChannelManagementSyncClientIntegrationWiremockTest
         extends AbstractWiremockTest {
     private static final ObjectMapper OBJECT_MAPPER = ModelObjectMapper.createNewObjectMapper();
 
-    @Test(timeout = 10_000)
+    @Test
+    @Timeout(ASYNC_TEST_TIMEOUT)
     public void testAddLiffMenu() throws Exception {
         // Mocking
         LiffAppAddResponse response = new LiffAppAddResponse("NEW_LIFF_ID");

line-bot-api-client/src/test/java/com/linecorp/bot/client/ExceptionConverterTest.java

@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.linecorp.bot.client.exception.GeneralLineMessagingException;
 import com.linecorp.bot.client.exception.LineMessagingException;

line-bot-api-client/src/test/java/com/linecorp/bot/client/FixedChannelTokenSupplierTest.java

@@ -17,18 +17,16 @@
 package com.linecorp.bot.client;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FixedChannelTokenSupplierTest {
-    @Test(expected = NullPointerException.class)
+    @Test
     public void constructedInstanceAlwaysNonNullTest() {
-        // Do
-        FixedChannelTokenSupplier.of(null);
-
-        // Verify
-        fail("NullPointerException is not occurred.");
+        assertThatThrownBy(
+                () -> FixedChannelTokenSupplier.of(null)
+        ).isInstanceOf(NullPointerException.class);
     }
 
     @Test

line-bot-api-client/src/test/java/com/linecorp/bot/client/HeaderInterceptorWireMockTest.java

@@ -27,22 +27,21 @@
 
 import java.net.URI;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 
+@ExtendWith(MockitoExtension.class)
 public class HeaderInterceptorWireMockTest extends AbstractWiremockTest {
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
     @Mock
     ChannelTokenSupplier channelTokenSupplier;
 
-    @Test(timeout = ASYNC_TEST_TIMEOUT)
+    @Test
+    @Timeout(ASYNC_TEST_TIMEOUT)
     public void forChannelTokenSupplier() throws Exception {
         stubFor(get(urlEqualTo("/v2/bot/profile/TEST"))
                         .willReturn(aResponse().withStatus(200)

line-bot-api-client/src/test/java/com/linecorp/bot/client/LineBlobClientImplTest.java

@@ -27,13 +27,12 @@
 
 import java.io.IOException;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.stubbing.OngoingStubbing;
 
 import com.linecorp.bot.model.response.BotApiResponse;
@@ -46,6 +45,8 @@
 import retrofit2.Callback;
 import retrofit2.Response;
 
+@ExtendWith(MockitoExtension.class)
+@Timeout(5)
 public class LineBlobClientImplTest {
     private static final byte[] ZERO_BYTES = {};
     private static final String REQUEST_ID_FIXTURE = "REQUEST_ID_FIXTURE";
@@ -54,12 +55,6 @@ public class LineBlobClientImplTest {
     private static final BotApiResponse BOT_API_SUCCESS_RESPONSE =
             BOT_API_SUCCESS_RESPONSE_BODY.withRequestId(REQUEST_ID_FIXTURE);
 
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
-    @Rule
-    public final Timeout timeoutRule = Timeout.seconds(5);
-
     @Mock
     private LineBlobService retrofitMock;
 

line-bot-api-client/src/test/java/com/linecorp/bot/client/LineClientBuildersTest.java

@@ -21,7 +21,7 @@
 import java.lang.reflect.Field;
 import java.net.URI;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LineClientBuildersTest {
     @Test