This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit e9e968a5b801e21d60638a8939a4db18b5b2e127 Author: Stefan Seifert <[email protected]> AuthorDate: Wed Oct 15 22:03:29 2014 +0000 SLING-4042 per default no charencoding should be set in mock response git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1632186 13f79535-47bb-0310-9956-ffa450edef68 --- .../mock/sling/servlet/MockSlingHttpServletResponse.java | 3 +-- .../mock/sling/servlet/MockSlingHttpServletResponseTest.java | 10 +++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java index b5d918e..e48846f 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java @@ -26,7 +26,6 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.CharEncoding; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.adapter.SlingAdaptable; @@ -39,7 +38,7 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin private static final String CHARSET_SEPARATOR = ";charset="; private String contentType; - private String characterEncoding = CharEncoding.ISO_8859_1; + private String characterEncoding; private int contentLength; private int status = HttpServletResponse.SC_OK; private int bufferSize = 1024 * 8; diff --git a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java index e794909..944b366 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java @@ -47,11 +47,19 @@ public class MockSlingHttpServletResponseTest { @Test public void testContentTypeCharset() throws Exception { assertNull(response.getContentType()); - assertEquals(CharEncoding.ISO_8859_1, response.getCharacterEncoding()); + assertNull(response.getCharacterEncoding()); + response.setContentType("image/gif"); + assertEquals("image/gif", response.getContentType()); + assertNull(response.getCharacterEncoding()); + response.setContentType("text/plain;charset=UTF-8"); assertEquals("text/plain;charset=UTF-8", response.getContentType()); assertEquals(CharEncoding.UTF_8, response.getCharacterEncoding()); + + response.setCharacterEncoding(CharEncoding.ISO_8859_1); + assertEquals("text/plain;charset=ISO-8859-1", response.getContentType()); + assertEquals(CharEncoding.ISO_8859_1, response.getCharacterEncoding()); } @Test -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
