Update JSONCompareResult.java

riccorazza · riccorazza · commit 7c9f6be62f19 · 2015-06-24T13:38:13.000+02:00
Improved classe adding 2 new lists for missing and unexpected fileds.
diff --git a/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java b/src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
@@ -17,6 +17,8 @@ public class JSONCompareResult {
     private Object _expected;
     private Object _actual;
     private final List<FieldComparisonFailure> _fieldFailures = new ArrayList<FieldComparisonFailure>();
+    private final List<FieldComparisonFailure> _fieldMissing = new ArrayList<FieldComparisonFailure>();
+    private final List<FieldComparisonFailure> _fieldUnexpected = new ArrayList<FieldComparisonFailure>();
 
     /**
      * Default constructor.
@@ -60,6 +62,20 @@ public String getMessage() {
     public List<FieldComparisonFailure> getFieldFailures() {
         return Collections.unmodifiableList(_fieldFailures);
     }
+    
+    /**
+     * Get the list of missed on field comparisons
+     */
+    public List<FieldComparisonFailure> getFieldMissing() {
+        return Collections.unmodifiableList(_fieldMissing);
+    }
+    
+    /**
+     * Get the list of failures on field comparisons
+     */
+    public List<FieldComparisonFailure> getFieldUnexpected() {
+        return Collections.unmodifiableList(_fieldUnexpected);
+    }
 
     /**
      * Actual field value
@@ -69,7 +85,8 @@ public List<FieldComparisonFailure> getFieldFailures() {
      *         particular field
      * @deprecated Superseded by {@link #getFieldFailures()}
      */
-    public Object getActual() {
+    @Deprecated
+	public Object getActual() {
         return _actual;
     }
     
@@ -81,7 +98,8 @@ public Object getActual() {
      *         particular field
      * @deprecated Superseded by {@link #getFieldFailures()}
      */
-    public Object getExpected() {
+    @Deprecated
+	public Object getExpected() {
         return _expected;
     }
     
@@ -91,6 +109,20 @@ public Object getExpected() {
     public boolean isFailureOnField() {
         return !_fieldFailures.isEmpty();
     }
+    
+    /**
+     * Check if comparison failed with missing on any particular fields
+     */
+    public boolean isMissingOnField() {
+        return !_fieldMissing.isEmpty();
+    }
+    
+    /**
+     * Check if comparison failed with unexpected on any particular fields
+     */
+    public boolean isUnexpectedOnField() {
+        return !_fieldUnexpected.isEmpty();
+    }
 
     /**
      * Dot-separated path the the field that failed comparison
@@ -99,7 +131,8 @@ public boolean isFailureOnField() {
      *         not fail on a particular field
      * @deprecated Superseded by {@link #getFieldFailures()}
      */
-    public String getField() {
+    @Deprecated
+	public String getField() {
         return _field;
     }
     
@@ -147,6 +180,7 @@ private String formatFailureMessage(String field, Object expected, Object actual
     }
 
     public JSONCompareResult missing(String field, Object expected) {
+    	_fieldMissing.add(new FieldComparisonFailure(field, expected, null));
         fail(formatMissing(field, expected));
         return this;
     }
@@ -159,6 +193,7 @@ private String formatMissing(String field, Object expected) {
     }
 
     public JSONCompareResult unexpected(String field, Object value) {
+    	_fieldUnexpected.add(new FieldComparisonFailure(field, null, value));
         fail(formatUnexpected(field, value));
         return this;
     }
