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

Add FreeMarkerProperties instead of raw Environment access

Browse Source 
It's better for readability and tooling. Changed
templateLoaderPath -> path (simpler and unlikely to clash)
This commit is contained in:
Dave Syer
2014-05-15 13:10:19 +01:00
parent 6a10df0933
commit d2112e27a3
4 changed files with 218 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
View File

@@ -72,14 +72,14 @@ public class FreeMarkerAutoConfigurationTests {
@Test(expected = BeanCreationException.class)
public void nonExistentTemplateLocation() {
registerAndRefreshContext("spring.freemarker.templateLoaderPath:"
registerAndRefreshContext("spring.freemarker.path:"
+ "classpath:/does-not-exist/");
}
@Test
public void emptyTemplateLocation() {
new File("target/test-classes/templates/empty-directory").mkdir();
registerAndRefreshContext("spring.freemarker.templateLoaderPath:"
registerAndRefreshContext("spring.freemarker.path:"
+ "classpath:/templates/empty-directory/");
}
@@ -89,7 +89,7 @@ public class FreeMarkerAutoConfigurationTests {
MockHttpServletResponse response = render("home");
String result = response.getContentAsString();
assertThat(result, containsString("home"));
assertThat(response.getContentType(), equalTo("text/html"));
assertThat(response.getContentType(), equalTo("text/html;charset=UTF-8"));
}
@Test
@@ -98,7 +98,7 @@ public class FreeMarkerAutoConfigurationTests {
MockHttpServletResponse response = render("home");
String result = response.getContentAsString();
assertThat(result, containsString("home"));
assertThat(response.getContentType(), equalTo("application/json"));
assertThat(response.getContentType(), equalTo("application/json;charset=UTF-8"));
}
@Test
@@ -119,7 +119,7 @@ public class FreeMarkerAutoConfigurationTests {
@Test
public void customTemplateLoaderPath() throws Exception {
registerAndRefreshContext("spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
registerAndRefreshContext("spring.freemarker.path:classpath:/custom-templates/");
MockHttpServletResponse response = render("custom");
String result = response.getContentAsString();
assertThat(result, containsString("custom"));