mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.5.x'
This commit is contained in:
commit
11a5055b8f
@ -105,13 +105,6 @@ class MessageSourceAutoConfigurationTests {
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
void testBadEncoding() {
|
||||
// Bad encoding just means the messages are ignored
|
||||
this.contextRunner.withPropertyValues("spring.messages.encoding:rubbish")
|
||||
.run((context) -> assertThat(context.getMessage("foo", null, "blah", Locale.UK)).isEqualTo("blah"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Disabled("Expected to fail per gh-1075")
|
||||
void testMessageSourceFromPropertySourceAnnotation() {
|
||||
|
Loading…
Reference in New Issue
Block a user