diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java index 8f0f32953a..9c04f4deb4 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java @@ -107,6 +107,7 @@ public class PrintingResultHandler implements ResultHandler { 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) { diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index 6dbc1e9e61..31b60f1b2e 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -69,6 +69,10 @@ public class PrintingResultHandlerTests { 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 class PrintingResultHandlerTests { MultiValueMap 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 class PrintingResultHandlerTests { private void assertValue(String heading, String label, Object value) { Map> 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)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java index d25ecd329a..54b394efa9 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java +++ b/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 class PrintingResultHandlerSmokeTests { standaloneSetup(new SimpleController()) .build() - .perform(get("/")) + .perform(get("/").content("Hello Request".getBytes())) .andDo(log()) .andDo(print()) .andDo(print(System.err)) @@ -76,7 +76,7 @@ public class PrintingResultHandlerSmokeTests { @ResponseBody public String hello(HttpServletResponse response) { response.addCookie(new Cookie("enigma", "42")); - return "Hello world"; + return "Hello Response"; } } }