Merge branch '2.1.x' into 2.2.x

Closes gh-19096
spring-projects · Nov 22, 2019 · 945ce2e · 945ce2e
2 parents 58bfbb9 + a38e6b4
commit 945ce2e
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/...oke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java b/...oke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java
@@ -17,7 +17,10 @@
 package smoketest.liquibase;
 
 import java.net.ConnectException;
+import java.util.Locale;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -30,6 +33,19 @@
 @ExtendWith(OutputCaptureExtension.class)
 class SampleLiquibaseApplicationTests {
 
+	private Locale defaultLocale;
+
+	@BeforeEach
+	void init() throws SecurityException {
+		this.defaultLocale = Locale.getDefault();
+		Locale.setDefault(Locale.ENGLISH);
+	}
+
+	@AfterEach
+	void restoreLocale() {
+		Locale.setDefault(this.defaultLocale);
+	}
+
 	@Test
 	void testDefaultSettings(CapturedOutput output) throws Exception {
 		try {