Merge branch '1.5.x'

Author: snicoll

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java

@@ -20,6 +20,7 @@
 import org.junit.Test;
 
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -48,18 +49,19 @@ public void invoke() throws Exception {
 
 	@Test
 	public void invokeWithCustomSchema() throws Exception {
+		this.context.close();
 		this.context = new AnnotationConfigApplicationContext();
 		TestPropertyValues.of("liquibase.default-schema=CUSTOMSCHEMA",
 				"spring.datasource.generate-unique-name=true",
 				"spring.datasource.schema=classpath:/db/create-custom-schema.sql")
 				.applyTo(this.context);
-		this.context.register(Config.class);
+		this.context.register(CustomSchemaConfig.class);
 		this.context.refresh();
 		assertThat(getEndpointBean().invoke()).hasSize(1);
 	}
 
 	@Configuration
-	@Import({ DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class })
+	@Import({ EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class })
 	public static class Config {
 
 		private final SpringLiquibase liquibase;
@@ -75,4 +77,21 @@ public LiquibaseEndpoint endpoint() {
 
 	}
 
+	@Configuration
+	@Import({ DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class })
+	public static class CustomSchemaConfig {
+
+		private final SpringLiquibase liquibase;
+
+		public CustomSchemaConfig(SpringLiquibase liquibase) {
+			this.liquibase = liquibase;
+		}
+
+		@Bean
+		public LiquibaseEndpoint endpoint() {
+			return new LiquibaseEndpoint(this.liquibase);
+		}
+
+	}
+
 }