Updated Branches: refs/heads/master c1c43497f -> b4336e648
WICKET-5219 setHeader() instead of addHeader() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b4336e64 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b4336e64 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b4336e64 Branch: refs/heads/master Commit: b4336e64883484eede65f2e21a31bc06af96691e Parents: c1c4349 Author: svenmeier <[email protected]> Authored: Fri Jun 7 22:33:18 2013 +0200 Committer: svenmeier <[email protected]> Committed: Fri Jun 7 22:33:18 2013 +0200 ---------------------------------------------------------------------- .../http/servlet/ServletWebResponseTest.java | 18 ++++++++++---- 1 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b4336e64/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java index e92aa32..1fe3627 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java @@ -72,7 +72,7 @@ public class ServletWebResponseTest extends Assert ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse); webResponse.sendRedirect(url); - verify(httpServletResponse).addHeader("Ajax-Location", url); + verify(httpServletResponse).setHeader("Ajax-Location", url); verify(httpServletResponse).setContentType("text/xml;charset=UTF-8"); assertEquals( "<ajax-response><redirect><![CDATA[./relative/path]]></redirect></ajax-response>", @@ -129,20 +129,28 @@ public class ServletWebResponseTest extends Assert response.setInlineHeader("name with spaces"); String header = httpResponse.getHeader("Content-Disposition"); - assertEquals("inline; filename=\"name%20with%20spaces\"; filename*=UTF-8''name%20with%20spaces", header); + assertEquals( + "inline; filename=\"name%20with%20spaces\"; filename*=UTF-8''name%20with%20spaces", + header); // says: "name with bulgarian" response.setInlineHeader("name with бÑлгаÑÑки"); header = httpResponse.getHeader("Content-Disposition"); - assertEquals("inline; filename=\"name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8\"; filename*=UTF-8''name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8", header); + assertEquals( + "inline; filename=\"name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8\"; filename*=UTF-8''name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8", + header); response.setAttachmentHeader("name with spaces"); header = httpResponse.getHeader("Content-Disposition"); - assertEquals("attachment; filename=\"name%20with%20spaces\"; filename*=UTF-8''name%20with%20spaces", header); + assertEquals( + "attachment; filename=\"name%20with%20spaces\"; filename*=UTF-8''name%20with%20spaces", + header); // says: "name with bulgarian" response.setAttachmentHeader("name with бÑлгаÑÑки"); header = httpResponse.getHeader("Content-Disposition"); - assertEquals("attachment; filename=\"name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8\"; filename*=UTF-8''name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8", header); + assertEquals( + "attachment; filename=\"name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8\"; filename*=UTF-8''name%20with%20%D0%B1%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8", + header); } } \ No newline at end of file
