Print request body in PrintingResultHandler in Spring MVC Test

Prior to this commit, the PrintingResultHandler used by the various
print() and log() methods in Spring MVC Test printed the response body
but not the request body.

Since request bodies are sometimes generated programmatically, however,
it can be beneficial to have the dynamically generated request body
logged as well.

This commit therefore prints the request body in PrintingResultHandler
by delegating to the recently introduced getContentAsString() method in
MockHttpServletRequest.

Issue: SPR-14717

Author: sbrannen

spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java

@@ -107,6 +107,7 @@ protected void printRequest(MockHttpServletRequest request) throws Exception {
 		this.printer.printValue("Request URI", request.getRequestURI());
 		this.printer.printValue("Parameters", getParamsMultiValueMap(request));
 		this.printer.printValue("Headers", getRequestHeaders(request));
+		this.printer.printValue("Body", request.getContentAsString());
 	}
 
 	protected final HttpHeaders getRequestHeaders(MockHttpServletRequest request) {

spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java

@@ -69,6 +69,10 @@ public boolean isAsyncStarted() {
 	public void printRequest() throws Exception {
 		this.request.addParameter("param", "paramValue");
 		this.request.addHeader("header", "headerValue");
+		this.request.setCharacterEncoding("UTF-16");
+		String palindrome = "ablE was I ere I saw Elba";
+		byte[] bytes = palindrome.getBytes("UTF-16");
+		this.request.setContent(bytes);
 
 		this.handler.handle(this.mvcResult);
 
@@ -78,10 +82,12 @@ public void printRequest() throws Exception {
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("param", "paramValue");
 
+
 		assertValue("MockHttpServletRequest", "HTTP Method", this.request.getMethod());
 		assertValue("MockHttpServletRequest", "Request URI", this.request.getRequestURI());
 		assertValue("MockHttpServletRequest", "Parameters", params);
 		assertValue("MockHttpServletRequest", "Headers", headers);
+		assertValue("MockHttpServletRequest", "Body", palindrome);
 	}
 
 	@Test
@@ -223,8 +229,9 @@ public void flashMap() throws Exception {
 
 	private void assertValue(String heading, String label, Object value) {
 		Map<String, Map<String, Object>> printedValues = this.handler.getPrinter().printedValues;
-		assertTrue("Heading " + heading + " not printed", printedValues.containsKey(heading));
-		assertEquals(value, printedValues.get(heading).get(label));
+		assertTrue("Heading '" + heading + "' not printed", printedValues.containsKey(heading));
+		assertEquals("For label '" + label + "' under heading '" + heading + "' =>", value,
+				printedValues.get(heading).get(label));
 	}
 
 

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public void testPrint() throws Exception {
 
 		standaloneSetup(new SimpleController())
 			.build()
-			.perform(get("/"))
+			.perform(get("/").content("Hello Request".getBytes()))
 			.andDo(log())
 			.andDo(print())
 			.andDo(print(System.err))
@@ -76,7 +76,7 @@ private static class SimpleController {
 		@ResponseBody
 		public String hello(HttpServletResponse response) {
 			response.addCookie(new Cookie("enigma", "42"));
-			return "Hello world";
+			return "Hello Response";
 		}
 	}
 }