root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Provide an implementation of JsonComparator 

See gh-32791
This commit is contained in:
Stéphane Nicoll 2024-05-23 16:16:38 +02:00
parent f62275d674
commit 0ac7e41beb
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
spring-test/src/main/java/org/springframework/test/json/JsonAssert.java
View File

@ -16,13 +16,14 @@
package org.springframework.test.json; package org.springframework.test.json;
import org.json.JSONException;
import org.skyscreamer.jsonassert.JSONCompare; import org.skyscreamer.jsonassert.JSONCompare;
import org.skyscreamer.jsonassert.JSONCompareMode; import org.skyscreamer.jsonassert.JSONCompareMode;
import org.skyscreamer.jsonassert.JSONCompareResult; import org.skyscreamer.jsonassert.JSONCompareResult;
import org.skyscreamer.jsonassert.comparator.DefaultComparator;
import org.skyscreamer.jsonassert.comparator.JSONComparator; import org.skyscreamer.jsonassert.comparator.JSONComparator;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.function.ThrowingBiFunction;
/** /**
* Useful methods that can be used with {@code org.skyscreamer.jsonassert}. * Useful methods that can be used with {@code org.skyscreamer.jsonassert}.
@ -40,7 +41,9 @@ public abstract class JsonAssert {
* @see JSONCompareMode#LENIENT * @see JSONCompareMode#LENIENT
*/ */
public static JsonComparator comparator(JsonCompareMode compareMode) { public static JsonComparator comparator(JsonCompareMode compareMode) {
return comparator(toJSONCompareMode(compareMode)); JSONCompareMode jsonAssertCompareMode = (compareMode != JsonCompareMode.LENIENT
? JSONCompareMode.STRICT : JSONCompareMode.LENIENT);
return comparator(jsonAssertCompareMode);
} }
/** /**
@ -50,8 +53,7 @@ public abstract class JsonAssert {
* @return a new {@link JsonComparator} instance * @return a new {@link JsonComparator} instance
*/ */
public static JsonComparator comparator(JSONComparator comparator) { public static JsonComparator comparator(JSONComparator comparator) {
return comparator((expectedJson, actualJson) -> JSONCompare return new JsonAssertJsonComparator(comparator);
.compareJSON(expectedJson, actualJson, comparator));
} }
/** /**
@ -61,17 +63,23 @@ public abstract class JsonAssert {
* @return a new {@link JsonComparator} instance * @return a new {@link JsonComparator} instance
*/ */
public static JsonComparator comparator(JSONCompareMode mode) { public static JsonComparator comparator(JSONCompareMode mode) {
return comparator((expectedJson, actualJson) -> JSONCompare return new JsonAssertJsonComparator(mode);
.compareJSON(expectedJson, actualJson, mode));
} }
private static JsonComparator comparator(ThrowingBiFunction<String, String, JSONCompareResult> compareFunction) { private static class JsonAssertJsonComparator implements JsonComparator {
return (expectedJson, actualJson) -> compare(expectedJson, actualJson, compareFunction);
private final JSONComparator jsonAssertComparator;
JsonAssertJsonComparator(JSONComparator jsonAssertComparator) {
this.jsonAssertComparator = jsonAssertComparator;
} }
private static JsonComparison compare(@Nullable String expectedJson, @Nullable String actualJson, JsonAssertJsonComparator(JSONCompareMode compareMode) {
ThrowingBiFunction<String, String, JSONCompareResult> compareFunction) { this(new DefaultComparator(compareMode));
}
@Override
public JsonComparison compare(@Nullable String expectedJson, @Nullable String actualJson) {
if (actualJson == null) { if (actualJson == null) {
return (expectedJson != null) return (expectedJson != null)
? JsonComparison.mismatch("Expected null JSON") ? JsonComparison.mismatch("Expected null JSON")
@ -80,14 +88,16 @@ public abstract class JsonAssert {
if (expectedJson == null) { if (expectedJson == null) {
return JsonComparison.mismatch("Expected non-null JSON"); return JsonComparison.mismatch("Expected non-null JSON");
} }
JSONCompareResult result = compareFunction.throwing(IllegalStateException::new).apply(expectedJson, actualJson); try {
JSONCompareResult result = JSONCompare.compareJSON(expectedJson, actualJson, this.jsonAssertComparator);
return (!result.passed()) return (!result.passed())
? JsonComparison.mismatch(result.getMessage()) ? JsonComparison.mismatch(result.getMessage())
: JsonComparison.match(); : JsonComparison.match();
} }
catch (JSONException ex) {
private static JSONCompareMode toJSONCompareMode(JsonCompareMode compareMode) { throw new IllegalStateException(ex);
return (compareMode != JsonCompareMode.LENIENT ? JSONCompareMode.STRICT : JSONCompareMode.LENIENT); }
}
} }
} }