root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix failing tests 

Issue: SPR-10825
This commit is contained in:
Rossen Stoyanchev 2013-08-22 20:56:26 -04:00
parent a5143057ce
commit 64baef9f19
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
View File

@ -318,7 +318,9 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
StandaloneConfiguration config = new StandaloneConfiguration();
StaticRequestMappingHandlerMapping hm = config.getHandlerMapping(cxt);
StaticRequestMappingHandlerMapping hm = config.getHandlerMapping();
hm.setServletContext(cxt.getServletContext());
hm.setApplicationContext(cxt);
hm.registerHandlers(controllers);
cxt.addBean("requestMappingHandlerMapping", hm);
@ -358,11 +360,8 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
private class StandaloneConfiguration extends WebMvcConfigurationSupport {
public StaticRequestMappingHandlerMapping getHandlerMapping(StubWebApplicationContext cxt) {
public StaticRequestMappingHandlerMapping getHandlerMapping() {
StaticRequestMappingHandlerMapping handlerMapping = new StaticRequestMappingHandlerMapping();
handlerMapping.setServletContext(cxt.getServletContext());
handlerMapping.setApplicationContext(cxt);
handlerMapping.setEmbeddedValueResolver(new StaticStringValueResolver(placeHolderValues));
handlerMapping.setUseSuffixPatternMatch(useSuffixPatternMatch);
handlerMapping.setUseTrailingSlashMatch(useTrailingSlashPatternMatch);