spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-05 16:59:28 +00:00
Code Issues Projects Releases Wiki Activity

Improve null-safety of JsonContentAssert

Browse Source 
See gh-46926
This commit is contained in:
Moritz Halbritter
2025-09-16 11:55:16 +02:00
parent 96afc3f944
commit 3bfcfaa795
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
+14 -4
View File
@@ -1000,9 +1000,11 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (this.actual == null) {
return compareForNull(expectedJson);
}
if (expectedJson == null) {
return fail("Expected JSON but got null");
}
try {
return JSONCompare.compareJSON((expectedJson != null) ? expectedJson.toString() : null,
this.actual.toString(), compareMode);
return JSONCompare.compareJSON(expectedJson.toString(), this.actual.toString(), compareMode);
}
catch (Exception ex) {
if (ex instanceof RuntimeException runtimeException) {
@@ -1016,9 +1018,11 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (this.actual == null) {
return compareForNull(expectedJson);
}
if (expectedJson == null) {
return fail("Expected JSON but got null");
}
try {
return JSONCompare.compareJSON((expectedJson != null) ? expectedJson.toString() : null,
this.actual.toString(), comparator);
return JSONCompare.compareJSON(expectedJson.toString(), this.actual.toString(), comparator);
}
catch (Exception ex) {
if (ex instanceof RuntimeException runtimeException) {
@@ -1037,6 +1041,12 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
return result;
}
private JSONCompareResult fail(String message) {
JSONCompareResult result = new JSONCompareResult();
result.fail(message);
return result;
}
private JsonContentAssert assertNotFailed(JSONCompareResult result) {
if (result.failed()) {
failWithMessage("JSON Comparison failure: %s", result.getMessage());