From 32e51966ddb2eb71858b0880525e52c6f0b66d22 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 7 Sep 2021 18:02:21 +0200 Subject: [PATCH] Fix tests on non English systems See gh-27887 --- ...ceMessageInterpolatorIntegrationTests.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java index 34b0b4d4b2..0bef3a0c9e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java @@ -25,6 +25,8 @@ import javax.validation.ConstraintViolation; import javax.validation.Validator; import javax.validation.constraints.NotNull; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.i18n.LocaleContextHolder; @@ -41,8 +43,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; */ class MessageSourceMessageInterpolatorIntegrationTests { - private final Validator validator = buildValidator(); - @NotNull private String defaultMessage; @@ -70,6 +70,22 @@ class MessageSourceMessageInterpolatorIntegrationTests { @NotNull(message = "\\\\{null}") private String escapeEscape; + private Locale defaultLocale; + + private Validator validator; + + @BeforeEach + void init() { + this.defaultLocale = Locale.getDefault(); + Locale.setDefault(Locale.ENGLISH); + this.validator = buildValidator(); + } + + @AfterEach + void restoreLocale() { + Locale.setDefault(this.defaultLocale); + } + @Test void defaultMessage() { assertThat(validate("defaultMessage")).containsExactly("must not be null");