From 7736cb1dc55ee0c5b6ebdd53c5001494ec4bfe77 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 28 Jul 2017 11:43:28 +0200
Subject: [PATCH] Fix test so that it doesn't leave a datasource hanging around

Closes gh-9862
---
 .../endpoint/LiquibaseEndpointTests.java      | 26 ++++++++++++++-----
 .../resources/db/create-custom-schema.sql     |  1 -
 2 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 spring-boot-actuator/src/test/resources/db/create-custom-schema.sql

diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
index b1d6cbc700..23b6c42886 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
@@ -16,16 +16,20 @@
 
 package org.springframework.boot.actuate.endpoint;
 
+import javax.sql.DataSource;
+
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
 
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.jdbc.core.JdbcTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -50,16 +54,14 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 	public void invokeWithCustomSchema() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
 		EnvironmentTestUtils.addEnvironment(this.context,
-				"liquibase.default-schema=CUSTOMSCHEMA",
-				"spring.datasource.generate-unique-name=true",
-				"spring.datasource.schema=classpath:/db/create-custom-schema.sql");
-		this.context.register(Config.class);
+				"liquibase.default-schema=CUSTOMSCHEMA");
+		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,16 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 
 	}
 
+	@Configuration
+	@Import(Config.class)
+	public static class CustomSchemaConfig {
+
+		@Autowired
+		public void initializeSchema(DataSource dataSource) {
+			JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+			jdbcTemplate.execute("CREATE SCHEMA CUSTOMSCHEMA");
+		}
+
+	}
+
 }
diff --git a/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql b/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
deleted file mode 100644
index 469b79ad89..0000000000
--- a/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE SCHEMA CUSTOMSCHEMA;