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 1/2] 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;

From 5c13b8bf5033b2464b063b1d701b79556d29c3b4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 28 Jul 2017 11:59:15 +0200
Subject: [PATCH 2/2] Separate custom schema configuration for Liquibase test

Unfortunately, creating the schema in code did not offer the right
condition to reproduce the error scenario. This commit restore the
initial intent, but separating the configuration and cleaning the
created context properly.

See gh-9862
---
 .../endpoint/LiquibaseEndpointTests.java      | 25 +++++++++++--------
 .../resources/db/create-custom-schema.sql     |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)
 create 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 23b6c42886..2380079842 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,12 +16,10 @@
 
 package org.springframework.boot.actuate.endpoint;
 
-import javax.sql.DataSource;
-
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
 
-import org.springframework.beans.factory.annotation.Autowired;
+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.EnvironmentTestUtils;
@@ -29,7 +27,6 @@ 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;
 
@@ -52,9 +49,12 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 
 	@Test
 	public void invokeWithCustomSchema() throws Exception {
+		this.context.close();
 		this.context = new AnnotationConfigApplicationContext();
 		EnvironmentTestUtils.addEnvironment(this.context,
-				"liquibase.default-schema=CUSTOMSCHEMA");
+				"liquibase.default-schema=CUSTOMSCHEMA",
+				"spring.datasource.generate-unique-name=true",
+				"spring.datasource.schema=classpath:/db/create-custom-schema.sql");
 		this.context.register(CustomSchemaConfig.class);
 		this.context.refresh();
 		assertThat(getEndpointBean().invoke()).hasSize(1);
@@ -78,13 +78,18 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 	}
 
 	@Configuration
-	@Import(Config.class)
+	@Import({ DataSourceAutoConfiguration.class, LiquibaseAutoConfiguration.class })
 	public static class CustomSchemaConfig {
 
-		@Autowired
-		public void initializeSchema(DataSource dataSource) {
-			JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-			jdbcTemplate.execute("CREATE SCHEMA CUSTOMSCHEMA");
+		private final SpringLiquibase liquibase;
+
+		public CustomSchemaConfig(SpringLiquibase liquibase) {
+			this.liquibase = liquibase;
+		}
+
+		@Bean
+		public LiquibaseEndpoint endpoint() {
+			return new LiquibaseEndpoint(this.liquibase);
 		}
 
 	}
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
new file mode 100644
index 0000000000..469b79ad89
--- /dev/null
+++ b/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
@@ -0,0 +1 @@
+CREATE SCHEMA CUSTOMSCHEMA;