Minor refactoring of tests, to troubleshoot regression caused by databind (for 2.6.0-snapshot)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/module/jsonSchema/types/ContainerTypeSchema.java

@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.module.jsonSchema.types;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

src/test/java/com/fasterxml/jackson/module/jsonSchema/EnumGenerationTest.java

@@ -52,7 +52,12 @@ public void testEnumWithToString() throws Exception
         Map<String, Object> result = (Map<String, Object>) mapper.convertValue(jsonSchema,  Map.class);
         assertNotNull(result);
         assertTrue(jsonSchema.isObjectSchema());
-        assertEquals(expectedAsMap(true), result);
+        Map<String,Object> exp = expectedAsMap(true);
+        if (!exp.equals(result)) {
+            String expJson = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(exp);
+            String actJson = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(result);
+            fail("Different JSON: expected:\n"+expJson+"\ngot:\n"+actJson);
+        }
     }
 
     @SuppressWarnings("serial")

src/test/java/com/fasterxml/jackson/module/jsonSchema/TestReadJsonSchema.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper;
 import com.fasterxml.jackson.module.jsonSchema.types.ArraySchema;
 import com.fasterxml.jackson.module.jsonSchema.types.ObjectSchema;
-import junit.framework.Assert;
 
 /**
  * Trivial test to ensure {@link JsonSchema} can be also deserialized