removing dead code and adding some tests to ObjectComparator

Author: erosb

core/src/main/java/org/everit/json/schema/StringSchema.java

@@ -1,11 +1,8 @@
 package org.everit.json.schema;
 
-import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 import static org.everit.json.schema.FormatValidator.NONE;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
@@ -121,53 +118,10 @@ public Pattern getPattern() {
         return pattern;
     }
 
-    private void testLength(final String subject, List<ValidationException> validationExceptions) {
-        int actualLength = subject.codePointCount(0, subject.length());
-        if (minLength != null && actualLength < minLength.intValue()) {
-            validationExceptions.add(
-                    failure("expected minLength: " + minLength + ", actual: "
-                            + actualLength, "minLength"));
-        }
-        if (maxLength != null && actualLength > maxLength.intValue()) {
-            validationExceptions.add(
-                    failure("expected maxLength: " + maxLength + ", actual: "
-                            + actualLength, "maxLength"));
-        }
-    }
-
-    private void testPattern(final String subject, List<ValidationException> validationExceptions) {
-        if (pattern != null && !pattern.matcher(subject).find()) {
-            String message = format("string [%s] does not match pattern %s",
-                    subject, pattern.pattern());
-            validationExceptions.addAll(Arrays.asList(failure(message, "pattern")));
-        }
-    }
-
     @Override void accept(Visitor visitor) {
         visitor.visitStringSchema(this);
     }
 
-    //    @Override
-    //    public void validate(final Object subject) {
-    //        if (!(subject instanceof String)) {
-    //            if (requiresString) {
-    //                throw failure(String.class, subject);
-    //            }
-    //        } else {
-    //            List<ValidationException> validationExceptions = new ArrayList<>();
-    //            String stringSubject = (String) subject;
-    //            testLength(stringSubject, validationExceptions);
-    //            testPattern(stringSubject, validationExceptions);
-    //            Optional<String> failure = formatValidator.validate(stringSubject);
-    //            if (failure.isPresent()) {
-    //                validationExceptions.add(failure(failure.get(), "format"));
-    //            }
-    //            if (null != validationExceptions) {
-    //                ValidationException.throwFor(this, validationExceptions);
-    //            }
-    //        }
-    //    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o)

core/src/test/java/org/everit/json/schema/ObjectComparatorTest.java

@@ -0,0 +1,39 @@
+package org.everit.json.schema;
+
+import static org.junit.Assert.assertFalse;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import junitparams.naming.TestCaseName;
+
+@RunWith(JUnitParamsRunner.class)
+public class ObjectComparatorTest {
+
+    public static final JSONArray EMPTY_ARRAY = new JSONArray();
+    public static final JSONObject EMPTY_OBJECT = new JSONObject();
+
+    private Object[][] failingCases() {
+        return new Object[][] {
+                { "array, null", EMPTY_ARRAY, null },
+                { "array, object", EMPTY_ARRAY, EMPTY_OBJECT },
+                { "object, null", EMPTY_OBJECT, null },
+                { "arrays with different length", EMPTY_ARRAY, new JSONArray("[null]") },
+                { "arrays with different elems", new JSONArray("[true, false]"), new JSONArray("[false, true]") },
+                { "objects with different length", EMPTY_OBJECT, new JSONObject("{\"a\":true}") }
+        };
+    }
+
+    @Test
+    @Parameters(method = "failingCases")
+    @TestCaseName("{0} (false)")
+    public void array_Null_failure(String testcaseName, Object arg1, Object arg2) {
+        assertFalse(ObjectComparator.deepEquals(arg1, arg2));
+        assertFalse(ObjectComparator.deepEquals(arg2, arg1));
+    }
+
+}