This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
commit f1cf19b8afb28bf2ac132e89ada97adafdff6edd Author: Stefan Seifert <[email protected]> AuthorDate: Fri Feb 5 21:40:53 2016 +0000 SLING-5490 Add locale support to MockSlingHttpServletRequest and MockSlingHttpServletResponse git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1728734 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/servlethelpers/MockSlingHttpServletRequest.java | 10 +++++++++- .../sling/servlethelpers/MockSlingHttpServletResponse.java | 8 +++++--- .../sling/servlethelpers/MockSlingHttpServletRequestTest.java | 2 ++ .../sling/servlethelpers/MockSlingHttpServletResponseTest.java | 8 ++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java index 88404fd..1d7204d 100644 --- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java +++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java @@ -96,6 +96,7 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling private String remoteAddr; private String remoteHost; private int remotePort; + private Locale locale = Locale.US; private MockRequestDispatcherFactory requestDispatcherFactory; @@ -259,8 +260,15 @@ public class MockSlingHttpServletRequest extends SlingAdaptable implements Sling @Override public Locale getLocale() { - return Locale.US; + return locale; } + + /** + * @param loc Request locale + */ + public void setLocale(Locale loc) { + this.locale = loc; + } @Override public String getContextPath() { diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java index 6acfb7c..7a3dc91 100644 --- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java +++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java @@ -46,6 +46,7 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin private int status = HttpServletResponse.SC_OK; private int bufferSize = 1024 * 8; private boolean isCommitted; + private Locale locale = Locale.US; private final HeaderSupport headerSupport = new HeaderSupport(); private final ResponseBodySupport bodySupport = new ResponseBodySupport(); private final CookieSupport cookieSupport = new CookieSupport(); @@ -249,17 +250,17 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin return cookieSupport.getCookies(); } - // --- unsupported operations --- @Override public Locale getLocale() { - throw new UnsupportedOperationException(); + return locale; } @Override public void setLocale(Locale loc) { - throw new UnsupportedOperationException(); + this.locale = loc; } + // --- unsupported operations --- @Override public String encodeRedirectUrl(String url) { throw new UnsupportedOperationException(); @@ -279,4 +280,5 @@ public class MockSlingHttpServletResponse extends SlingAdaptable implements Slin public String encodeURL(String url) { throw new UnsupportedOperationException(); } + } diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java index 28d6b50..51b4155 100644 --- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java +++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java @@ -118,6 +118,8 @@ public class MockSlingHttpServletRequestTest { @Test public void testLocale() { assertEquals(Locale.US, request.getLocale()); + request.setLocale(Locale.GERMAN); + assertEquals(Locale.GERMAN, request.getLocale()); } @Test diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java index 54dae46..2a2296a 100644 --- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java +++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import java.util.Iterator; +import java.util.Locale; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -174,4 +175,11 @@ public class MockSlingHttpServletResponseTest { assertNull(response.getCookies()); } + @Test + public void testLocale() { + assertEquals(Locale.US, response.getLocale()); + response.setLocale(Locale.GERMAN); + assertEquals(Locale.GERMAN, response.getLocale()); + } + } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
