[department-of-veterans-affairs/notification-api#553] Complete move t…

…o JUnit5
department-of-veterans-affairs · Sep 24, 2021 · 42473de · 42473de
1 parent 2c616e6
commit 42473de
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.8.0</version>
+                <version>5.8.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -54,23 +54,7 @@
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/test/java/gov/va/vanotify/JsonUtilsTest.java b/src/test/java/gov/va/vanotify/JsonUtilsTest.java
@@ -2,24 +2,26 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class JsonUtilsTest {
 
     private Map<String, Object> expectedMap;
     private List<Object> expectedList;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         setUpMap();
         setUpList();

diff --git a/src/test/java/gov/va/vanotify/LetterResponseTest.java b/src/test/java/gov/va/vanotify/LetterResponseTest.java
@@ -1,12 +1,12 @@
 package gov.va.vanotify;
 
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class LetterResponseTest {
 

diff --git a/src/test/java/gov/va/vanotify/NotificationListTest.java b/src/test/java/gov/va/vanotify/NotificationListTest.java
@@ -2,12 +2,12 @@
 
 import org.jose4j.json.internal.json_simple.JSONArray;
 import org.jose4j.json.internal.json_simple.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class NotificationListTest {

diff --git a/src/test/java/gov/va/vanotify/PdfUtilsTest.java b/src/test/java/gov/va/vanotify/PdfUtilsTest.java
@@ -2,12 +2,13 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PdfUtilsTest
 {

diff --git a/src/test/java/gov/va/vanotify/ReceivedTextMessageListTest.java b/src/test/java/gov/va/vanotify/ReceivedTextMessageListTest.java
@@ -2,12 +2,12 @@
 
 import org.jose4j.json.internal.json_simple.JSONArray;
 import org.jose4j.json.internal.json_simple.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ReceivedTextMessageListTest {
 

diff --git a/src/test/java/gov/va/vanotify/ReceivedTextMessageTest.java b/src/test/java/gov/va/vanotify/ReceivedTextMessageTest.java
@@ -2,11 +2,11 @@
 
 import org.joda.time.DateTime;
 import org.jose4j.json.internal.json_simple.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ReceivedTextMessageTest {
 

diff --git a/src/test/java/gov/va/vanotify/SendEmailResponseTest.java b/src/test/java/gov/va/vanotify/SendEmailResponseTest.java
@@ -1,12 +1,12 @@
 package gov.va.vanotify;
 
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SendEmailResponseTest {
 

diff --git a/src/test/java/gov/va/vanotify/SendLetterResponseTest.java b/src/test/java/gov/va/vanotify/SendLetterResponseTest.java
@@ -1,13 +1,13 @@
 package gov.va.vanotify;
 
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class SendLetterResponseTest {
 

diff --git a/src/test/java/gov/va/vanotify/SendSmsResponseTest.java b/src/test/java/gov/va/vanotify/SendSmsResponseTest.java
@@ -1,12 +1,12 @@
 package gov.va.vanotify;
 
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SendSmsResponseTest {
 

diff --git a/src/test/java/gov/va/vanotify/TemplatePreviewTest.java b/src/test/java/gov/va/vanotify/TemplatePreviewTest.java
@@ -1,12 +1,12 @@
 package gov.va.vanotify;
 
 import org.jose4j.json.internal.json_simple.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TemplatePreviewTest {
 

diff --git a/src/test/java/gov/va/vanotify/TemplateTest.java b/src/test/java/gov/va/vanotify/TemplateTest.java
@@ -1,16 +1,15 @@
 package gov.va.vanotify;
 
-
 import org.joda.time.DateTime;
 import org.jose4j.json.internal.json_simple.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TemplateTest {
 
@@ -55,8 +54,6 @@ public void testTemplate_canCreateObjectFromJson() {
         assertEquals(Optional.of(expectedPersonalisation), template.getPersonalisation());
     }
 
-
-
     @Test
     public void testTemplate_canCreateObjectFromJsonWithOptionals() {
         JSONObject content = new JSONObject();