From 4109949a9258ed7e352db67a6433128ffeccb47d Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Fri, 21 Aug 2015 12:16:54 -0700 Subject: [PATCH] Use the required autoconfiguration in test - Instead of using `@EnableAutoConfiguration` use `PropertyPlaceholderAutoConfiguration` which is all required for the property resolution --- .../cloud/stream/annotation/EnableModule.java | 3 +-- .../config/ChannelBindingAdapterConfigurationTests.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java index 6433af40b..5830dad29 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/EnableModule.java @@ -41,8 +41,7 @@ import org.springframework.context.annotation.Import; @Documented @Inherited @Configuration -@Import({ - ChannelBindingAdapterConfiguration.class, AggregateBuilderConfiguration.class, ModuleRegistrar.class}) +@Import({ChannelBindingAdapterConfiguration.class, AggregateBuilderConfiguration.class, ModuleRegistrar.class}) public @interface EnableModule { Class[] value() default {}; diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java index af14541e9..d07663db4 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ChannelBindingAdapterConfigurationTests.java @@ -26,9 +26,10 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.cloud.stream.adapter.ChannelBinding; import org.springframework.cloud.stream.adapter.ChannelBindingAdapter; @@ -133,8 +134,7 @@ public class ChannelBindingAdapterConfigurationTests { } @Configuration - @Import({ChannelBindingAdapterConfiguration.class}) - @EnableAutoConfiguration + @Import({ChannelBindingAdapterConfiguration.class, PropertyPlaceholderAutoConfiguration.class}) protected static class Empty { @Bean public LocalMessageChannelBinder binder() {