MockHttpServletResponse.setIntHeader supports 'Content-Length' header as well

Issue: SPR-13752
This commit is contained in:
Juergen Hoeller
2015-12-02 13:36:35 +01:00
parent 4d4d2e2966
commit a4f5c46fed
3 changed files with 34 additions and 20 deletions

View File

@@ -154,7 +154,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
* <p>If {@code false}, {@link #getCharacterEncoding()} will return a default encoding value.
*/
public boolean isCharset() {
return charset;
return this.charset;
}
@Override
@@ -552,11 +552,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
private boolean setSpecialHeader(String name, Object value) {
if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {
setContentType((String) value);
setContentType(value.toString());
return true;
}
else if (CONTENT_LENGTH_HEADER.equalsIgnoreCase(name)) {
setContentLength(Integer.parseInt((String) value));
setContentLength(value instanceof Number ? ((Number) value).intValue() :
Integer.parseInt(value.toString()));
return true;
}
else {