added test for ObjectSchema immutability, also changed multipleSchemaDepViolation() test not to rely on HashMap iteration order

Author: erosb

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

@@ -195,10 +195,14 @@ public ObjectSchema(final Builder builder) {
         builder.requiredProperties));
     this.minProperties = builder.minProperties;
     this.maxProperties = builder.maxProperties;
-    this.propertyDependencies = Collections.unmodifiableMap(builder.propertyDependencies);
-    this.schemaDependencies = Collections.unmodifiableMap(builder.schemaDependencies);
+    this.propertyDependencies = copyMap(builder.propertyDependencies);
+    this.schemaDependencies = copyMap(builder.schemaDependencies);
     this.requiresObject = builder.requiresObject;
-    this.patternProperties = Collections.unmodifiableMap(builder.patternProperties);
+    this.patternProperties = copyMap(builder.patternProperties);
+  }
+
+  private final <K, V> Map<K, V> copyMap(final Map<K, V> original) {
+    return Collections.unmodifiableMap(new HashMap<>(original));
   }
 
   private Stream<String> getAdditionalProperties(final JSONObject subject) {

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

@@ -80,15 +80,22 @@ public void multipleSchemaDepViolation() {
       subject.validate(OBJECTS.get("schemaDepViolation"));
       Assert.fail("did not throw ValidationException");
     } catch (ValidationException e) {
-      ValidationException billingAddressFailure = e.getCausingExceptions().get(0)
-          .getCausingExceptions().get(0);
+      ValidationException creditCardFailure = e.getCausingExceptions().get(0);
+      ValidationException ageFailure = e.getCausingExceptions().get(1);
+      // due to schemaDeps being stored in (unsorted) HashMap, the exceptions may need to be swapped
+      if (creditCardFailure.getCausingExceptions().size() == 0) {
+        ValidationException tmp = creditCardFailure;
+        creditCardFailure = ageFailure;
+        ageFailure = tmp;
+      }
+      ValidationException billingAddressFailure = creditCardFailure.getCausingExceptions().get(0);
       Assert.assertEquals("#/billing_address", billingAddressFailure.getPointerToViolation());
       Assert.assertEquals(billingAddressSchema, billingAddressFailure.getViolatedSchema());
-      ValidationException billingNameFailure = e.getCausingExceptions().get(0)
+      ValidationException billingNameFailure = creditCardFailure
           .getCausingExceptions().get(1);
       Assert.assertEquals("#/billing_name", billingNameFailure.getPointerToViolation());
       Assert.assertEquals(billingNameSchema, billingNameFailure.getViolatedSchema());
-      ValidationException ageFailure = e.getCausingExceptions().get(1);
+
       Assert.assertEquals("#", ageFailure.getPointerToViolation());
       Assert.assertEquals("required key [age] not found", ageFailure.getMessage());
     }
@@ -216,6 +223,21 @@ public void schemaForNoAdditionalProperties() {
         .schemaOfAdditionalProperties(BooleanSchema.INSTANCE).build();
   }
 
+  @Test
+  public void testImmutability() {
+    ObjectSchema.Builder builder = ObjectSchema.builder();
+    builder.propertyDependency("a", "b");
+    builder.schemaDependency("a", BooleanSchema.INSTANCE);
+    builder.patternProperty("aaa", BooleanSchema.INSTANCE);
+    ObjectSchema schema = builder.build();
+    builder.propertyDependency("c", "a");
+    builder.schemaDependency("b", BooleanSchema.INSTANCE);
+    builder.patternProperty("bbb", BooleanSchema.INSTANCE);
+    Assert.assertEquals(1, schema.getPropertyDependencies().size());
+    Assert.assertEquals(1, schema.getSchemaDependencies().size());
+    Assert.assertEquals(1, schema.getPatternProperties().size());
+  }
+
   @Test
   public void typeFailure() {
     TestSupport.expectFailure(ObjectSchema.builder().build(), "#", "a");