Use provided JUnit5 instead of JUnit4 as much as possible. Use AssertJ instead of JUnit5 assertions

Author: robtimus

pom.xml

@@ -73,11 +73,8 @@
     <version.commons-codec>1.14</version.commons-codec>
     <version.connect-sdk-java>6.10.0</version.connect-sdk-java>
     <version.gson>2.8.6</version.gson>
-    <version.hamcrest>2.2</version.hamcrest>
     <version.httpclient>4.5.12</version.httpclient>
     <version.httpmime>4.5.12</version.httpmime>
-    <version.junit>4.13</version.junit>
-    <version.mockito>3.3.3</version.mockito>
     <version.powermock>2.0.7</version.powermock>
     <version.spring-boot>2.3.0.RELEASE</version.spring-boot>
 
@@ -170,32 +167,17 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${version.junit}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>${version.hamcrest}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>${version.mockito}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
       <version>${version.powermock}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

src/test/java/com/github/robtimus/connect/sdk/java/springboot/actuator/ConnectSdkHealthIndicatorTest.java

@@ -18,14 +18,14 @@
 package com.github.robtimus.connect.sdk.java.springboot.actuator;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.Status;
 import com.ingenico.connect.gateway.sdk.java.ApiException;
@@ -40,8 +40,9 @@ public class ConnectSdkHealthIndicatorTest {
     public void testNonPositiveMinInterval() {
         MerchantClient merchantClient = mock(MerchantClient.class);
 
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> new ConnectSdkHealthIndicator(merchantClient, 0));
-        assertThat(exception.getMessage()).isEqualTo("minInterval must be > 0, is 0");
+        assertThatThrownBy(() -> new ConnectSdkHealthIndicator(merchantClient, 0))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("minInterval must be > 0, is 0");
     }
 
     @Test

src/test/java/com/github/robtimus/connect/sdk/java/springboot/actuator/ConnectionsEndpointTest.java

@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/actuator/LoggingEndpointTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkAuthenticatorAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkClientAutoConfigurationTest.java

@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkCommunicatorAutoConfigurationTest.java

@@ -27,7 +27,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 import java.net.URI;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkCommunicatorLoggerAutoConfigurationTest.java

@@ -35,6 +35,7 @@
 import com.github.robtimus.connect.sdk.java.springboot.logging.LogbackCommunicatorLogger;
 import com.ingenico.connect.gateway.sdk.java.logging.CommunicatorLogger;
 
+// PowerMock doesn't work well with JUnit5 yet, so use JUnit4 for just this test class
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(LoggerFactory.class)
 public class ConnectSdkCommunicatorLoggerAutoConfigurationTest {

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkConnectionAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkConnectionsEndpointAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkHealthIndicatorAutoConfigurationTest.java

@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.when;
 import java.io.IOException;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.actuate.health.Status;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkLoggingEndpointAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkMarshallerAutoConfigurationTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkMerchantClientAutoConfigurationTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkMetaDataProviderAutoConfigurationTest.java

@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkPropertiesTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/ConnectSdkSessionAutoConfigurationTest.java

@@ -22,7 +22,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/autoconfigure/FullAutoConfigurationTest.java

@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import java.net.URI;
 import java.util.function.Function;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

src/test/java/com/github/robtimus/connect/sdk/java/springboot/logging/LogbackCommunicatorLoggerTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.slf4j.LoggerFactory;
 import com.ingenico.connect.gateway.sdk.java.logging.CommunicatorLogger;