Clean up test code

Author: jkosternl

src/test/java/com/networknt/schema/CollectorContextTest.java

@@ -105,7 +105,7 @@ public void testCollectorContextWithMultipleThreads() throws Exception {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void testCollectorGetAll() throws JsonMappingException, JsonProcessingException, IOException {
+    public void testCollectorGetAll() throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         ExecutionContext executionContext = jsonSchemaForCombine.createExecutionContext();
         executionContext.getExecutionConfig().setFormatAssertionsEnabled(true);
@@ -218,9 +218,9 @@ private String getSchemaStringMultipleProperties() {
 
     private class ValidationThread implements Runnable {
 
-        private String data;
+        private final String data;
 
-        private String name;
+        private final String name;
 
         private ValidationResult validationResult;
 
@@ -379,7 +379,7 @@ public Set<ValidationMessage> walk(ExecutionContext executionContext, JsonNode n
         }
     }
 
-    private ValidationResult validate(String jsonData) throws JsonMappingException, JsonProcessingException, Exception {
+    private ValidationResult validate(String jsonData) throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
         ExecutionContext executionContext = this.jsonSchema.createExecutionContext();
         Set<ValidationMessage> messages = this.jsonSchema.validate(executionContext, objectMapper.readTree(jsonData));

src/test/java/com/networknt/schema/Issue285Test.java

@@ -12,8 +12,8 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class Issue285Test {
-    private ObjectMapper mapper = new ObjectMapper();
-    private JsonSchemaFactory schemaFactory = JsonSchemaFactory
+    private final ObjectMapper mapper = new ObjectMapper();
+    private final JsonSchemaFactory schemaFactory = JsonSchemaFactory
 		.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909))
             .schemaMappers(schemaMappers -> schemaMappers
                     .mapPrefix("http://json-schema.org", "resource:")

src/test/java/com/networknt/schema/Issue366FailSlowTest.java

@@ -1,6 +1,7 @@
 package com.networknt.schema;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -78,7 +79,7 @@ public void bothValid() throws Exception {
         JsonNode testNode = testNodes.get(0).get(2);
         JsonNode dataNode = testNode.get("data");
         Set<ValidationMessage> errors = jsonSchema.validate(dataNode);
-        assertTrue(!errors.isEmpty());
+	    assertFalse(errors.isEmpty());
         assertEquals(errors.size(), 1);
     }
 
@@ -92,7 +93,7 @@ public void neitherValid() throws Exception {
         JsonNode testNode = testNodes.get(0).get(3);
         JsonNode dataNode = testNode.get("data");
         Set<ValidationMessage> errors = jsonSchema.validate(dataNode);
-        assertTrue(!errors.isEmpty());
+	    assertFalse(errors.isEmpty());
         assertEquals(errors.size(), 3);
     }
 

src/test/java/com/networknt/schema/Issue428Test.java

@@ -45,7 +45,7 @@ private void runTestFile(String testCaseFile) throws Exception {
                     if (test.get("valid").asBoolean()) {
                         if (!errors.isEmpty()) {
                             System.out.println("---- test case failed ----");
-                            System.out.println("schema: " + schema.toString());
+                            System.out.println("schema: " + schema);
                             System.out.println("data: " + test.get("data"));
                             System.out.println("errors:");
                             for (ValidationMessage error : errors) {

src/test/java/com/networknt/schema/Issue467Test.java

@@ -35,8 +35,8 @@
 import com.networknt.schema.walk.WalkFlow;
 
 public class Issue467Test {
-    private static JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
-    private static String schemaPath = "/schema/issue467.json";
+    private static final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
+    private static final String schemaPath = "/schema/issue467.json";
 
     protected ObjectMapper mapper = new ObjectMapper();
 

src/test/java/com/networknt/schema/Issue493Test.java

@@ -17,8 +17,8 @@
 class Issue493Test
 {
 
-    private static JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
-    private static String schemaPath1 = "/schema/issue493.json";
+    private static final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909);
+    private static final String schemaPath1 = "/schema/issue493.json";
 
     private JsonNode getJsonNodeFromJsonData (String jsonFilePath)
             throws Exception

src/test/java/com/networknt/schema/Issue575Test.java

@@ -16,7 +16,7 @@
  * This project uses a dependency (com.ethlo.time:itu) to validate time representations. Version 1.51 of this library
  * has a problem dealing with certain time zones having a negative offset; for example "-2:30" (Newfoundland time, NDT).
  * Moving to version 1.7.0 of this library resolves the issue.
- *
+ * <p>
  * This test class confirms that valid negative offsets do not result in a JSON validation error if the ITU library is
  * updated to version 1.7.0 or later.
  */

src/test/java/com/networknt/schema/Issue927Test.java

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.networknt.schema.SpecVersion.VersionFlag;
 import com.networknt.schema.serialization.JsonMapperFactory;
 
@@ -31,7 +30,7 @@
  */
 public class Issue927Test {
     @Test
-    void test() throws JsonMappingException, JsonProcessingException {
+    void test() throws JsonProcessingException {
         String schema = "{\r\n"
                 + "  \"$schema\": \"http://json-schema.org/draft-07/schema#\",\r\n"
                 + "  \"$id\": \"id\",\r\n"

src/test/java/com/networknt/schema/Issue994Test.java

@@ -21,14 +21,13 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.SpecVersion.VersionFlag;
 import com.networknt.schema.serialization.JsonMapperFactory;
 
 public class Issue994Test {
     @Test
-    void test() throws JsonMappingException, JsonProcessingException {
+    void test() throws JsonProcessingException {
         String schemaData = "{\r\n"
                 + "    \"$schema\": \"https://json-schema.org/draft/2020-12/schema\",\r\n"
                 + "    \"type\": \"object\",\r\n"

src/test/java/com/networknt/schema/ItemsValidatorTest.java

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.networknt.schema.SpecVersion.VersionFlag;
 import com.networknt.schema.serialization.JsonMapperFactory;
@@ -240,7 +239,7 @@ public void onWalkEnd(WalkEvent walkEvent, Set<ValidationMessage> validationMess
     }
 
     @Test
-    void walkTupleItemsAdditional() throws JsonMappingException, JsonProcessingException {
+    void walkTupleItemsAdditional() throws JsonProcessingException {
         String schemaData = "{\r\n"
                 + "  \"items\": [\r\n"
                 + "    {\r\n"
@@ -291,7 +290,7 @@ public void onWalkEnd(WalkEvent walkEvent, Set<ValidationMessage> validationMess
     }
 
     @Test
-    void walkTupleItemsAdditionalDefaults() throws JsonMappingException, JsonProcessingException {
+    void walkTupleItemsAdditionalDefaults() throws JsonProcessingException {
         String schemaData = "{\r\n"
                 + "  \"items\": [\r\n"
                 + "    {\r\n"