Skip to content

Commit e447e5f

Browse files
carterpagecarterpage
committed
Revert 797c5c1 
1 parent 797c5c1 commit e447e5f

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

‎src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ public class JSONCompareResult {
1717
private Object _expected;
1818
private Object _actual;
1919
private final List<FieldComparisonFailure> _fieldFailures = new ArrayList<FieldComparisonFailure>();
20-
private final List<FieldComparisonFailure> _fieldMissing = new ArrayList<FieldComparisonFailure>();
21-
private final List<FieldComparisonFailure> _fieldUnexpected = new ArrayList<FieldComparisonFailure>();
2220

2321
/**
2422
* Default constructor.
@@ -62,20 +60,6 @@ public String getMessage() {
6260
public List<FieldComparisonFailure> getFieldFailures() {
6361
return Collections.unmodifiableList(_fieldFailures);
6462
}
65-
66-
/**
67-
* Get the list of missed on field comparisons
68-
*/
69-
public List<FieldComparisonFailure> getFieldMissing() {
70-
return Collections.unmodifiableList(_fieldMissing);
71-
}
72-
73-
/**
74-
* Get the list of failures on field comparisons
75-
*/
76-
public List<FieldComparisonFailure> getFieldUnexpected() {
77-
return Collections.unmodifiableList(_fieldUnexpected);
78-
}
7963

8064
/**
8165
* Actual field value
@@ -85,7 +69,6 @@ public List<FieldComparisonFailure> getFieldUnexpected() {
8569
* particular field
8670
* @deprecated Superseded by {@link #getFieldFailures()}
8771
*/
88-
@Deprecated
8972
public Object getActual() {
9073
return _actual;
9174
}
@@ -98,7 +81,6 @@ public Object getActual() {
9881
* particular field
9982
* @deprecated Superseded by {@link #getFieldFailures()}
10083
*/
101-
@Deprecated
10284
public Object getExpected() {
10385
return _expected;
10486
}
@@ -109,20 +91,6 @@ public Object getExpected() {
10991
public boolean isFailureOnField() {
11092
return !_fieldFailures.isEmpty();
11193
}
112-
113-
/**
114-
* Check if comparison failed with missing on any particular fields
115-
*/
116-
public boolean isMissingOnField() {
117-
return !_fieldMissing.isEmpty();
118-
}
119-
120-
/**
121-
* Check if comparison failed with unexpected on any particular fields
122-
*/
123-
public boolean isUnexpectedOnField() {
124-
return !_fieldUnexpected.isEmpty();
125-
}
12694

12795
/**
12896
* Dot-separated path the the field that failed comparison
@@ -131,7 +99,6 @@ public boolean isUnexpectedOnField() {
13199
* not fail on a particular field
132100
* @deprecated Superseded by {@link #getFieldFailures()}
133101
*/
134-
@Deprecated
135102
public String getField() {
136103
return _field;
137104
}
@@ -180,7 +147,6 @@ private String formatFailureMessage(String field, Object expected, Object actual
180147
}
181148

182149
public JSONCompareResult missing(String field, Object expected) {
183-
_fieldMissing.add(new FieldComparisonFailure(field, expected, null));
184150
fail(formatMissing(field, expected));
185151
return this;
186152
}
@@ -193,7 +159,6 @@ private String formatMissing(String field, Object expected) {
193159
}
194160

195161
public JSONCompareResult unexpected(String field, Object value) {
196-
_fieldUnexpected.add(new FieldComparisonFailure(field, null, value));
197162
fail(formatUnexpected(field, value));
198163
return this;
199164
}

‎src/test/java/org/skyscreamer/jsonassert/JSONCompareTest.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.skyscreamer.jsonassert;
22

33
import static org.hamcrest.core.IsEqual.equalTo;
4-
import static org.junit.Assert.assertEquals;
54
import static org.junit.Assert.assertThat;
65
import static org.junit.Assert.assertTrue;
76
import static org.skyscreamer.jsonassert.JSONCompare.compareJSON;
@@ -33,22 +32,18 @@ public void reportsArraysOfUnequalLength() throws JSONException {
3332
public void reportsArrayMissingExpectedElement() throws JSONException {
3433
JSONCompareResult result = compareJSON("[4]", "[7]", LENIENT);
3534
assertThat(result, failsWithMessage(equalTo("[]\nExpected: 4\n but none found\n ; []\nUnexpected: 7\n")));
36-
assertEquals(result.getFieldMissing().size(), 1);
37-
assertEquals(result.getFieldUnexpected().size(), 1);
3835
}
3936

4037
@Test
4138
public void reportsMismatchedFieldValues() throws JSONException {
4239
JSONCompareResult result = compareJSON("{\"id\": 3}", "{\"id\": 5}", LENIENT);
4340
assertThat(result, failsWithMessage(equalTo("id\nExpected: 3\n got: 5\n")));
44-
assertThat(result, failsWithMessage(equalTo("id\nExpected: 3\n got: 5\n")));
4541
}
4642

4743
@Test
4844
public void reportsMissingField() throws JSONException {
4945
JSONCompareResult result = compareJSON("{\"obj\": {\"id\": 3}}", "{\"obj\": {}}", LENIENT);
5046
assertThat(result, failsWithMessage(equalTo("obj\nExpected: id\n but none found\n")));
51-
assertEquals(result.getFieldMissing().size(), 1);
5247
}
5348

5449
@Test
@@ -79,7 +74,6 @@ public void reportsUnexpectedNonNull() throws JSONException {
7974
public void reportsUnexpectedFieldInNonExtensibleMode() throws JSONException {
8075
JSONCompareResult result = compareJSON("{\"obj\": {}}", "{\"obj\": {\"id\": 3}}", NON_EXTENSIBLE);
8176
assertThat(result, failsWithMessage(equalTo("obj\nUnexpected: id\n")));
82-
assertEquals(result.getFieldUnexpected().size(), 1);
8377
}
8478

8579
@Test
@@ -92,16 +86,13 @@ public void reportsMismatchedTypes() throws JSONException {
9286
public void reportsWrongSimpleValueCountInUnorderedArray() throws JSONException {
9387
JSONCompareResult result = compareJSON("[5, 5]", "[5, 7]", LENIENT);
9488
assertThat(result, failsWithMessage(equalTo("[]: Expected 2 occurrence(s) of 5 but got 1 occurrence(s) ; []\nUnexpected: 7\n")));
95-
assertEquals(result.getFieldUnexpected().size(), 1);
9689
}
9790

9891
@Test
9992
public void reportsMissingJSONObjectWithUniqueKeyInUnorderedArray() throws JSONException {
10093
JSONCompareResult result = compareJSON("[{\"id\" : 3}]", "[{\"id\" : 5}]", LENIENT);
10194
assertThat(result, failsWithMessage(equalTo("[id=3]\nExpected: a JSON object\n but none found\n ; " +
10295
"[id=5]\nUnexpected: a JSON object\n")));
103-
assertEquals(result.getFieldMissing().size(), 1);
104-
assertEquals(result.getFieldUnexpected().size(), 1);
10596
}
10697

10798
@Test

0 commit comments

Comments
 (0)