Merge branch '1.1.x'

dsyer · dsyer · commit bba55bf4aecb · 2014-09-25T14:11:04.000+01:00
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -29,6 +29,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -163,6 +164,7 @@ public SpringSecurityDialect securityDialect() {
 
 	@Configuration
 	@ConditionalOnClass({ Servlet.class })
+	@ConditionalOnWebApplication
 	protected static class ThymeleafViewResolverConfiguration {
 
 		@Autowired
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java
@@ -16,6 +16,12 @@
 
 package org.springframework.boot.autoconfigure.thymeleaf;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.Collections;
 import java.util.Locale;
@@ -30,6 +36,7 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.support.RequestContext;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
@@ -38,18 +45,14 @@
 import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresolver.TemplateResolver;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Tests for {@link ThymeleafAutoConfiguration}.
  *
  * @author Dave Syer
  */
 public class ThymeleafAutoConfigurationTests {
 
-	private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+	private AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
 
 	@After
 	public void close() {
@@ -148,4 +151,32 @@ public void useDataDialect() throws Exception {
 		assertEquals("<html><body data-foo=\"bar\"></body></html>", result);
 	}
 
+	@Test
+	public void renderTemplate() throws Exception {
+		this.context.register(ThymeleafAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+		TemplateEngine engine = this.context.getBean(TemplateEngine.class);
+		Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
+		String result = engine.process("home", attrs);
+		assertEquals("<html><body>bar</body></html>", result);
+	}
+
+	@Test
+	public void renderNonWebAppTemplate() throws Exception {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				ThymeleafAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		assertEquals(0, context.getBeanNamesForType(ViewResolver.class).length);
+		try {
+			TemplateEngine engine = context.getBean(TemplateEngine.class);
+			Context attrs = new Context(Locale.UK, Collections.singletonMap("greeting", "Hello World"));
+			String result = engine.process("message", attrs);
+			assertThat(result, containsString("Hello World"));
+		}
+		finally {
+			context.close();
+		}
+	}
+	
 }
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTest.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTest.java
@@ -81,7 +81,8 @@ public void testBindingExceptionForMachineClient() throws Exception {
 				"http://localhost:" + this.port + "/bind", Map.class);
 		String resp = entity.getBody().toString();
 		assertThat(resp, containsString("Error count: 1"));
-		assertThat(resp, containsString("errors=[{codes="));
+		assertThat(resp, containsString("errors=[{"));
+		assertThat(resp, containsString("codes=["));
 		assertThat(resp, containsString("org.springframework.validation.BindException"));
 	}
 
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/home.html b/spring-boot-autoconfigure/src/test/resources/templates/home.html
@@ -0,0 +1 @@
+<html><body th:text="${foo}">Home</body></html>
diff --git a/spring-boot-autoconfigure/src/test/resources/templates/message.html b/spring-boot-autoconfigure/src/test/resources/templates/message.html
@@ -0,0 +1 @@
+<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ public void testBindingExceptionForMachineClient() throws Exception {`
`81`	`81`	`"http://localhost:" + this.port + "/bind", Map.class);`
`82`	`82`	`String resp = entity.getBody().toString();`
`83`	`83`	`assertThat(resp, containsString("Error count: 1"));`
`84`		`- assertThat(resp, containsString("errors=[{codes="));`
	`84`	`+ assertThat(resp, containsString("errors=[{"));`
	`85`	`+ assertThat(resp, containsString("codes=["));`
`85`	`86`	`assertThat(resp, containsString("org.springframework.validation.BindException"));`
`86`	`87`	`}`
`87`	`88`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<html><body th:text="${foo}">Home</body></html>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>`