From c7eec5c45e4f44bdd5913e67c2683b0281b9b6e5 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 14 May 2018 16:14:11 +0200
Subject: [PATCH] Polish "Add liquibase test rollback on update property"

Closes gh-13159
---
 .../liquibase/LiquibaseProperties.java        |  1 +
 .../LiquibaseAutoConfigurationTests.java      | 23 ++++++++++---------
 .../appendix-application-properties.adoc      |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
index a8cf90613a..62f906c165 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
@@ -203,4 +203,5 @@ public class LiquibaseProperties {
 	public void setTestRollbackOnUpdate(boolean testRollbackOnUpdate) {
 		this.testRollbackOnUpdate = testRollbackOnUpdate;
 	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
index ca8d840b08..3e9b2490ea 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
@@ -178,6 +178,18 @@ public class LiquibaseAutoConfigurationTests {
 				}));
 	}
 
+	@Test
+	public void overrideTestRollbackOnUpdate() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+				.withPropertyValues(
+						"spring.liquibase.test-rollback-on-update:true")
+				.run((context) -> {
+					SpringLiquibase liquibase = context.getBean(SpringLiquibase.class);
+					assertThat(liquibase.isTestRollbackOnUpdate()).isTrue();
+				});
+	}
+
+
 	@Test
 	public void changeLogDoesNotExist() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -238,17 +250,6 @@ public class LiquibaseAutoConfigurationTests {
 				});
 	}
 
-	@Test
-	public void testRollbackOnUpdate() throws IOException {
-		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues(
-						"spring.liquibase.test-rollback-on-update:true")
-				.run((context) -> {
-					SpringLiquibase liquibase = context.getBean(SpringLiquibase.class);
-					assertThat(liquibase.isTestRollbackOnUpdate());
-				});
-	}
-
 	@Test
 	public void liquibaseDataSource() {
 		this.contextRunner.withUserConfiguration(LiquibaseDataSourceConfiguration.class,
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 74e200d077..c3f9721799 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -567,6 +567,7 @@ content into your application. Rather, pick only the properties that you need.
 	spring.liquibase.parameters.*= # Change log parameters.
 	spring.liquibase.password= # Login password of the database to migrate.
 	spring.liquibase.rollback-file= # File to which rollback SQL is written when an update is performed.
+	spring.liquibase.test-rollback-on-update=false # Whether rollback should be tested before update is performed.
 	spring.liquibase.url= # JDBC URL of the database to migrate. If not set, the primary configured data source is used.
 	spring.liquibase.user= # Login user of the database to migrate.