Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add defaultLocale to AcceptHeaderLocaleResolver

Browse Source 
Issue: SPR-14312
This commit is contained in:
Rossen Stoyanchev
2016-05-31 13:55:11 -04:00
parent e2fa282e14
commit 8343ce9e44
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
View File

@@ -25,6 +25,7 @@ import org.junit.Test;
import org.springframework.mock.web.test.MockHttpServletRequest;
import static java.util.Locale.CANADA;
import static java.util.Locale.JAPANESE;
import static java.util.Locale.UK;
import static java.util.Locale.US;
import static org.junit.Assert.assertEquals;
@@ -56,6 +57,17 @@ public class AcceptHeaderLocaleResolverTests {
assertEquals(US, this.resolver.resolveLocale(request(US, UK)));
}
@Test
public void defaultLocale() throws Exception {
this.resolver.setDefaultLocale(JAPANESE);
MockHttpServletRequest request = new MockHttpServletRequest();
assertEquals(JAPANESE, this.resolver.resolveLocale(request));
request.addHeader("Accept-Language", US.toString());
request.setPreferredLocales(Collections.singletonList(US));
assertEquals(US, this.resolver.resolveLocale(request));
}
private HttpServletRequest request(Locale... locales) {
MockHttpServletRequest request = new MockHttpServletRequest();