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

Polish

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
View File

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

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
View File

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