Repository: networknt/json-schema-validator
Pull request #447 (2021-09-16 09:28:35)

Bump JUnit version to 5.7.2
CI pass https://app.travis-ci.com/github/olegshtch/json-schema-validator/builds/237800878


Patch:
diff --git a/pom.xml b/pom.xml
index 683f9f0..5a54bc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,9 +67,9 @@
         <version.common-lang3>3.7</version.common-lang3>
         <version.joni>2.1.31</version.joni>
         <version.logback>1.2.3</version.logback>
-        <version.junit>4.13.1</version.junit>
+        <version.junit>5.7.2</version.junit>
         <version.mockito>2.7.21</version.mockito>
-        <version.hamcrest>1.3</version.hamcrest>
+        <version.hamcrest>2.2</version.hamcrest>
         <version.undertow>2.2.4.Final</version.undertow>
     </properties>
     <dependencies>
@@ -101,8 +101,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${version.junit}</version>
             <scope>test</scope>
         </dependency>
@@ -114,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${version.hamcrest}</version>
             <scope>test</scope>
         </dependency>
@@ -269,14 +269,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
-                        <version>2.19.1</version>
-                    </dependency>
-                </dependencies>
+                <version>2.22.2</version>
             </plugin>
             <!-- JACOCO added for code coverage -->
             <plugin>


