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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2019-04-02 20:13:29 +02:00
parent 3ac88bed23 0babc1fb64
commit 2e63c66b0d
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
View File

@@ -169,7 +169,7 @@ public class MvcNamespaceTests {
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
TestMockServletContext servletContext = new TestMockServletContext();
appContext = new XmlWebApplicationContext();
appContext.setServletContext(servletContext);
@@ -889,7 +889,7 @@ public class MvcNamespaceTests {
AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
assertNotNull(handlerMapping);
DirectFieldAccessor accessor = new DirectFieldAccessor(handlerMapping);
Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource)accessor
Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource) accessor
.getPropertyValue("corsConfigurationSource")).getCorsConfigurations();
assertNotNull(configs);
assertEquals(1, configs.size());
@@ -914,7 +914,7 @@ public class MvcNamespaceTests {
AbstractHandlerMapping handlerMapping = (AbstractHandlerMapping)appContext.getBean(beanName);
assertNotNull(handlerMapping);
DirectFieldAccessor accessor = new DirectFieldAccessor(handlerMapping);
Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource)accessor
Map<String, CorsConfiguration> configs = ((UrlBasedCorsConfigurationSource) accessor
.getPropertyValue("corsConfigurationSource")).getCorsConfigurations();
assertNotNull(configs);
assertEquals(2, configs.size());