Polish

rstoyanchev · rstoyanchev · commit 6c4aff4c9db8 · 2014-07-22T11:21:39.000-04:00
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
@@ -105,10 +105,9 @@ public void groovyMarkupInvalidConfig() throws Exception {
 	// 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 void configureViewResolvers(ViewResolverRegistry registry) {
 		}
 	}
 
+	/**
+	 * Test @EnableWebMvc in the presence of pre-existing ViewResolver.
+	 */
 	@Configuration
-	static class FreeMarkerBeanBasedWebConfig extends AbstractWebConfig {
+	static class ExistingViewResolverConfig extends AbstractWebConfig {
 
 		@Bean
 		public FreeMarkerViewResolver freeMarkerViewResolver() {
