Author: sseifert Date: Wed Oct 15 22:03:29 2014 New Revision: 1632186 URL: http://svn.apache.org/r1632186 Log: SLING-4042 per default no charencoding should be set in mock response
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java?rev=1632186&r1=1632185&r2=1632186&view=diff ============================================================================== --- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java (original) +++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponse.java Wed Oct 15 22:03:29 2014 @@ -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 MockSlingHttpServletRespons 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; Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java?rev=1632186&r1=1632185&r2=1632186&view=diff ============================================================================== --- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java (original) +++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletResponseTest.java Wed Oct 15 22:03:29 2014 @@ -47,11 +47,19 @@ public class MockSlingHttpServletRespons @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