Merge branch '5.1.x'

This commit is contained in:
Juergen Hoeller
2019-05-03 14:23:59 +02:00
6 changed files with 39 additions and 26 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -351,6 +351,13 @@ public class MockHttpServletRequestTests {
assertEquals("en_US", request.getHeader("Accept-Language"));
}
@Test
public void emptyAcceptLanguageHeader() {
request.addHeader("Accept-Language", "");
assertEquals(Locale.ENGLISH, request.getLocale());
assertEquals("", request.getHeader("Accept-Language"));
}
@Test
public void getServerNameWithDefaultName() {
assertEquals("localhost", request.getServerName());