Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
fslev committed Oct 3, 2022
1 parent cc7a2b3 commit 61fac34
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/main/java/io/json/compare/matcher/JsonArrayMatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private List<String> matchWithJsonArray(int expPosition, JsonNode expElement, Js
return Collections.emptyList();
} else {
if (compareModes.contains(CompareMode.JSON_ARRAY_STRICT_ORDER)) {
diffs.add(String.format("JSON ARRAY elements differ at position %s:\n%s\nDifferences:\n%s", expPosition + 1,
diffs.add(String.format("\nJSON ARRAY elements differ at position %s:\n%s\nDifferences:\n%s", expPosition + 1,
MessageUtil.cropL(JSONCompare.prettyPrint(expElement)), String.join("\n", elementDiffs)));
return diffs;
}
Expand All @@ -69,25 +69,25 @@ private List<String> matchWithJsonArray(int expPosition, JsonNode expElement, Js
if (areOfSameType(expElement, actElement)) {
elementDiffs = new JsonMatcher(expElement, actElement, comparator, compareModes).match();
if (!elementDiffs.isEmpty()) {
diffs.add("Expected element from position " + (expPosition + 1)
diffs.add("\nExpected element from position " + (expPosition + 1)
+ " was FOUND:\n" + MessageUtil.cropL(JSONCompare.prettyPrint(expElement)));
return diffs;
}
}
break;
case DO_NOT_MATCH_ANY:
diffs.add(String.format("Actual JSON array has extra elements.\nExpected condition %s from position %s means there" +
" should be no more actual elements other than the ones expected",
diffs.add(String.format("\nExpected condition %s from position %s was not met." +
" Actual JSON array has extra elements.",
expElement, expPosition + 1));
return diffs;
}
}
if (useCase == UseCase.MATCH) {
diffs.add("Expected element from position " + (expPosition + 1) + " was NOT FOUND:\n"
diffs.add("\nExpected element from position " + (expPosition + 1) + " was NOT FOUND:\n"
+ MessageUtil.cropL(JSONCompare.prettyPrint(expElement)));
} else if (useCase == UseCase.MATCH_ANY) {
diffs.add(String.format("Actual Json Array has no extra elements. Expected condition %s from position %s means there" +
" should be more actual elements to match", expElement, expPosition + 1));
diffs.add(String.format("\nExpected condition %s from position %s was not met." +
" Actual Json Array has no extra elements.", expElement, expPosition + 1));
}
return diffs;
}
Expand Down

0 comments on commit 61fac34

Please sign in to comment.