(feature) - update unit testing framework to Junit 5 and migrate existing tests

Author: thomasc-adyen

pom.xml

@@ -31,6 +31,7 @@
         <swagger-core-version>1.6.16</swagger-core-version>
         <sonar.organization>adyen</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <junit-jupiter-version>5.11.4</junit-jupiter-version>
     </properties>
     <scm>
         <connection>scm:git:git@github.com:Adyen/adyen-java-api-library.git</connection>
@@ -239,10 +240,17 @@
             <version>5.5</version>
             <scope>compile</scope>
         </dependency>
+
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit-jupiter-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -251,6 +259,12 @@
             <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>3.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -293,11 +307,5 @@
             <version>${swagger-core-version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>5.14.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

src/test/java/com/adyen/ApplicationInfoTest.java

@@ -2,11 +2,11 @@
 
 import static com.adyen.Client.LIB_NAME;
 import static com.adyen.Client.LIB_VERSION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.adyen.model.applicationinfo.ApplicationInfo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ApplicationInfoTest {
 

src/test/java/com/adyen/BalanceControlTest.java

@@ -1,6 +1,6 @@
 package com.adyen;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.verify;
 
 import com.adyen.constants.ApiConstants;
@@ -11,7 +11,7 @@
 import com.adyen.service.exception.ApiException;
 import java.io.IOException;
 import java.time.OffsetDateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BalanceControlTest extends BaseTest {
 

src/test/java/com/adyen/BalancePlatformTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
@@ -15,7 +15,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 public class BalancePlatformTest extends BaseTest {

src/test/java/com/adyen/BaseTest.java

@@ -22,7 +22,7 @@
 
 import static com.adyen.Client.LIB_NAME;
 import static com.adyen.Client.LIB_VERSION;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

src/test/java/com/adyen/BinLookupTest.java

@@ -20,15 +20,15 @@
  */
 package com.adyen;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import com.adyen.model.binlookup.*;
 import com.adyen.service.binlookup.BinLookupApi;
 import com.adyen.service.exception.ApiException;
 import java.util.ArrayList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests for /get3dsAvailability /getCostEstimate */
 public class BinLookupTest extends BaseTest {

src/test/java/com/adyen/CheckoutTest.java

@@ -20,7 +20,7 @@
  */
 package com.adyen;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.verify;
 
@@ -32,8 +32,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import java.time.OffsetDateTime;
 import java.util.*;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 public class CheckoutTest extends BaseTest {
@@ -385,8 +385,8 @@ public void testGetStoredPaymentMethods() throws Exception {
     RecurringApi checkout = new RecurringApi(client);
     ListStoredPaymentMethodsResponse response =
         checkout.getTokensForStoredPaymentDetails("test-1234", "TestMerchantAccount", null);
-    Assert.assertEquals("merchantAccount", response.getMerchantAccount());
-    Assert.assertEquals("string", response.getStoredPaymentMethods().get(0).getBrand());
+    Assertions.assertEquals("merchantAccount", response.getMerchantAccount());
+    Assertions.assertEquals("string", response.getStoredPaymentMethods().get(0).getBrand());
   }
 
   /** Should delete StoredPaymentMethods */
@@ -478,10 +478,10 @@ public void testCheckoutPaymentMethodSerialisation() throws Exception {
                 + "    \"applePayToken\": \"VNRWtuNlNEWkRCSm1xWndjMDFFbktkQU...\"\n"
                 + "  }");
 
-    Assert.assertTrue(checkoutPaymentMethodGoogle.toJson().contains("paywithgoogle"));
-    Assert.assertTrue(checkoutPaymentMethodGoogle.toJson().contains("googlePayToken"));
-    Assert.assertTrue(checkoutPaymentMethodScheme.toJson().contains("scheme"));
-    Assert.assertTrue(
+    Assertions.assertTrue(checkoutPaymentMethodGoogle.toJson().contains("paywithgoogle"));
+    Assertions.assertTrue(checkoutPaymentMethodGoogle.toJson().contains("googlePayToken"));
+    Assertions.assertTrue(checkoutPaymentMethodScheme.toJson().contains("scheme"));
+    Assertions.assertTrue(
         checkoutPaymentMethodApple.toJson().contains("NRWtuNlNEWkRCSm1xWndjMDFFbktkQU"));
   }
 

src/test/java/com/adyen/DataProtectionServiceTest.java

@@ -20,7 +20,7 @@
  */
 package com.adyen;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.verify;
 
 import com.adyen.constants.ApiConstants;
@@ -29,7 +29,7 @@
 import com.adyen.service.dataprotection.DataProtectionApi;
 import com.adyen.service.exception.ApiException;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DataProtectionServiceTest extends BaseTest {
   /** Test success flow for POST /requestSubjectErasure */

src/test/java/com/adyen/DateSerializationTest.java

@@ -13,7 +13,7 @@
 import com.adyen.service.exception.ApiException;
 import java.io.IOException;
 import java.time.OffsetDateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class DateSerializationTest extends BaseTest {

src/test/java/com/adyen/DisputesTest.java

@@ -1,6 +1,6 @@
 package com.adyen;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.verify;
 
 import com.adyen.constants.ApiConstants;
@@ -11,7 +11,7 @@
 import com.adyen.service.exception.ApiException;
 import java.io.IOException;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DisputesTest extends BaseTest {