Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error message formatting placeholders

Browse Source 
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.

See gh-15569
This commit is contained in:
Phillip Webb
2019-07-23 15:18:40 +01:00
parent 690019ba8f
commit 900ec9f3ec
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
View File

@@ -113,7 +113,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) {
return isEqualToJson((Resource) expected);
}
failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
return null;
}
@@ -441,7 +441,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) {
return isNotEqualToJson((Resource) expected);
}
failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
return null;
}
@@ -1006,14 +1006,14 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
private JsonContentAssert assertNotFailed(JSONCompareResult result) {
if (result.failed()) {
failWithMessage("JSON Comparison failure: {}", result.getMessage());
failWithMessage("JSON Comparison failure: %s", result.getMessage());
}
return this;
}
private JsonContentAssert assertNotPassed(JSONCompareResult result) {
if (result.passed()) {
failWithMessage("JSON Comparison failure: {}", result.getMessage());
failWithMessage("JSON Comparison failure: %s", result.getMessage());
}
return this;
}
@@ -1086,7 +1086,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
}
catch (Exception ex) {
if (required) {
failWithMessage("{}. {}", getNoValueMessage(), ex.getMessage());
failWithMessage("%s. %s", getNoValueMessage(), ex.getMessage());
}
return null;
}