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 34b0b4d4b2b..9d0809e03e8 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 @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.function.Supplier; import javax.validation.ConstraintViolation; import javax.validation.Validator; @@ -41,8 +42,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; */ class MessageSourceMessageInterpolatorIntegrationTests { - private final Validator validator = buildValidator(); - @NotNull private String defaultMessage; @@ -117,12 +116,15 @@ class MessageSourceMessageInterpolatorIntegrationTests { } private List validate(String property) { - List messages = new ArrayList<>(); - Set> constraints = this.validator.validateProperty(this, property); - for (ConstraintViolation constraint : constraints) { - messages.add(constraint.getMessage()); - } - return messages; + return withEnglishLocale(() -> { + Validator validator = buildValidator(); + List messages = new ArrayList<>(); + Set> constraints = validator.validateProperty(this, property); + for (ConstraintViolation constraint : constraints) { + messages.add(constraint.getMessage()); + } + return messages; + }); } private static Validator buildValidator() { @@ -140,4 +142,15 @@ class MessageSourceMessageInterpolatorIntegrationTests { } } + private static T withEnglishLocale(Supplier supplier) { + Locale defaultLocale = Locale.getDefault(); + try { + Locale.setDefault(Locale.ENGLISH); + return supplier.get(); + } + finally { + Locale.setDefault(defaultLocale); + } + } + }