Tweak non-extensible diagnostic, avoid confusion with strict array ordering

hertzsprung · hertzsprung · commit cdb7de582a05 · 2012-09-17T21:41:50.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompare.java
@@ -91,12 +91,12 @@ private static void compareJSON(String prefix, JSONObject expected, JSONObject a
             }
         }
 
-        // If strict, check for vice-versa
+        // If non-extensible, check for vice-versa
         if (!mode.isExtensible()) {
             Set<String> actualKeys = getKeys(actual);
             for(String key : actualKeys) {
                 if (!expected.has(key)) {
-                    result.fail("Strict checking failed.  Got but did not expect: " + prefix + key);
+                    result.fail("Got unexpected field: " + prefix + key);
                 }
             }
         }
diff --git a/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java b/src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java
@@ -67,7 +67,7 @@ public void reportsUnexpectedNonNull() throws JSONException {
     @Test
     public void reportsUnexpectedFieldInNonExtensibleMode() throws JSONException {
         JSONCompareResult result = compareJSON("{\"obj\": {}}", "{\"obj\": {\"id\": 3}}", NON_EXTENSIBLE);
-        assertThat(result, failsWithMessage(equalTo("Strict checking failed.  Got but did not expect: obj.id")));
+        assertThat(result, failsWithMessage(equalTo("Got unexpected field: obj.id")));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ private static void compareJSON(String prefix, JSONObject expected, JSONObject a`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- // If strict, check for vice-versa`
	`94`	`+ // If non-extensible, check for vice-versa`
`95`	`95`	`if (!mode.isExtensible()) {`
`96`	`96`	`Set<String> actualKeys = getKeys(actual);`
`97`	`97`	`for(String key : actualKeys) {`
`98`	`98`	`if (!expected.has(key)) {`
`99`		`- result.fail("Strict checking failed. Got but did not expect: " + prefix + key);`
	`99`	`+ result.fail("Got unexpected field: " + prefix + key);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void reportsUnexpectedNonNull() throws JSONException {`
`67`	`67`	`@Test`
`68`	`68`	`public void reportsUnexpectedFieldInNonExtensibleMode() throws JSONException {`
`69`	`69`	`JSONCompareResult result = compareJSON("{\"obj\": {}}", "{\"obj\": {\"id\": 3}}", NON_EXTENSIBLE);`
`70`		`- assertThat(result, failsWithMessage(equalTo("Strict checking failed. Got but did not expect: obj.id")));`
	`70`	`+ assertThat(result, failsWithMessage(equalTo("Got unexpected field: obj.id")));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Test`