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-16 21:43:25 -04:00
parent 80f4ea13c7
commit d23b0fec0c
9 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -567,7 +567,7 @@ public class MvcNamespaceTests {
ViewResolverComposite compositeResolver = this.appContext.getBean(ViewResolverComposite.class);
assertNotNull(compositeResolver);
assertEquals(8, compositeResolver.getViewResolvers().size());
assertEquals("Actual: " + compositeResolver.getViewResolvers(), 8, compositeResolver.getViewResolvers().size());
assertEquals(0, compositeResolver.getOrder());
List<ViewResolver> resolvers = compositeResolver.getViewResolvers();
@@ -628,8 +628,9 @@ public class MvcNamespaceTests {
GroovyMarkupConfigurer groovyMarkupConfigurer = appContext.getBean(GroovyMarkupConfigurer.class);
assertNotNull(groovyMarkupConfigurer);
accessor = new DirectFieldAccessor(groovyMarkupConfigurer);
assertEquals("/test", accessor.getPropertyValue("resourceLoaderPath"));
assertEquals("/test", groovyMarkupConfigurer.getResourceLoaderPath());
assertTrue(groovyMarkupConfigurer.isAutoIndent());
assertFalse(groovyMarkupConfigurer.isCacheTemplates());
}
@Test

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

@@ -97,7 +97,7 @@ public class ViewResolutionIntegrationTests {
@Test
public void groovyMarkupInvalidConfig() throws Exception {
this.thrown.expectMessage("In addition to a Groovy Markup Template view resolver ");
this.thrown.expectMessage("In addition to a Groovy markup view resolver ");
runTest(InvalidGroovyMarkupWebConfig.class);
}
@@ -192,7 +192,7 @@ public class ViewResolutionIntegrationTests {
@Override
public void configureViewResolvers(ViewResolverRegistry registry) {
registry.groovyMarkup();
registry.groovy();
}
@Bean
@@ -235,7 +235,7 @@ public class ViewResolutionIntegrationTests {
@Override
public void configureViewResolvers(ViewResolverRegistry registry) {
registry.groovyMarkup();
registry.groovy();
}
}

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

@@ -170,14 +170,14 @@ public class ViewResolverRegistryTests {
@Test
public void groovyMarkup() {
this.registry.groovyMarkup().prefix("/").suffix(".groovy").cache(true);
this.registry.groovy().prefix("/").suffix(".groovy").cache(true);
GroovyMarkupViewResolver resolver = checkAndGetResolver(GroovyMarkupViewResolver.class);
checkPropertyValues(resolver, "prefix", "/", "suffix", ".groovy", "cacheLimit", 1024);
}
@Test
public void groovyMarkupDefaultValues() {
this.registry.groovyMarkup();
this.registry.groovy();
GroovyMarkupViewResolver resolver = checkAndGetResolver(GroovyMarkupViewResolver.class);
checkPropertyValues(resolver, "prefix", "", "suffix", ".tpl");
}

2
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
View File

@@ -25,7 +25,7 @@
<mvc:tiles />
<mvc:freemarker />
<mvc:velocity />
<mvc:groovy-markup />
<mvc:groovy />
</mvc:view-resolvers>
<mvc:tiles check-refresh="true">

4
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
View File

@@ -12,7 +12,7 @@
<mvc:tiles />
<mvc:freemarker prefix="freemarker-" suffix=".freemarker" view-names="my*,*Report" />
<mvc:velocity cache-views="false" />
<mvc:groovy-markup />
<mvc:groovy />
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
<ref bean="customResolver" />
</mvc:view-resolvers>
@@ -31,7 +31,7 @@
<mvc:velocity resource-loader-path="/test" />
<mvc:groovy-markup resource-loader-path="/test" />
<mvc:groovy-markup resource-loader-path="/test" cache-templates="false" auto-indent="true" />
</beans>