From 98f58caeaf218df1591465db2a6e2e9600c78d9f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 26 Feb 2018 22:22:21 -0800 Subject: [PATCH] Reset default local after test completes --- .../boot/bind/RelaxedConversionServiceTests.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedConversionServiceTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedConversionServiceTests.java index 706be69c5c4..7d51d2e17a4 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedConversionServiceTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedConversionServiceTests.java @@ -36,10 +36,16 @@ public class RelaxedConversionServiceTests { @Test public void conversionServiceShouldAlwaysUseLocaleEnglish() { - Locale.setDefault(new Locale("tr")); - TestEnum result = this.conversionService - .convert("accept-case-insensitive-properties", TestEnum.class); - assertThat(result.equals(TestEnum.ACCEPT_CASE_INSENSITIVE_PROPERTIES)); + Locale defaultLocale = Locale.getDefault(); + try { + Locale.setDefault(new Locale("tr")); + TestEnum result = this.conversionService + .convert("accept-case-insensitive-properties", TestEnum.class); + assertThat(result.equals(TestEnum.ACCEPT_CASE_INSENSITIVE_PROPERTIES)); + } + finally { + Locale.setDefault(defaultLocale); + } } enum TestEnum {