This is an automated email from the ASF dual-hosted git repository.
diru pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
The following commit(s) were added to refs/heads/master by this push:
new 7f038ad SLING-9500: implemented
javax.servlet.ServletRequest#getLocales() on MockSlingHttpServletRequest
new 300bd66 Merge pull request #7 from Buuhuu/SLING-9500
7f038ad is described below
commit 7f038ade312eca57e6efca1b80cc12442ddcbe8b
Author: Dirk Rudolph <[email protected]>
AuthorDate: Wed Jun 3 14:16:22 2020 +0200
SLING-9500: implemented javax.servlet.ServletRequest#getLocales() on
MockSlingHttpServletRequest
---
.../org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java | 2 +-
.../apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index 67f954f..36a163b 100644
---
a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++
b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -921,7 +921,7 @@ public class MockSlingHttpServletRequest extends
SlingAdaptable implements Sling
@Override
public Enumeration<Locale> getLocales() {
- throw new UnsupportedOperationException();
+ return Collections.enumeration(Collections.singleton(getLocale()));
}
@Override
diff --git
a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
index 70ed9a3..aa87e05 100644
---
a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
+++
b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
@@ -198,6 +198,10 @@ public class MockSlingHttpServletRequestTest {
assertEquals(Locale.US, request.getLocale());
request.setLocale(Locale.GERMAN);
assertEquals(Locale.GERMAN, request.getLocale());
+ Enumeration<Locale> locales = request.getLocales();
+ assertTrue(locales.hasMoreElements());
+ assertEquals(Locale.GERMAN, locales.nextElement());
+ assertFalse(locales.hasMoreElements());
}
@Test