migrated StringSchema to new ViolationException constructor

Author: erosb

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

@@ -111,18 +111,18 @@ public Pattern getPattern() {
   private void testLength(final String subject) {
     int actualLength = subject.length();
     if (minLength != null && actualLength < minLength.intValue()) {
-      throw new ValidationException("expected minLength: " + minLength + ", actual: "
+      throw new ValidationException(this, "expected minLength: " + minLength + ", actual: "
           + actualLength);
     }
     if (maxLength != null && actualLength > maxLength.intValue()) {
-      throw new ValidationException("expected maxLength: " + maxLength + ", actual: "
+      throw new ValidationException(this, "expected maxLength: " + maxLength + ", actual: "
           + actualLength);
     }
   }
 
   private void testPattern(final String subject) {
     if (pattern != null && !pattern.matcher(subject).find()) {
-      throw new ValidationException(String.format("string [%s] does not match pattern %s",
+      throw new ValidationException(this, String.format("string [%s] does not match pattern %s",
           subject, pattern.pattern()));
     }
   }
@@ -131,7 +131,7 @@ private void testPattern(final String subject) {
   public void validate(final Object subject) {
     if (!(subject instanceof String)) {
       if (requiresString) {
-        throw new ValidationException(String.class, subject);
+        throw new ValidationException(this, String.class, subject);
       }
     } else {
       String stringSubject = (String) subject;

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

@@ -15,44 +15,45 @@
  */
 package org.everit.json.schema;
 
-import org.everit.json.schema.StringSchema;
-import org.everit.json.schema.ValidationException;
 import org.junit.Test;
 
 public class StringSchemaTest {
 
-  @Test(expected = ValidationException.class)
+  @Test
   public void maxLength() {
-    StringSchema.builder().maxLength(3).build().validate("foobar");
+    StringSchema subject = StringSchema.builder().maxLength(3).build();
+    TestSupport.exceptFailure(subject, "foobar");
   }
 
-  @Test(expected = ValidationException.class)
+  @Test
   public void minLength() {
-    StringSchema.builder().minLength(2).build().validate("a");
+    StringSchema subject = StringSchema.builder().minLength(2).build();
+    TestSupport.exceptFailure(subject, "a");
   }
 
   @Test
-  public void success() {
-    StringSchema.builder().build().validate("foo");
+  public void notRequiresString() {
+    StringSchema.builder().requiresString(false).build().validate(2);
   }
 
-  @Test(expected = ValidationException.class)
-  public void typeFailure() {
-    StringSchema.builder().build().validate(null);
+  @Test
+  public void patternFailure() {
+    StringSchema subject = StringSchema.builder().pattern("^a*$").build();
+    TestSupport.exceptFailure(subject, "abc");
   }
 
   @Test
   public void patternSuccess() {
     StringSchema.builder().pattern("^a*$").build().validate("aaaa");
   }
 
-  @Test(expected = ValidationException.class)
-  public void patternFailure() {
-    StringSchema.builder().pattern("^a*$").build().validate("abc");
+  @Test
+  public void success() {
+    StringSchema.builder().build().validate("foo");
   }
 
   @Test
-  public void notRequiresString() {
-    StringSchema.builder().requiresString(false).build().validate(2);
+  public void typeFailure() {
+    TestSupport.exceptFailure(StringSchema.builder().build(), null);
   }
 }