Merge branch '2.5.x'

This commit is contained in:
Stephane Nicoll 2021-11-05 13:45:01 +01:00
commit 11a5055b8f

View File

@ -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() {