fixing #78 (test added)

Author: erosb

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

@@ -201,7 +201,7 @@ private Optional<ValidationException> testItemCount(final JSONArray subject) {
                     + ", found: " + actualLength, "minItems"));
         }
         if (maxItems != null && maxItems < actualLength) {
-            return Optional.of(new ValidationException(this, "expected maximum item count: " + minItems
+            return Optional.of(new ValidationException(this, "expected maximum item count: " + maxItems
                     + ", found: " + actualLength, "maxItems"));
         }
         return Optional.empty();

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

@@ -73,6 +73,7 @@ public void maxItems() {
                 .subject(subject)
                 .expectedPointer("#")
                 .expectedKeyword("maxItems")
+                .expectedMessageFragment("expected maximum item count: 0, found: 1")
                 .input(ARRAYS.get("onlyOneItem"))
                 .expect();
     }

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

@@ -19,6 +19,10 @@
 
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 public class TestSupport {
 
     public static class Failure {
@@ -33,6 +37,8 @@ public static class Failure {
 
         private Object input;
 
+        private String expectedMessageFragment;
+
         public Failure subject(final Schema subject) {
             this.subject = subject;
             return this;
@@ -72,6 +78,10 @@ public String expectedKeyword() {
             return expectedKeyword;
         }
 
+        public String expectedMessageFragment() {
+            return expectedMessageFragment;
+        }
+
         public Failure input(final Object input) {
             this.input = input;
             return this;
@@ -84,6 +94,11 @@ public Object input() {
         public void expect() {
             expectFailure(this);
         }
+
+        public Failure expectedMessageFragment(String expectedFragment) {
+            this.expectedMessageFragment = expectedFragment;
+            return this;
+        }
     }
 
     public static Failure failureOf(final Schema subject) {
@@ -138,9 +153,12 @@ public static void expectFailure(final Failure failure) {
             Assert.fail(failure.subject() + " did not fail for " + failure.input());
         } catch (ValidationException e) {
             Assert.assertSame(failure.expectedViolatedSchema(), e.getViolatedSchema());
-            Assert.assertEquals(failure.expectedPointer(), e.getPointerToViolation());
+            assertEquals(failure.expectedPointer(), e.getPointerToViolation());
             if (failure.expectedKeyword() != null) {
-                Assert.assertEquals(failure.expectedKeyword(), e.getKeyword());
+                assertEquals(failure.expectedKeyword(), e.getKeyword());
+            }
+            if (failure.expectedMessageFragment() != null) {
+                assertThat(e.getMessage(), containsString(failure.expectedMessageFragment()));
             }
         }
     }
@@ -152,7 +170,7 @@ private static void test(final Schema failingSchema, final String expectedPointe
             Assert.fail(failingSchema + " did not fail for " + input);
         } catch (ValidationException e) {
             if (expectedPointer != null) {
-                Assert.assertEquals(expectedPointer, e.getPointerToViolation());
+                assertEquals(expectedPointer, e.getPointerToViolation());
             }
             throw e;
         }

tests/src/test/resources/org/everit/json/schema/issues/78/expectedException.json

@@ -1,3 +1,3 @@
 {
-    "message" : "#: expected maximum item count: 1, found 2"
+    "message" : "#: expected maximum item count: 1, found: 2"
 }