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

MockHttpServletRequest preserves original Accept-Language header value

Browse Source 
Issue: SPR-17566

(cherry picked from commit 9efea7eb73)
This commit is contained in:
Juergen Hoeller
2018-12-04 22:07:43 +01:00
parent d73b027021
commit bc864dc161
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@@ -308,6 +308,7 @@ public class MockHttpServletRequestTests {
List<Locale> actual = Collections.list(request.getLocales());
assertEquals(Arrays.asList(Locale.forLanguageTag("fr-ch"), Locale.forLanguageTag("fr"),
Locale.forLanguageTag("en"), Locale.forLanguageTag("de")), actual);
assertEquals(headerValue, request.getHeader("Accept-Language"));
}
@Test
@@ -500,25 +501,25 @@ public class MockHttpServletRequestTests {
}
@Test
public void httpHeaderRfcFormatedDate() {
public void httpHeaderRfcFormattedDate() {
request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue, 21 Jul 2015 10:00:00 GMT");
assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
}
@Test
public void httpHeaderFirstVariantFormatedDate() {
public void httpHeaderFirstVariantFormattedDate() {
request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue, 21-Jul-15 10:00:00 GMT");
assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
}
@Test
public void httpHeaderSecondVariantFormatedDate() {
public void httpHeaderSecondVariantFormattedDate() {
request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "Tue Jul 21 10:00:00 2015");
assertEquals(1437472800000L, request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE));
}
@Test(expected = IllegalArgumentException.class)
public void httpHeaderFormatedDateError() {
public void httpHeaderFormattedDateError() {
request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, "This is not a date");
request.getDateHeader(HttpHeaders.IF_MODIFIED_SINCE);
}