From 454de0bfd7cfc5b0ccc3237b8165dea345dbd05d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 25 Jun 2018 12:01:17 +0100
Subject: [PATCH] Polish

---
 .../boot/actuate/endpoint/AbstractEndpointTests.java       | 7 ++++++-
 .../boot/actuate/endpoint/LiquibaseEndpointTests.java      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
index 73e0e76ee87..cf29cecf1dc 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,9 +66,14 @@ public abstract class AbstractEndpointTests<T extends Endpoint<?>> {
 	public void setup() {
 		this.context = new AnnotationConfigApplicationContext();
 		this.context.register(JacksonAutoConfiguration.class, this.configClass);
+		configureEnvironment(this.context);
 		this.context.refresh();
 	}
 
+	protected void configureEnvironment(AnnotationConfigApplicationContext context) {
+
+	}
+
 	@After
 	public void close() {
 		if (this.context != null) {
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 4379cb14706..fe15592b461 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
@@ -46,6 +46,12 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 				"endpoints.liquibase");
 	}
 
+	@Override
+	protected void configureEnvironment(AnnotationConfigApplicationContext context) {
+		EnvironmentTestUtils.addEnvironment(context,
+				"spring.datasource.generate-unique-name=true");
+	}
+
 	@Test
 	public void invoke() throws Exception {
 		DataSource dataSource = this.context.getBean(DataSource.class);
@@ -70,7 +76,6 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 		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);
 		this.context.refresh();