This commit is contained in:
Stephane Nicoll 2017-10-02 18:44:58 +02:00
parent 114379e97a
commit fd478be5c3
2 changed files with 9 additions and 13 deletions

View File

@ -82,12 +82,10 @@ public class MessageSourceAutoConfigurationTests {
@Test
public void testBadEncoding() {
this.contextRunner.withPropertyValues("spring.messages.encoding:rubbish")
.run((context) -> {
// Bad encoding just means the messages are ignored
assertThat(context.getMessage("foo", null, "blah", Locale.UK))
.isEqualTo("blah");
});
this.contextRunner.withPropertyValues("spring.messages.encoding:rubbish")
.run((context) -> assertThat(context.getMessage(
"foo", null, "blah", Locale.UK)).isEqualTo("blah"));
}
@Test
@ -167,12 +165,10 @@ public class MessageSourceAutoConfigurationTests {
@Test
public void existingMessageSourceInParentIsIgnored() {
this.contextRunner.run((parent) -> {
this.contextRunner.withParent(parent)
this.contextRunner.run((parent) -> this.contextRunner.withParent(parent)
.withPropertyValues("spring.messages.basename:test/messages")
.run((context) -> assertThat(context.getMessage(
"foo", null, "Foo message", Locale.UK)).isEqualTo("bar"));
});
"foo", null, "Foo message", Locale.UK)).isEqualTo("bar")));
}
@Configuration

View File

@ -274,7 +274,7 @@ public class KafkaAutoConfigurationTests {
public void testKafkaTemplateRecordMessageConverters() {
this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
.run((context) -> {
KafkaTemplate kafkaTemplate = context.getBean(KafkaTemplate.class);
KafkaTemplate<?, ?> kafkaTemplate = context.getBean(KafkaTemplate.class);
assertThat(kafkaTemplate.getMessageConverter())
.isSameAs(context.getBean("myMessageConverter"));
});
@ -284,7 +284,7 @@ public class KafkaAutoConfigurationTests {
public void testConcurrentKafkaListenerContainerFactoryWithCustomMessageConverters() {
this.contextRunner.withUserConfiguration(MessageConverterConfiguration.class)
.run((context) -> {
ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = context
ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory = context
.getBean(ConcurrentKafkaListenerContainerFactory.class);
DirectFieldAccessor dfa = new DirectFieldAccessor(
kafkaListenerContainerFactory);