root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish "Fix tests on non English systems" 

See gh-27887
This commit is contained in:
Stephane Nicoll 2021-09-08 08:07:09 +02:00
parent 32e51966dd
commit e10ebb17e0
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/validation/MessageSourceMessageInterpolatorIntegrationTests.java
View File

@ -20,13 +20,12 @@ 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;
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;
@ -70,22 +69,6 @@ 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");
@ -133,12 +116,15 @@ class MessageSourceMessageInterpolatorIntegrationTests {
}
private List<String> validate(String property) {
List<String> messages = new ArrayList<>();
Set<ConstraintViolation<Object>> constraints = this.validator.validateProperty(this, property);
for (ConstraintViolation<Object> constraint : constraints) {
messages.add(constraint.getMessage());
}
return messages;
return withEnglishLocale(() -> {
Validator validator = buildValidator();
List<String> messages = new ArrayList<>();
Set<ConstraintViolation<Object>> constraints = validator.validateProperty(this, property);
for (ConstraintViolation<Object> constraint : constraints) {
messages.add(constraint.getMessage());
}
return messages;
});
}
private static Validator buildValidator() {
@ -156,4 +142,15 @@ class MessageSourceMessageInterpolatorIntegrationTests {
}
}
private static <T> T withEnglishLocale(Supplier<T> supplier) {
Locale defaultLocale = Locale.getDefault();
try {
Locale.setDefault(Locale.ENGLISH);
return supplier.get();
}
finally {
Locale.setDefault(defaultLocale);
}
}
}