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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2016-03-25 23:28:45 +01:00
parent 862d10c128
commit 94cb7786c8
7 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-test/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
View File

@@ -47,6 +47,7 @@ public class JsonPathResultMatchers {
private String prefix;
/**
* Protected constructor.
* <p>Use {@link MockMvcResultMatchers#jsonPath(String, Object...)} or
@@ -65,7 +66,7 @@ public class JsonPathResultMatchers {
* <p>Use this method if the JSON payloads are prefixed to avoid
* Cross Site Script Inclusion (XSSI) attacks.
* @param prefix the string prefix prepended to the actual JSON payload
* @since 4.3.0
* @since 4.3
*/
public JsonPathResultMatchers prefix(String prefix) {
this.prefix = prefix;
@@ -252,14 +253,14 @@ public class JsonPathResultMatchers {
String content = result.getResponse().getContentAsString();
if (StringUtils.hasLength(this.prefix)) {
try {
String reason = String.format("Expected a JSON payload prefixed with \"%s\" but found: %s", this.prefix,
StringUtils.quote(content.substring(0, this.prefix.length())));
String reason = String.format("Expected a JSON payload prefixed with \"%s\" but found: %s",
this.prefix, StringUtils.quote(content.substring(0, this.prefix.length())));
MatcherAssert.assertThat(reason, content, StringStartsWith.startsWith(this.prefix));
return content.substring(this.prefix.length());
}
catch (StringIndexOutOfBoundsException oobe) {
String message = "JSON prefix \"" + this.prefix + "\" not found, exception: ";
throw new AssertionError(message + oobe.getMessage());
throw new AssertionError(
"JSON prefix \"" + this.prefix + "\" not found, exception: " + oobe.getMessage());
}
}
else {