Test patch:
diff --git a/src/test/java/com/networknt/schema/CollectorContextTest.java b/src/test/java/com/networknt/schema/CollectorContextTest.java
index 2e8827b..ec0914a 100644
--- a/src/test/java/com/networknt/schema/CollectorContextTest.java
+++ b/src/test/java/com/networknt/schema/CollectorContextTest.java
@@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.*;
@@ -38,12 +38,12 @@ public class CollectorContextTest {
 
     private JsonSchema jsonSchemaForCombine;
 
-    @Before
+    @BeforeEach
     public void setup() throws Exception {
         setupSchema();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
         if (CollectorContext.getInstance() != null) {
             CollectorContext.getInstance().reset();
@@ -54,12 +54,12 @@ public class CollectorContextTest {
     @Test
     public void testCollectorContextWithKeyword() throws Exception {
         ValidationResult validationResult = validate("{\"test-property1\":\"sample1\",\"test-property2\":\"sample2\"}");
-        Assert.assertEquals(0, validationResult.getValidationMessages().size());
+        Assertions.assertEquals(0, validationResult.getValidationMessages().size());
         List<String> contextValues = (List<String>) validationResult.getCollectorContext().get(SAMPLE_COLLECTOR);
-        Assert.assertEquals(0, validationResult.getValidationMessages().size());
-        Assert.assertEquals(2, contextValues.size());
-        Assert.assertEquals(contextValues.get(0), "actual_value_added_to_context1");
-        Assert.assertEquals(contextValues.get(1), "actual_value_added_to_context2");
+        Assertions.assertEquals(0, validationResult.getValidationMessages().size());
+        Assertions.assertEquals(2, contextValues.size());
+        Assertions.assertEquals(contextValues.get(0), "actual_value_added_to_context1");
+        Assertions.assertEquals(contextValues.get(1), "actual_value_added_to_context2");
     }
 
     @SuppressWarnings("unchecked")
@@ -89,17 +89,17 @@ public class CollectorContextTest {
         ValidationResult validationResult2 = validationRunnable2.getValidationResult();
         ValidationResult validationResult3 = validationRunnable3.getValidationResult();
 
-        Assert.assertEquals(0, validationResult1.getValidationMessages().size());
-        Assert.assertEquals(0, validationResult2.getValidationMessages().size());
-        Assert.assertEquals(0, validationResult3.getValidationMessages().size());
+        Assertions.assertEquals(0, validationResult1.getValidationMessages().size());
+        Assertions.assertEquals(0, validationResult2.getValidationMessages().size());
+        Assertions.assertEquals(0, validationResult3.getValidationMessages().size());
 
         List<String> contextValue1 = (List<String>) validationResult1.getCollectorContext().get(SAMPLE_COLLECTOR);
         List<String> contextValue2 = (List<String>) validationResult2.getCollectorContext().get(SAMPLE_COLLECTOR);
         List<String> contextValue3 = (List<String>) validationResult3.getCollectorContext().get(SAMPLE_COLLECTOR);
 
-        Assert.assertEquals(contextValue1.get(0), "actual_value_added_to_context1");
-        Assert.assertEquals(contextValue2.get(0), "actual_value_added_to_context2");
-        Assert.assertEquals(contextValue3.get(0), "actual_value_added_to_context3");
+        Assertions.assertEquals(contextValue1.get(0), "actual_value_added_to_context1");
+        Assertions.assertEquals(contextValue2.get(0), "actual_value_added_to_context2");
+        Assertions.assertEquals(contextValue3.get(0), "actual_value_added_to_context3");
     }
 
     @SuppressWarnings("unchecked")
@@ -109,8 +109,8 @@ public class CollectorContextTest {
         ValidationResult validationResult = jsonSchemaForCombine.validateAndCollect(objectMapper
                 .readTree("{\"property1\":\"sample1\",\"property2\":\"sample2\",\"property3\":\"sample3\" }"));
         CollectorContext collectorContext = validationResult.getCollectorContext();
-        Assert.assertEquals(((List<String>) collectorContext.get(SAMPLE_COLLECTOR)).size(), 1);
-        Assert.assertEquals(((List<String>) collectorContext.get(SAMPLE_COLLECTOR_OTHER)).size(), 3);
+        Assertions.assertEquals(((List<String>) collectorContext.get(SAMPLE_COLLECTOR)).size(), 1);
+        Assertions.assertEquals(((List<String>) collectorContext.get(SAMPLE_COLLECTOR_OTHER)).size(), 3);
     }
 
     private JsonMetaSchema getJsonMetaSchema(String uri) throws Exception {
diff --git a/src/test/java/com/networknt/schema/CustomMetaSchemaTest.java b/src/test/java/com/networknt/schema/CustomMetaSchemaTest.java
index e2ee5e4..d1e0ac8 100644
--- a/src/test/java/com/networknt/schema/CustomMetaSchemaTest.java
+++ b/src/test/java/com/networknt/schema/CustomMetaSchemaTest.java
@@ -19,7 +19,7 @@ package com.networknt.schema;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CustomMetaSchemaTest {
 
diff --git a/src/test/java/com/networknt/schema/CyclicDependencyTest.java b/src/test/java/com/networknt/schema/CyclicDependencyTest.java
index b1c9cc3..585217b 100644
--- a/src/test/java/com/networknt/schema/CyclicDependencyTest.java
+++ b/src/test/java/com/networknt/schema/CyclicDependencyTest.java
@@ -1,12 +1,12 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.net.URL;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CyclicDependencyTest {
 
diff --git a/src/test/java/com/networknt/schema/DateTimeDSTTest.java b/src/test/java/com/networknt/schema/DateTimeDSTTest.java
index 8401937..035d1a3 100644
--- a/src/test/java/com/networknt/schema/DateTimeDSTTest.java
+++ b/src/test/java/com/networknt/schema/DateTimeDSTTest.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -29,6 +29,6 @@ public class DateTimeDSTTest {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(0, errors.size());
+        Assertions.assertEquals(0, errors.size());
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue255Test.java b/src/test/java/com/networknt/schema/Issue255Test.java
index 01450b2..e79b403 100644
--- a/src/test/java/com/networknt/schema/Issue255Test.java
+++ b/src/test/java/com/networknt/schema/Issue255Test.java
@@ -17,8 +17,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -44,6 +44,6 @@ public class Issue255Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(2, errors.size());
+        Assertions.assertEquals(2, errors.size());
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue285Test.java b/src/test/java/com/networknt/schema/Issue285Test.java
index e0416f6..8461266 100644
--- a/src/test/java/com/networknt/schema/Issue285Test.java
+++ b/src/test/java/com/networknt/schema/Issue285Test.java
@@ -1,8 +1,8 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
@@ -10,7 +10,7 @@ import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.Set;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class Issue285Test {
     private ObjectMapper mapper = new ObjectMapper();
@@ -92,7 +92,7 @@ public class Issue285Test {
     // In this case a nested type declaration isn't valid and should raise an error.
     // The result is not as expected and we get no validation error.
     @Test
-    @Ignore
+    @Disabled
     public void nestedTypeValidation() throws IOException, URISyntaxException {
         URI uri = new URI("https://json-schema.org/draft/2019-09/schema");
         JsonSchema jsonSchema = schemaFactory.getSchema(uri);
diff --git a/src/test/java/com/networknt/schema/Issue295Test.java b/src/test/java/com/networknt/schema/Issue295Test.java
index 680ae2a..f596277 100644
--- a/src/test/java/com/networknt/schema/Issue295Test.java
+++ b/src/test/java/com/networknt/schema/Issue295Test.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -29,6 +29,6 @@ public class Issue295Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(0, errors.size());
+        Assertions.assertEquals(0, errors.size());
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue313Test.java b/src/test/java/com/networknt/schema/Issue313Test.java
index a44d451..867e85e 100644
--- a/src/test/java/com/networknt/schema/Issue313Test.java
+++ b/src/test/java/com/networknt/schema/Issue313Test.java
@@ -2,9 +2,9 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -27,7 +27,7 @@ public class Issue313Test {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void shouldFailV201909() throws Exception {
         String schemaPath = "/schema/issue313-2019-09.json";
         String dataPath = "/data/issue313.json";
@@ -36,7 +36,7 @@ public class Issue313Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(2, errors.size());
+        Assertions.assertEquals(2, errors.size());
     }
 
     @Test
@@ -48,7 +48,7 @@ public class Issue313Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(2, errors.size());
+        Assertions.assertEquals(2, errors.size());
     }
 
 }
diff --git a/src/test/java/com/networknt/schema/Issue314Test.java b/src/test/java/com/networknt/schema/Issue314Test.java
index c1fd163..5260d3b 100644
--- a/src/test/java/com/networknt/schema/Issue314Test.java
+++ b/src/test/java/com/networknt/schema/Issue314Test.java
@@ -1,8 +1,8 @@
 package com.networknt.schema;
 
 import java.io.InputStream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class Issue314Test {
     private static final JsonSchemaFactory FACTORY =
@@ -21,6 +21,6 @@ public class Issue314Test {
         InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
         JsonSchema schema = FACTORY.getSchema(schemaInputStream);
 
-        Assert.assertNotNull(schema);
+        Assertions.assertNotNull(schema);
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue327Test.java b/src/test/java/com/networknt/schema/Issue327Test.java
index c91d6bb..e2fe17f 100644
--- a/src/test/java/com/networknt/schema/Issue327Test.java
+++ b/src/test/java/com/networknt/schema/Issue327Test.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -29,6 +29,6 @@ public class Issue327Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(0, errors.size());
+        Assertions.assertEquals(0, errors.size());
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue342Test.java b/src/test/java/com/networknt/schema/Issue342Test.java
index 42abf94..9a921cf 100644
--- a/src/test/java/com/networknt/schema/Issue342Test.java
+++ b/src/test/java/com/networknt/schema/Issue342Test.java
@@ -3,36 +3,36 @@ package com.networknt.schema;
 import java.io.InputStream;
 import java.util.Set;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class Issue342Test {
-	protected JsonSchema getJsonSchemaFromStreamContentV7(InputStream schemaContent) {
-		JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
-		return factory.getSchema(schemaContent);
-	}
+    protected JsonSchema getJsonSchemaFromStreamContentV7(InputStream schemaContent) {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+        return factory.getSchema(schemaContent);
+    }
 
-	protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode node = mapper.readTree(content);
-		return node;
-	}
+    protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(content);
+        return node;
+    }
 
-	@Test
-	public void propertyNameEnumShouldFailV7() throws Exception {
-		String schemaPath = "/schema/issue342-v7.json";
-		String dataPath = "/data/issue342.json";
-		InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
-		JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
-		InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
-		JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
-		Set<ValidationMessage> errors = schema.validate(node);
-		Assert.assertEquals(1, errors.size());
-		final ValidationMessage error = errors.iterator().next();
-		Assert.assertEquals("$.z", error.getPath());
-		Assert.assertEquals("Property name $.z is not valid for validation: does not have a value in the enumeration [a, b, c]", error.getMessage());
-	}
+    @Test
+    public void propertyNameEnumShouldFailV7() throws Exception {
+        String schemaPath = "/schema/issue342-v7.json";
+        String dataPath = "/data/issue342.json";
+        InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
+        JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        Set<ValidationMessage> errors = schema.validate(node);
+        Assertions.assertEquals(1, errors.size());
+        final ValidationMessage error = errors.iterator().next();
+        Assertions.assertEquals("$.z", error.getPath());
+        Assertions.assertEquals("Property name $.z is not valid for validation: does not have a value in the enumeration [a, b, c]", error.getMessage());
+    }
 }
diff --git a/src/test/java/com/networknt/schema/Issue347Test.java b/src/test/java/com/networknt/schema/Issue347Test.java
index d110d65..52fef1a 100644
--- a/src/test/java/com/networknt/schema/Issue347Test.java
+++ b/src/test/java/com/networknt/schema/Issue347Test.java
@@ -1,8 +1,8 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/src/test/java/com/networknt/schema/Issue366FailFast.java b/src/test/java/com/networknt/schema/Issue366FailFast.java
index 2e430f9..51737e4 100644
--- a/src/test/java/com/networknt/schema/Issue366FailFast.java
+++ b/src/test/java/com/networknt/schema/Issue366FailFast.java
@@ -1,6 +1,7 @@
 package com.networknt.schema;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,12 +10,12 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.List;
 import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class Issue366FailFast {
 
-  @Before
+  @BeforeEach
   public void setup() throws IOException {
     setupSchema();
   }
@@ -71,28 +72,32 @@ public class Issue366FailFast {
     assertTrue(errors.isEmpty());
   }
 
-  @Test(expected = JsonSchemaException.class)
+  @Test
   public void bothValid() throws Exception {
     String dataPath = "/data/issue366.json";
-
-    InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
-    JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
-    List<JsonNode> testNodes = node.findValues("tests");
-    JsonNode testNode = testNodes.get(0).get(2);
-    JsonNode dataNode = testNode.get("data");
-    jsonSchema.validate(dataNode);
+    
+    assertThrows(JsonSchemaException.class, () -> {
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        List<JsonNode> testNodes = node.findValues("tests");
+        JsonNode testNode = testNodes.get(0).get(2);
+        JsonNode dataNode = testNode.get("data");
+        jsonSchema.validate(dataNode);        
+    });
   }
 
-  @Test(expected = JsonSchemaException.class)
+  @Test
   public void neitherValid() throws Exception {
     String dataPath = "/data/issue366.json";
-
-    InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
-    JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
-    List<JsonNode> testNodes = node.findValues("tests");
-    JsonNode testNode = testNodes.get(0).get(3);
-    JsonNode dataNode = testNode.get("data");
-    jsonSchema.validate(dataNode);
+    
+    assertThrows(JsonSchemaException.class, () -> {
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+        List<JsonNode> testNodes = node.findValues("tests");
+        JsonNode testNode = testNodes.get(0).get(3);
+        JsonNode dataNode = testNode.get("data");
+        jsonSchema.validate(dataNode);
+    });
   }
 
   private URI getSchema() {
diff --git a/src/test/java/com/networknt/schema/Issue366FailSlow.java b/src/test/java/com/networknt/schema/Issue366FailSlow.java
index 8d93285..1a8542b 100644
--- a/src/test/java/com/networknt/schema/Issue366FailSlow.java
+++ b/src/test/java/com/networknt/schema/Issue366FailSlow.java
@@ -1,7 +1,7 @@
 package com.networknt.schema;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,12 +10,12 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.List;
 import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class Issue366FailSlow {
 
-  @Before
+  @BeforeEach
   public void setup() throws IOException {
     setupSchema();
   }
diff --git a/src/test/java/com/networknt/schema/Issue375Test.java b/src/test/java/com/networknt/schema/Issue375Test.java
index 24f36c0..86ccd0a 100644
--- a/src/test/java/com/networknt/schema/Issue375Test.java
+++ b/src/test/java/com/networknt/schema/Issue375Test.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Set;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Issue375Test {
     protected JsonSchema getJsonSchemaFromStreamContent(InputStream schemaContent) {
diff --git a/src/test/java/com/networknt/schema/Issue383Test.java b/src/test/java/com/networknt/schema/Issue383Test.java
index cb9c162..fc4dd87 100644
--- a/src/test/java/com/networknt/schema/Issue383Test.java
+++ b/src/test/java/com/networknt/schema/Issue383Test.java
@@ -3,8 +3,8 @@ package com.networknt.schema;
 import java.io.InputStream;
 import java.util.Set;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +30,6 @@ public class Issue383Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(0, errors.size());
+        Assertions.assertEquals(0, errors.size());
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue396Test.java b/src/test/java/com/networknt/schema/Issue396Test.java
index e7f127e..e9bff0b 100644
--- a/src/test/java/com/networknt/schema/Issue396Test.java
+++ b/src/test/java/com/networknt/schema/Issue396Test.java
@@ -5,41 +5,41 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class Issue396Test {
-	protected JsonSchema getJsonSchemaFromStreamContentV7(InputStream schemaContent) {
-		JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
-		return factory.getSchema(schemaContent);
-	}
-
-	protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode node = mapper.readTree(content);
-		return node;
-	}
-
-	@Test
-	public void testComplexPropertyNamesV7() throws Exception {
-		String schemaPath = "/schema/issue396-v7.json";
-		String dataPath = "/data/issue396.json";
-		InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
-		JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
-		InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
-		JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
-
-		final Set<String> invalidPaths = new HashSet<>();
-		node.fields().forEachRemaining(entry -> {
-			if (!entry.getValue().asBoolean())
-				invalidPaths.add("$." + entry.getKey());
-		});
-
-		Set<ValidationMessage> errors = schema.validate(node);
-		final Set<String> failedPaths = errors.stream().map(ValidationMessage::getPath).collect(Collectors.toSet());
-		Assert.assertEquals(failedPaths, invalidPaths);
-	}
+    protected JsonSchema getJsonSchemaFromStreamContentV7(InputStream schemaContent) {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+        return factory.getSchema(schemaContent);
+    }
+
+    protected JsonNode getJsonNodeFromStreamContent(InputStream content) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode node = mapper.readTree(content);
+        return node;
+    }
+
+    @Test
+    public void testComplexPropertyNamesV7() throws Exception {
+        String schemaPath = "/schema/issue396-v7.json";
+        String dataPath = "/data/issue396.json";
+        InputStream schemaInputStream = getClass().getResourceAsStream(schemaPath);
+        JsonSchema schema = getJsonSchemaFromStreamContentV7(schemaInputStream);
+        InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
+        JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
+
+        final Set<String> invalidPaths = new HashSet<>();
+        node.fields().forEachRemaining(entry -> {
+            if (!entry.getValue().asBoolean())
+                invalidPaths.add("$." + entry.getKey());
+        });
+
+        Set<ValidationMessage> errors = schema.validate(node);
+        final Set<String> failedPaths = errors.stream().map(ValidationMessage::getPath).collect(Collectors.toSet());
+        Assertions.assertEquals(failedPaths, invalidPaths);
+    }
 }
diff --git a/src/test/java/com/networknt/schema/Issue404Test.java b/src/test/java/com/networknt/schema/Issue404Test.java
index 4d4ebb8..07b3068 100644
--- a/src/test/java/com/networknt/schema/Issue404Test.java
+++ b/src/test/java/com/networknt/schema/Issue404Test.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -29,7 +29,7 @@ public class Issue404Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(0, errors.size());
+        Assertions.assertEquals(0, errors.size());
     }
 
 }
diff --git a/src/test/java/com/networknt/schema/Issue406Test.java b/src/test/java/com/networknt/schema/Issue406Test.java
index c44aab1..b4f0533 100644
--- a/src/test/java/com/networknt/schema/Issue406Test.java
+++ b/src/test/java/com/networknt/schema/Issue406Test.java
@@ -3,9 +3,9 @@
  */
 package com.networknt.schema;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
 
 public class Issue406Test {
     protected static final String INVALID_$REF_SCHEMA = "{\"$ref\":\"urn:unresolved\"}";
@@ -17,21 +17,21 @@ public class Issue406Test {
         final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
         final JsonSchema schema = factory.getSchema(INVALID_$REF_SCHEMA);
         // not breaking - pass
-        Assert.assertNotNull(schema);
+        Assertions.assertNotNull(schema);
     }
 
     @Test
     public void testPreloadingHappening() {
         final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
         final JsonSchema schema = factory.getSchema(INVALID_$REF_SCHEMA);
-        Assert.assertThrows("#/$ref: Reference urn:unresolved cannot be resolved",
-                            JsonSchemaException.class,
-                            new ThrowingRunnable() {
+        Assertions.assertThrows(JsonSchemaException.class,
+                            new Executable() {
                                 @Override
-                                public void run() {
+                                public void execute() {
                                     schema.initializeValidators();
                                 }
-                            });
+                            },
+                            "#/$ref: Reference urn:unresolved cannot be resolved");
     }
 
     @Test
diff --git a/src/test/java/com/networknt/schema/Issue425Test.java b/src/test/java/com/networknt/schema/Issue425Test.java
index 6baa507..1becc03 100644
--- a/src/test/java/com/networknt/schema/Issue425Test.java
+++ b/src/test/java/com/networknt/schema/Issue425Test.java
@@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class Issue425Test {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -28,7 +28,7 @@ public class Issue425Test {
     public Issue425Test() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -40,7 +40,7 @@ public class Issue425Test {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -104,7 +104,7 @@ public class Issue425Test {
                                 for (ValidationMessage error : errors) {
                                     System.out.println(error);
                                 }
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertFalse(errors.isEmpty());
diff --git a/src/test/java/com/networknt/schema/Issue426Test.java b/src/test/java/com/networknt/schema/Issue426Test.java
index 5c9b8ac..07c76c3 100644
--- a/src/test/java/com/networknt/schema/Issue426Test.java
+++ b/src/test/java/com/networknt/schema/Issue426Test.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.Set;
@@ -31,11 +31,11 @@ public class Issue426Test {
         InputStream dataInputStream = getClass().getResourceAsStream(dataPath);
         JsonNode node = getJsonNodeFromStreamContent(dataInputStream);
         Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(2, errors.size());
+        Assertions.assertEquals(2, errors.size());
         final JsonNode message = schema.schemaNode.get("message");
         for(ValidationMessage error : errors) {
             //validating custom message
-            Assert.assertEquals(message.get(error.getType()).asText(),  error.getMessage());
+            Assertions.assertEquals(message.get(error.getType()).asText(),  error.getMessage());
         }
     }
 }
diff --git a/src/test/java/com/networknt/schema/Issue428Test.java b/src/test/java/com/networknt/schema/Issue428Test.java
index da6a604..cdedc78 100644
--- a/src/test/java/com/networknt/schema/Issue428Test.java
+++ b/src/test/java/com/networknt/schema/Issue428Test.java
@@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class Issue428Test {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -28,7 +28,7 @@ public class Issue428Test {
     public Issue428Test() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -40,7 +40,7 @@ public class Issue428Test {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -103,7 +103,7 @@ public class Issue428Test {
                                 for (ValidationMessage error : errors) {
                                     System.out.println(error);
                                 }
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertFalse(errors.isEmpty());
diff --git a/src/test/java/com/networknt/schema/JsonWalkTest.java b/src/test/java/com/networknt/schema/JsonWalkTest.java
index dc5b0e9..13b6d87 100644
--- a/src/test/java/com/networknt/schema/JsonWalkTest.java
+++ b/src/test/java/com/networknt/schema/JsonWalkTest.java
@@ -7,9 +7,9 @@ import com.networknt.schema.walk.JsonSchemaWalkListener;
 import com.networknt.schema.walk.WalkEvent;
 import com.networknt.schema.walk.WalkFlow;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,7 +17,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class JsonWalkTest {
 
@@ -29,12 +29,12 @@ public class JsonWalkTest {
 
     private static final String CUSTOM_KEYWORD = "custom-keyword";
 
-    @Before
+    @BeforeEach
     public void setup() {
         setupSchema();
     }
 
-    @After
+    @AfterEach
     public void cleanup() {
        CollectorContext.getInstance().reset();
     }
diff --git a/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java b/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java
index 34799bd..99d9027 100644
--- a/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java
+++ b/src/test/java/com/networknt/schema/MaximumValidatorPerfTest.java
@@ -15,8 +15,8 @@
  */
 package com.networknt.schema;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-@Ignore
+@Disabled
 public class MaximumValidatorPerfTest {
     MaximumValidatorTest test = new MaximumValidatorTest();
 
diff --git a/src/test/java/com/networknt/schema/MaximumValidatorTest.java b/src/test/java/com/networknt/schema/MaximumValidatorTest.java
index 1812c7f..6f5a9cb 100644
--- a/src/test/java/com/networknt/schema/MaximumValidatorTest.java
+++ b/src/test/java/com/networknt/schema/MaximumValidatorTest.java
@@ -19,15 +19,15 @@ package com.networknt.schema;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Set;
 
 import static java.lang.String.format;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
     private static final String INTEGER = "{ \"$schema\":\"http://json-schema.org/draft-04/schema#\", \"type\": \"integer\", \"maximum\": %s }";
@@ -191,16 +191,16 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
             JsonSchema v = factory.getSchema(mapper.readTree(schema), config);
             JsonNode doc = mapper.readTree(value);
             Set<ValidationMessage> messages = v.validate(doc);
-            assertTrue(format("Maximum %s and value %s are interpreted as Infinity, thus no schema violation should be reported", maximum, value), messages.isEmpty());
+            assertTrue(messages.isEmpty(), format("Maximum %s and value %s are interpreted as Infinity, thus no schema violation should be reported", maximum, value));
 
             // document parsed with BigDecimal
 
             doc = bigDecimalMapper.readTree(value);
             Set<ValidationMessage> messages2 = v.validate(doc);
             if (Double.valueOf(maximum).equals(Double.POSITIVE_INFINITY)) {
-                assertTrue(format("Maximum %s and value %s are equal, thus no schema violation should be reported", maximum, value), messages2.isEmpty());
+                assertTrue(messages2.isEmpty(), format("Maximum %s and value %s are equal, thus no schema violation should be reported", maximum, value));
             } else {
-                assertFalse(format("Maximum %s is smaller than value %s ,  should be validation error reported", maximum, value), messages2.isEmpty());
+                assertFalse(messages2.isEmpty(), format("Maximum %s is smaller than value %s ,  should be validation error reported", maximum, value));
             }
 
 
@@ -209,9 +209,9 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
             Set<ValidationMessage> messages3 = v.validate(doc);
             //when the schema and value are both using BigDecimal, the value should be parsed in same mechanism.
             if (maximum.toLowerCase().equals(value.toLowerCase()) || Double.valueOf(maximum).equals(Double.POSITIVE_INFINITY)) {
-                assertTrue(format("Maximum %s and value %s are equal, thus no schema violation should be reported", maximum, value), messages3.isEmpty());
+                assertTrue(messages3.isEmpty(), format("Maximum %s and value %s are equal, thus no schema violation should be reported", maximum, value));
             } else {
-                assertFalse(format("Maximum %s is smaller than value %s ,  should be validation error reported", maximum, value), messages3.isEmpty());
+                assertFalse(messages3.isEmpty(), format("Maximum %s is smaller than value %s ,  should be validation error reported", maximum, value));
             }
         }
     }
@@ -229,13 +229,13 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
         JsonSchema v = factory.getSchema(mapper.readTree(schema));
 
         Set<ValidationMessage> messages = v.validate(doc);
-        assertTrue("Validation should succeed as by default double values are used by mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed as by default double values are used by mapper");
 
         doc = bigDecimalMapper.readTree(content);
         messages = v.validate(doc);
         // "1.7976931348623158e+308" == "1.7976931348623157e+308" == Double.MAX_VALUE
         // new BigDecimal("1.7976931348623158e+308").compareTo(new BigDecimal("1.7976931348623157e+308")) > 0
-        assertFalse("Validation should not succeed because content is using bigDecimalMapper, and bigger than the maximum", messages.isEmpty());
+        assertFalse(messages.isEmpty(), "Validation should not succeed because content is using bigDecimalMapper, and bigger than the maximum");
 
         /*
          * Note: technically this is where 1.7976931348623158e+308 rounding to 1.7976931348623157e+308 could be spotted,
@@ -246,7 +246,7 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
          */
         v = factory.getSchema(bigDecimalMapper.readTree(schema));
         messages = v.validate(doc);
-        assertFalse("Validation should succeed as by default double values are used by mapper", messages.isEmpty());
+        assertFalse(messages.isEmpty(), "Validation should succeed as by default double values are used by mapper");
     }
 
     /**
@@ -261,13 +261,13 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
         JsonSchema v = factory.getSchema(mapper.readTree(schema));
 
         Set<ValidationMessage> messages = v.validate(doc);
-        assertTrue("Validation should succeed as by default double values are used by mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed as by default double values are used by mapper");
 
         doc = bigDecimalMapper.readTree(content);
         messages = v.validate(doc);
         // "1.7976931348623158e+308" == "1.7976931348623157e+308" == Double.MAX_VALUE
         // new BigDecimal("1.7976931348623158e+308").compareTo(new BigDecimal("1.7976931348623157e+308")) > 0
-        assertTrue("Validation should success because the bug of bigDecimalMapper, it will treat 1.7976931348623159e+308 as INFINITY", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should success because the bug of bigDecimalMapper, it will treat 1.7976931348623159e+308 as INFINITY");
 
         /*
          * Note: technically this is where 1.7976931348623158e+308 rounding to 1.7976931348623157e+308 could be spotted,
@@ -278,7 +278,7 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
          */
         v = factory.getSchema(bigDecimalMapper.readTree(schema));
         messages = v.validate(doc);
-        assertTrue("Validation should success because the bug of bigDecimalMapper, it will treat 1.7976931348623159e+308 as INFINITY", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should success because the bug of bigDecimalMapper, it will treat 1.7976931348623159e+308 as INFINITY");
     }
 
     private static final String POSITIVE_TEST_CASE_TEMPLATE = "Expecting no validation errors, maximum %s is greater than value %s";
@@ -299,7 +299,7 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
             JsonNode doc = mapper.readTree(value);
 
             Set<ValidationMessage> messages = v.validate(doc);
-            assertTrue(format(MaximumValidatorTest.POSITIVE_TEST_CASE_TEMPLATE, maximum, value), messages.isEmpty());
+            assertTrue(messages.isEmpty(), format(MaximumValidatorTest.POSITIVE_TEST_CASE_TEMPLATE, maximum, value));
         }
     }
 
@@ -319,7 +319,7 @@ public class MaximumValidatorTest extends BaseJsonSchemaValidatorTest {
             JsonNode doc = mapper2.readTree(value);
 
             Set<ValidationMessage> messages = v.validate(doc);
-            assertFalse(format(MaximumValidatorTest.NEGATIVE_TEST_CASE_TEMPLATE, value, maximum), messages.isEmpty());
+            assertFalse(messages.isEmpty(), format(MaximumValidatorTest.NEGATIVE_TEST_CASE_TEMPLATE, value, maximum));
         }
     }
 }
diff --git a/src/test/java/com/networknt/schema/MinimumValidatorTest.java b/src/test/java/com/networknt/schema/MinimumValidatorTest.java
index b6ed077..c43cd65 100644
--- a/src/test/java/com/networknt/schema/MinimumValidatorTest.java
+++ b/src/test/java/com/networknt/schema/MinimumValidatorTest.java
@@ -19,8 +19,8 @@ package com.networknt.schema;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -28,8 +28,8 @@ import java.util.Set;
 
 import static com.networknt.schema.MaximumValidatorTest.augmentWithQuotes;
 import static java.lang.String.format;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MinimumValidatorTest {
     private static final String NUMBER = "{ \"$schema\":\"http://json-schema.org/draft-04/schema#\", \"type\": \"number\", \"minimum\": %s }";
@@ -43,7 +43,7 @@ public class MinimumValidatorTest {
     private static ObjectMapper bigDecimalMapper;
     private static ObjectMapper bigIntegerMapper;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         mapper = new ObjectMapper();
         // due to a jackson bug, a float number which is larger than Double.POSITIVE_INFINITY cannot be convert to BigDecimal correctly
@@ -178,7 +178,7 @@ public class MinimumValidatorTest {
             JsonSchema v = factory.getSchema(mapper.readTree(schema), config);
             JsonNode doc = mapper.readTree(value);
             Set<ValidationMessage> messages = v.validate(doc);
-            assertTrue(format("Minimum %s and value %s are interpreted as Infinity, thus no schema violation should be reported", minimum, value), messages.isEmpty());
+            assertTrue(messages.isEmpty(), format("Minimum %s and value %s are interpreted as Infinity, thus no schema violation should be reported", minimum, value));
 
             // document parsed with BigDecimal
             doc = bigDecimalMapper.readTree(value);
@@ -190,9 +190,9 @@ public class MinimumValidatorTest {
                  * {"-1.000000000000000000000001E+308", "-1.000000000000000000000001E+308"} will be false
                  * because the different between two mappers, without using big decimal, it loses some precises.
                  */
-                assertTrue(format("Minimum %s and value %s are equal, thus no schema violation should be reported", minimum, value), messages2.isEmpty());
+                assertTrue(messages2.isEmpty(), format("Minimum %s and value %s are equal, thus no schema violation should be reported", minimum, value));
             } else {
-                assertFalse(format("Minimum %s is larger than value %s ,  should be validation error reported", minimum, value), messages2.isEmpty());
+                assertFalse(messages2.isEmpty(), format("Minimum %s is larger than value %s ,  should be validation error reported", minimum, value));
             }
 
             // schema and document parsed with BigDecimal
@@ -200,9 +200,9 @@ public class MinimumValidatorTest {
             Set<ValidationMessage> messages3 = v.validate(doc);
             //when the schema and value are both using BigDecimal, the value should be parsed in same mechanism.
             if (minimum.toLowerCase().equals(value.toLowerCase()) || Double.valueOf(minimum).equals(Double.NEGATIVE_INFINITY)) {
-                assertTrue(format("Minimum %s and value %s are equal, thus no schema violation should be reported", minimum, value), messages3.isEmpty());
+                assertTrue(messages3.isEmpty(), format("Minimum %s and value %s are equal, thus no schema violation should be reported", minimum, value));
             } else {
-                assertFalse(format("Minimum %s is larger than value %s ,  should be validation error reported", minimum, value), messages3.isEmpty());
+                assertFalse(messages3.isEmpty(), format("Minimum %s is larger than value %s ,  should be validation error reported", minimum, value));
             }
         }
     }
@@ -220,11 +220,11 @@ public class MinimumValidatorTest {
         JsonSchema v = factory.getSchema(mapper.readTree(schema));
 
         Set<ValidationMessage> messages = v.validate(doc);
-        assertTrue("Validation should succeed as by default double values are used by mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed as by default double values are used by mapper");
 
         doc = bigDecimalMapper.readTree(content);
         messages = v.validate(doc);
-        assertFalse("Validation should not succeed because content is using bigDecimalMapper, and smaller than the minimum", messages.isEmpty());
+        assertFalse(messages.isEmpty(), "Validation should not succeed because content is using bigDecimalMapper, and smaller than the minimum");
 
         /*
          * Note: technically this is where -1.7976931348623158e+308 rounding to -1.7976931348623157e+308 could be
@@ -235,7 +235,7 @@ public class MinimumValidatorTest {
          */
         v = factory.getSchema(bigDecimalMapper.readTree(schema));
         messages = v.validate(doc);
-        assertFalse("Validation should not succeed because content is using bigDecimalMapper, and smaller than the minimum", messages.isEmpty());
+        assertFalse(messages.isEmpty(), "Validation should not succeed because content is using bigDecimalMapper, and smaller than the minimum");
     }
 
     /**
@@ -250,15 +250,15 @@ public class MinimumValidatorTest {
         JsonSchema v = factory.getSchema(mapper.readTree(schema));
 
         Set<ValidationMessage> messages = v.validate(doc);
-        assertTrue("Validation should succeed as by default double values are used by mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed as by default double values are used by mapper");
 
         doc = bigDecimalMapper.readTree(content);
         messages = v.validate(doc);
-        assertTrue("Validation should succeed due to the bug of BigDecimal option of mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed due to the bug of BigDecimal option of mapper");
 
         v = factory.getSchema(bigDecimalMapper.readTree(schema));
         messages = v.validate(doc);
-        assertTrue("Validation should succeed due to the bug of BigDecimal option of mapper", messages.isEmpty());
+        assertTrue(messages.isEmpty(), "Validation should succeed due to the bug of BigDecimal option of mapper");
     }
 
     private void expectSomeMessages(String[][] values, String number, ObjectMapper mapper, ObjectMapper mapper2) throws IOException {
@@ -271,7 +271,7 @@ public class MinimumValidatorTest {
             JsonNode doc = mapper2.readTree(value);
 
             Set<ValidationMessage> messages = v.validate(doc);
-            assertFalse(format(MinimumValidatorTest.NEGATIVE_MESSAGE_TEMPLATE, value, minimum), messages.isEmpty());
+            assertFalse(messages.isEmpty(), format(MinimumValidatorTest.NEGATIVE_MESSAGE_TEMPLATE, value, minimum));
         }
     }
 
@@ -291,7 +291,7 @@ public class MinimumValidatorTest {
             JsonNode doc = bigIntegerMapper.readTree(value);
 
             Set<ValidationMessage> messages = v.validate(doc);
-            assertTrue(format(MinimumValidatorTest.POSITIVT_MESSAGE_TEMPLATE, value, minimum), messages.isEmpty());
+            assertTrue(messages.isEmpty(), format(MinimumValidatorTest.POSITIVT_MESSAGE_TEMPLATE, value, minimum));
         }
     }
 }
diff --git a/src/test/java/com/networknt/schema/OpenAPI30JsonSchemaTest.java b/src/test/java/com/networknt/schema/OpenAPI30JsonSchemaTest.java
index 7525b4e..f5896d0 100644
--- a/src/test/java/com/networknt/schema/OpenAPI30JsonSchemaTest.java
+++ b/src/test/java/com/networknt/schema/OpenAPI30JsonSchemaTest.java
@@ -11,13 +11,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class OpenAPI30JsonSchemaTest {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -28,7 +28,7 @@ public class OpenAPI30JsonSchemaTest {
     public OpenAPI30JsonSchemaTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -40,7 +40,7 @@ public class OpenAPI30JsonSchemaTest {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -103,7 +103,7 @@ public class OpenAPI30JsonSchemaTest {
                                 for (ValidationMessage error : errors) {
                                     System.out.println(error);
                                 }
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertFalse(errors.isEmpty());
diff --git a/src/test/java/com/networknt/schema/OverrideValidatorTest.java b/src/test/java/com/networknt/schema/OverrideValidatorTest.java
index d128040..c45de94 100644
--- a/src/test/java/com/networknt/schema/OverrideValidatorTest.java
+++ b/src/test/java/com/networknt/schema/OverrideValidatorTest.java
@@ -19,7 +19,7 @@ package com.networknt.schema;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class OverrideValidatorTest {
 
diff --git a/src/test/java/com/networknt/schema/PatternPropertiesValidatorTest.java b/src/test/java/com/networknt/schema/PatternPropertiesValidatorTest.java
index 8f061bc..488d3b1 100644
--- a/src/test/java/com/networknt/schema/PatternPropertiesValidatorTest.java
+++ b/src/test/java/com/networknt/schema/PatternPropertiesValidatorTest.java
@@ -17,8 +17,8 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
@@ -27,25 +27,29 @@ import java.util.Set;
  */
 public class PatternPropertiesValidatorTest extends BaseJsonSchemaValidatorTest {
 
-    @Test(expected = JsonSchemaException.class)
+    @Test
     public void testInvalidPatternPropertiesValidator() throws Exception {
-        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
-        JsonSchema schema = factory.getSchema("{\"patternProperties\":6}");
-
-        JsonNode node = getJsonNodeFromStringContent("");
-        Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(errors.size(), 0);
+        Assertions.assertThrows(JsonSchemaException.class, () -> {
+            JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
+            JsonSchema schema = factory.getSchema("{\"patternProperties\":6}");
+
+            JsonNode node = getJsonNodeFromStringContent("");
+            Set<ValidationMessage> errors = schema.validate(node);
+            Assertions.assertEquals(errors.size(), 0);
+        });
     }
 
-    @Test(expected = JsonSchemaException.class)
+    @Test
     public void testInvalidPatternPropertiesValidatorECMA262() throws Exception {
-        SchemaValidatorsConfig config = new SchemaValidatorsConfig();
-        config.setEcma262Validator(true);
-        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
-        JsonSchema schema = factory.getSchema("{\"patternProperties\":6}", config);
-
-        JsonNode node = getJsonNodeFromStringContent("");
-        Set<ValidationMessage> errors = schema.validate(node);
-        Assert.assertEquals(errors.size(), 0);
+        Assertions.assertThrows(JsonSchemaException.class, () -> {
+            SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+            config.setEcma262Validator(true);
+            JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
+            JsonSchema schema = factory.getSchema("{\"patternProperties\":6}", config);
+
+            JsonNode node = getJsonNodeFromStringContent("");
+            Set<ValidationMessage> errors = schema.validate(node);
+            Assertions.assertEquals(errors.size(), 0);
+        });
     }
 }
diff --git a/src/test/java/com/networknt/schema/SelfRefTest.java b/src/test/java/com/networknt/schema/SelfRefTest.java
index b116555..feb60e6 100644
--- a/src/test/java/com/networknt/schema/SelfRefTest.java
+++ b/src/test/java/com/networknt/schema/SelfRefTest.java
@@ -16,14 +16,14 @@
 
 package com.networknt.schema;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Created by stevehu on 2016-12-20.
  */
 public class SelfRefTest extends BaseJsonSchemaValidatorTest {
-    @Ignore("This test currently is failing because of a StackOverflow caused by a recursive $ref.")
+    @Disabled("This test currently is failing because of a StackOverflow caused by a recursive $ref.")
     @Test()
     public void testSelfRef() throws Exception {
         JsonSchema node = getJsonSchemaFromClasspath("selfRef.json");
diff --git a/src/test/java/com/networknt/schema/SpecVersionDetectorTest.java b/src/test/java/com/networknt/schema/SpecVersionDetectorTest.java
index 7f326ef..f49da3a 100644
--- a/src/test/java/com/networknt/schema/SpecVersionDetectorTest.java
+++ b/src/test/java/com/networknt/schema/SpecVersionDetectorTest.java
@@ -2,12 +2,13 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SpecVersionDetectorTest {
 
@@ -51,20 +52,24 @@ public class SpecVersionDetectorTest {
         assertEquals(SpecVersion.VersionFlag.V201909, flag);
     }
 
-    @Test(expected = JsonSchemaException.class)
+    @Test
     public void detectUnsupportedSchemaVersion() throws IOException {
-        InputStream in = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream("data/" + SCHEMA_TAG_JSON);
-        JsonNode node = mapper.readTree(in);
-        SpecVersion.VersionFlag flag = SpecVersionDetector.detect(node);
+        assertThrows(JsonSchemaException.class, () -> {
+            InputStream in = Thread.currentThread().getContextClassLoader()
+                    .getResourceAsStream("data/" + SCHEMA_TAG_JSON);
+            JsonNode node = mapper.readTree(in);
+            SpecVersion.VersionFlag flag = SpecVersionDetector.detect(node);
+        });
     }
 
-    @Test(expected = JsonSchemaException.class)
+    @Test
     public void detectMissingSchemaVersion() throws IOException {
-        InputStream in = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream("data/" + "schemaTagMissing.json");
-        JsonNode node = mapper.readTree(in);
-        SpecVersion.VersionFlag flag = SpecVersionDetector.detect(node);
+        assertThrows(JsonSchemaException.class, () -> {
+            InputStream in = Thread.currentThread().getContextClassLoader()
+                    .getResourceAsStream("data/" + "schemaTagMissing.json");
+            JsonNode node = mapper.readTree(in);
+            SpecVersion.VersionFlag flag = SpecVersionDetector.detect(node);
+        });
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/networknt/schema/SpecVersionTest.java b/src/test/java/com/networknt/schema/SpecVersionTest.java
index e597a95..05dad77 100644
--- a/src/test/java/com/networknt/schema/SpecVersionTest.java
+++ b/src/test/java/com/networknt/schema/SpecVersionTest.java
@@ -15,8 +15,8 @@
  */
 package com.networknt.schema;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.EnumSet;
 import java.util.Set;
@@ -28,7 +28,7 @@ public class SpecVersionTest {
         Set versionFlags = EnumSet.of(
                 SpecVersion.VersionFlag.V4,
                 SpecVersion.VersionFlag.V201909);
-        Assert.assertEquals(ds.getVersionValue(versionFlags), 9); // 0001|1000
+        Assertions.assertEquals(ds.getVersionValue(versionFlags), 9); // 0001|1000
     }
 
     @Test
@@ -55,7 +55,7 @@ public class SpecVersionTest {
                         | SpecVersion.VersionFlag.V4.getVersionFlagValue()
                         | SpecVersion.VersionFlag.V6.getVersionFlagValue()
                         | SpecVersion.VersionFlag.V7.getVersionFlagValue();  // 15
-        Assert.assertEquals(numericVersionCode, 15);
+        Assertions.assertEquals(numericVersionCode, 15);
 
     }
 }
diff --git a/src/test/java/com/networknt/schema/ThresholdMixinPerfTest.java b/src/test/java/com/networknt/schema/ThresholdMixinPerfTest.java
index 2f7bafe..554e409 100644
--- a/src/test/java/com/networknt/schema/ThresholdMixinPerfTest.java
+++ b/src/test/java/com/networknt/schema/ThresholdMixinPerfTest.java
@@ -17,9 +17,9 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.*;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -27,7 +27,7 @@ import java.math.BigInteger;
 import static java.lang.String.format;
 import static java.lang.System.out;
 
-@Ignore
+@Disabled
 public class ThresholdMixinPerfTest {
     private static long thresholdIntegral = Long.MAX_VALUE - 1;
 
@@ -57,7 +57,7 @@ public class ThresholdMixinPerfTest {
     double baseTimeForDouble;
     private double baseTimeForLong;
 
-    @Before
+    @BeforeEach
     public void baseTimeEstimate() {
         baseTimeForDouble = getAvgTimeViaMixin(asDouble, valueDouble, executeTimes);
         out.println(format("Base execution time (comparing two DoubleNodes) %f ns", baseTimeForDouble));
diff --git a/src/test/java/com/networknt/schema/TypeFactoryTest.java b/src/test/java/com/networknt/schema/TypeFactoryTest.java
index d20a2cf..b144527 100755
--- a/src/test/java/com/networknt/schema/TypeFactoryTest.java
+++ b/src/test/java/com/networknt/schema/TypeFactoryTest.java
@@ -17,12 +17,12 @@
 package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.node.DecimalNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
 import static com.networknt.schema.TypeFactory.getValueNodeType;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class TypeFactoryTest {
 
@@ -37,8 +37,9 @@ public class TypeFactoryTest {
     public void testValidIntegralValuesWithJavaSemantics() {
         schemaValidatorsConfig.setJavaSemantics(true);
         for (String validValue : validIntegralValues) {
-            assertSame(validValue, JsonType.INTEGER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig));
+            assertSame(JsonType.INTEGER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig),
+                    validValue);
         }
     }
 
@@ -46,8 +47,9 @@ public class TypeFactoryTest {
     public void testValidIntegralValuesWithoutJavaSemantics() {
         schemaValidatorsConfig.setJavaSemantics(false);
         for (String validValue : validIntegralValues) {
-            assertSame(validValue, JsonType.NUMBER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig));
+            assertSame(JsonType.NUMBER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal(validValue)), schemaValidatorsConfig),
+                    validValue);
         }
     }
 
@@ -56,11 +58,13 @@ public class TypeFactoryTest {
     public void testWithLosslessNarrowing() {
         schemaValidatorsConfig.setLosslessNarrowing(true);
         for (String validValue : validIntegralValues) {
-            assertSame(validValue, JsonType.INTEGER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.0")), schemaValidatorsConfig));
+            assertSame(JsonType.INTEGER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.0")), schemaValidatorsConfig),
+                    validValue);
 
-            assertSame(validValue, JsonType.NUMBER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.5")), schemaValidatorsConfig));
+            assertSame(JsonType.NUMBER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.5")), schemaValidatorsConfig),
+                    validValue);
         }
     }
 
@@ -68,11 +72,13 @@ public class TypeFactoryTest {
     public void testWithoutLosslessNarrowing() {
         schemaValidatorsConfig.setLosslessNarrowing(false);
         for (String validValue : validIntegralValues) {
-            assertSame(validValue, JsonType.NUMBER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.0")), schemaValidatorsConfig));
+            assertSame(JsonType.NUMBER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.0")), schemaValidatorsConfig),
+                    validValue);
 
-            assertSame(validValue, JsonType.NUMBER,
-                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.5")), schemaValidatorsConfig));
+            assertSame(JsonType.NUMBER,
+                    getValueNodeType(DecimalNode.valueOf(new BigDecimal("1.5")), schemaValidatorsConfig),
+                    validValue);
         }
 
     }
diff --git a/src/test/java/com/networknt/schema/TypeValidatorTest.java b/src/test/java/com/networknt/schema/TypeValidatorTest.java
index 234fa9a..962ca13 100755
--- a/src/test/java/com/networknt/schema/TypeValidatorTest.java
+++ b/src/test/java/com/networknt/schema/TypeValidatorTest.java
@@ -16,11 +16,11 @@
 
 package com.networknt.schema;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.networknt.schema.TypeValidator.isNumeric;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TypeValidatorTest {
 
@@ -39,14 +39,14 @@ public class TypeValidatorTest {
     @Test
     public void testNumeicValues() {
         for (String validValue : validNumericValues) {
-            assertTrue(validValue, isNumeric(validValue));
+            assertTrue(isNumeric(validValue), validValue);
         }
     }
 
     @Test
     public void testNonNumeicValues() {
         for (String invalidValue : invalidNumericValues) {
-            assertFalse(invalidValue, isNumeric(invalidValue));
+            assertFalse(isNumeric(invalidValue), invalidValue);
         }
     }
 }
diff --git a/src/test/java/com/networknt/schema/UnknownMetaSchemaTest.java b/src/test/java/com/networknt/schema/UnknownMetaSchemaTest.java
index e766602..7cbcf5e 100644
--- a/src/test/java/com/networknt/schema/UnknownMetaSchemaTest.java
+++ b/src/test/java/com/networknt/schema/UnknownMetaSchemaTest.java
@@ -2,8 +2,8 @@ package com.networknt.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Set;
@@ -64,10 +64,10 @@ public class UnknownMetaSchemaTest {
         String uri03 = "http://json-schema.org/draft-07/schema?key=value";
         String uri04 = "http://json-schema.org/draft-07/schema?key=value&key2=value2";
         String expected = "https://json-schema.org/draft-07/schema";
-        Assert.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri01, true));
-        Assert.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri02, true));
-        Assert.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri03, true));
-        Assert.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri04, true));
+        Assertions.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri01, true));
+        Assertions.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri02, true));
+        Assertions.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri03, true));
+        Assertions.assertEquals(expected, JsonSchemaFactory.normalizeMetaSchemaUri(uri04, true));
 
     }
 }
diff --git a/src/test/java/com/networknt/schema/UriMappingTest.java b/src/test/java/com/networknt/schema/UriMappingTest.java
index 703f36d..449538f 100644
--- a/src/test/java/com/networknt/schema/UriMappingTest.java
+++ b/src/test/java/com/networknt/schema/UriMappingTest.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.JsonSchemaFactory.Builder;
 import com.networknt.schema.uri.ClasspathURLFactory;
 import com.networknt.schema.uri.URLFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -31,8 +31,8 @@ import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class UriMappingTest {
 
diff --git a/src/test/java/com/networknt/schema/UrnTest.java b/src/test/java/com/networknt/schema/UrnTest.java
index 6ef3aa5..d28ec56 100644
--- a/src/test/java/com/networknt/schema/UrnTest.java
+++ b/src/test/java/com/networknt/schema/UrnTest.java
@@ -4,14 +4,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.uri.ClasspathURLFactory;
 import com.networknt.schema.uri.URLFactory;
 import com.networknt.schema.urn.URNFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class UrnTest
 {
diff --git a/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java b/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java
index 170b818..8d093a4 100644
--- a/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java
+++ b/src/test/java/com/networknt/schema/V201909JsonSchemaTest.java
@@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class V201909JsonSchemaTest {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -42,7 +42,7 @@ public class V201909JsonSchemaTest {
     public V201909JsonSchemaTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -54,7 +54,7 @@ public class V201909JsonSchemaTest {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -109,7 +109,7 @@ public class V201909JsonSchemaTest {
                                 System.out.println("schema: " + schema);
                                 System.out.println("data: " + test.get("data"));
                                 System.out.println("errors: " + errors);
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertEquals(false, errors.isEmpty());
@@ -127,19 +127,19 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalContentValidator() throws Exception {
         runTestFile("draft2019-09/optional/content.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testEcmascriptRegexValidator() throws Exception {
         runTestFile("draft2019-09/optional/ecmascript-regex.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testZeroTerminatedFloatsValidator() throws Exception {
         runTestFile("draft2019-09/optional/zeroTerminatedFloats.json");
     }
@@ -165,13 +165,13 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIdnEmailValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/idn-email.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIdnHostnameValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/idn-hostname.json");
     }
@@ -187,55 +187,55 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIriValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/iri.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIriReferenceValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/iri-reference.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatJsonPointerValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/json-pointer.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatRegexValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/regex.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatRelativeJsonPointerValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/relative-json-pointer.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatTimeValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/time.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/uri.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriReferenceValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/uri-reference.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriTemplateValidator() throws Exception {
         runTestFile("draft2019-09/optional/format/uri-template.json");
     }
@@ -256,7 +256,7 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testAnchorValidator() throws Exception {
         runTestFile("draft2019-09/anchor.json");
     }
@@ -287,7 +287,7 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testDefsValidator() throws Exception {
         runTestFile("draft2019-09/defs.json");
     }
@@ -403,7 +403,7 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefValidator() throws Exception {
         runTestFile("draft2019-09/ref.json");
     }
@@ -414,7 +414,7 @@ public class V201909JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefRemoteValidator_Ignored() throws Exception {
         runTestFile("draft2019-09/refRemote_ignored.json");
     }
diff --git a/src/test/java/com/networknt/schema/V4JsonSchemaTest.java b/src/test/java/com/networknt/schema/V4JsonSchemaTest.java
index fb08273..e97187d 100644
--- a/src/test/java/com/networknt/schema/V4JsonSchemaTest.java
+++ b/src/test/java/com/networknt/schema/V4JsonSchemaTest.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.Set;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class V4JsonSchemaTest {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -45,7 +45,7 @@ public class V4JsonSchemaTest {
     public V4JsonSchemaTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -57,7 +57,7 @@ public class V4JsonSchemaTest {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -112,7 +112,7 @@ public class V4JsonSchemaTest {
                                 System.out.println("schema: " + schema);
                                 System.out.println("data: " + test.get("data"));
                                 System.out.println("errors: " + errors);
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertEquals(false, errors.isEmpty());
diff --git a/src/test/java/com/networknt/schema/V6JsonSchemaTest.java b/src/test/java/com/networknt/schema/V6JsonSchemaTest.java
index 4a28bd5..dfb3411 100644
--- a/src/test/java/com/networknt/schema/V6JsonSchemaTest.java
+++ b/src/test/java/com/networknt/schema/V6JsonSchemaTest.java
@@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class V6JsonSchemaTest {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -42,7 +42,7 @@ public class V6JsonSchemaTest {
     public V6JsonSchemaTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -54,7 +54,7 @@ public class V6JsonSchemaTest {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -109,7 +109,7 @@ public class V6JsonSchemaTest {
                                 System.out.println("schema: " + schema);
                                 System.out.println("data: " + test.get("data"));
                                 System.out.println("errors: " + errors);
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertEquals(false, errors.isEmpty());
@@ -127,19 +127,19 @@ public class V6JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testEcmascriptRegexValidator() throws Exception {
         runTestFile("draft6/optional/ecmascript-regex.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testZeroTerminatedFloatsValidator() throws Exception {
         runTestFile("draft6/optional/zeroTerminatedFloats.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatValidator() throws Exception {
         runTestFile("draft6/optional/format.json");
     }
@@ -295,7 +295,7 @@ public class V6JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefValidator() throws Exception {
         runTestFile("draft6/ref.json");
     }
@@ -311,7 +311,7 @@ public class V6JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefRemoteValidator_Ignored() throws Exception {
         runTestFile("draft6/refRemote_ignored.json");
     }
diff --git a/src/test/java/com/networknt/schema/V7JsonSchemaTest.java b/src/test/java/com/networknt/schema/V7JsonSchemaTest.java
index 74495d7..3885f58 100644
--- a/src/test/java/com/networknt/schema/V7JsonSchemaTest.java
+++ b/src/test/java/com/networknt/schema/V7JsonSchemaTest.java
@@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import io.undertow.Undertow;
 import io.undertow.server.handlers.resource.FileResourceManager;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static io.undertow.Handlers.resource;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class V7JsonSchemaTest {
     protected ObjectMapper mapper = new ObjectMapper();
@@ -42,7 +42,7 @@ public class V7JsonSchemaTest {
     public V7JsonSchemaTest() {
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         if (server == null) {
             server = Undertow.builder()
@@ -54,7 +54,7 @@ public class V7JsonSchemaTest {
         }
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() throws Exception {
         if (server != null) {
             try {
@@ -109,7 +109,7 @@ public class V7JsonSchemaTest {
                                 System.out.println("schema: " + schema);
                                 System.out.println("data: " + test.get("data"));
                                 System.out.println("errors: " + errors);
-                                assertEquals("expected error count", errorCount.asInt(), errors.size());
+                                assertEquals(errorCount.asInt(), errors.size(), "expected error count");
                             }
                         }
                         assertEquals(false, errors.isEmpty());
@@ -127,19 +127,19 @@ public class V7JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalContentValidator() throws Exception {
         runTestFile("draft7/optional/content.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testEcmascriptRegexValidator() throws Exception {
         runTestFile("draft7/optional/ecmascript-regex.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testZeroTerminatedFloatsValidator() throws Exception {
         runTestFile("draft7/optional/zeroTerminatedFloats.json");
     }
@@ -165,13 +165,13 @@ public class V7JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIdnEmailValidator() throws Exception {
         runTestFile("draft7/optional/format/idn-email.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIdnHostnameValidator() throws Exception {
         runTestFile("draft7/optional/format/idn-hostname.json");
     }
@@ -187,55 +187,55 @@ public class V7JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIriValidator() throws Exception {
         runTestFile("draft7/optional/format/iri.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatIriReferenceValidator() throws Exception {
         runTestFile("draft7/optional/format/iri-reference.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatJsonPointerValidator() throws Exception {
         runTestFile("draft7/optional/format/json-pointer.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatRegexValidator() throws Exception {
         runTestFile("draft7/optional/format/regex.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatRelativeJsonPointerValidator() throws Exception {
         runTestFile("draft7/optional/format/relative-json-pointer.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatTimeValidator() throws Exception {
         runTestFile("draft7/optional/format/time.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriValidator() throws Exception {
         runTestFile("draft7/optional/format/uri.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriReferenceValidator() throws Exception {
         runTestFile("draft7/optional/format/uri-reference.json");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testOptionalFormatUriTemplateValidator() throws Exception {
         runTestFile("draft7/optional/format/uri-template.json");
     }
@@ -396,7 +396,7 @@ public class V7JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefValidator() throws Exception {
         runTestFile("draft7/ref.json");
     }
@@ -412,7 +412,7 @@ public class V7JsonSchemaTest {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testRefRemoteValidator_Ignored() throws Exception {
         runTestFile("draft7/refRemote_ignored.json");
     }
diff --git a/src/test/java/com/networknt/schema/ValidatorTypeCodeTest.java b/src/test/java/com/networknt/schema/ValidatorTypeCodeTest.java
index cc02960..8615297 100644
--- a/src/test/java/com/networknt/schema/ValidatorTypeCodeTest.java
+++ b/src/test/java/com/networknt/schema/ValidatorTypeCodeTest.java
@@ -16,12 +16,12 @@
 
 package com.networknt.schema;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ValidatorTypeCodeTest {
 
@@ -37,21 +37,21 @@ public class ValidatorTypeCodeTest {
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testFromValueMissing() {
-        assertEquals(ValidatorTypeCode.ADDITIONAL_PROPERTIES, ValidatorTypeCode.fromValue("missing"));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> assertEquals(ValidatorTypeCode.ADDITIONAL_PROPERTIES, ValidatorTypeCode.fromValue("missing")));
     }
 
     @Test
     public void testIfThenElseNotInV4() {
         List<ValidatorTypeCode> list = ValidatorTypeCode.getNonFormatKeywords(SpecVersion.VersionFlag.V4);
-        Assert.assertFalse(list.contains(ValidatorTypeCode.fromValue("if")));
+        Assertions.assertFalse(list.contains(ValidatorTypeCode.fromValue("if")));
     }
 
     @Test
     public void testExclusiveMaximumNotInV4() {
         List<ValidatorTypeCode> list = ValidatorTypeCode.getNonFormatKeywords(SpecVersion.VersionFlag.V4);
-        Assert.assertFalse(list.contains(ValidatorTypeCode.fromValue("exclusiveMaximum")));
+        Assertions.assertFalse(list.contains(ValidatorTypeCode.fromValue("exclusiveMaximum")));
     }