Author: sseifert
Date: Fri Feb 5 21:40:53 2016
New Revision: 1728734
URL: http://svn.apache.org/viewvc?rev=1728734&view=rev
Log:
SLING-5490 Add locale support to MockSlingHttpServletRequest and
MockSlingHttpServletResponse
Modified:
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
Modified:
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java?rev=1728734&r1=1728733&r2=1728734&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
(original)
+++
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
Fri Feb 5 21:40:53 2016
@@ -96,6 +96,7 @@ public class MockSlingHttpServletRequest
private String remoteAddr;
private String remoteHost;
private int remotePort;
+ private Locale locale = Locale.US;
private MockRequestDispatcherFactory requestDispatcherFactory;
@@ -259,8 +260,15 @@ public class MockSlingHttpServletRequest
@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() {
Modified:
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java?rev=1728734&r1=1728733&r2=1728734&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
(original)
+++
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponse.java
Fri Feb 5 21:40:53 2016
@@ -46,6 +46,7 @@ public class MockSlingHttpServletRespons
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 MockSlingHttpServletRespons
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 MockSlingHttpServletRespons
public String encodeURL(String url) {
throw new UnsupportedOperationException();
}
+
}
Modified:
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java?rev=1728734&r1=1728733&r2=1728734&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
(original)
+++
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
Fri Feb 5 21:40:53 2016
@@ -118,6 +118,8 @@ public class MockSlingHttpServletRequest
@Test
public void testLocale() {
assertEquals(Locale.US, request.getLocale());
+ request.setLocale(Locale.GERMAN);
+ assertEquals(Locale.GERMAN, request.getLocale());
}
@Test
Modified:
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java?rev=1728734&r1=1728733&r2=1728734&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
(original)
+++
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
Fri Feb 5 21:40:53 2016
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTru
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 MockSlingHttpServletRespons
assertNull(response.getCookies());
}
+ @Test
+ public void testLocale() {
+ assertEquals(Locale.US, response.getLocale());
+ response.setLocale(Locale.GERMAN);
+ assertEquals(Locale.GERMAN, response.getLocale());
+ }
+
}
