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

Polish

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-07-22 11:01:20 -04:00
parent 9092102a83
commit 6c4aff4c9d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
View File

@@ -105,10 +105,9 @@ public class ViewResolutionIntegrationTests {
// SPR-12013
@Test
public void viewResolverBeanWithDefaultViewResolutionConfig() throws Exception {
MockHttpServletResponse response = runTest(FreeMarkerBeanBasedWebConfig.class);
assertEquals("<html><body>Hello World!</body></html>",
response.getContentAsString());
public void existingViewResolver() throws Exception {
MockHttpServletResponse response = runTest(ExistingViewResolverConfig.class);
assertEquals("<html><body>Hello World!</body></html>", response.getContentAsString());
}
@@ -249,8 +248,11 @@ public class ViewResolutionIntegrationTests {
}
}
/**
* Test @EnableWebMvc in the presence of pre-existing ViewResolver.
*/
@Configuration
static class FreeMarkerBeanBasedWebConfig extends AbstractWebConfig {
static class ExistingViewResolverConfig extends AbstractWebConfig {
@Bean
public FreeMarkerViewResolver freeMarkerViewResolver() {