MockHttpServletRequestBuilder sets content-length

Closes gh-23978
spring-projects · Nov 12, 2019 · f4c847b · f4c847b
1 parent 4bbf2d5
commit f4c847b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/...main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -687,6 +687,13 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
 			}
 		});
 
+		if (!ObjectUtils.isEmpty(this.content) &&
+				!this.headers.containsKey(HttpHeaders.CONTENT_LENGTH) &&
+				!this.headers.containsKey(HttpHeaders.TRANSFER_ENCODING)) {
+
+			request.addHeader(HttpHeaders.CONTENT_LENGTH, this.content.length);
+		}
+
 		String query = this.url.getRawQuery();
 		if (!this.queryParams.isEmpty()) {
 			String s = UriComponentsBuilder.newInstance().queryParams(this.queryParams).build().encode().getQuery();

diff --git a/...java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/...java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -389,6 +389,7 @@ public void body() throws IOException {
 		byte[] result = FileCopyUtils.copyToByteArray(request.getInputStream());
 
 		assertThat(result).isEqualTo(body);
+		assertThat(request.getContentLength()).isEqualTo(body.length);
 	}
 
 	@Test