From 73f0fc38a6cce5b06d2bd3c1d2ef8a934223972d Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Mon, 13 Nov 2017 16:20:47 -0500
Subject: [PATCH] Relax Consumer channel binding in AbstractTestBinder

When native decoding is enabled on the consumer, relax the requirement
for using AbstractBinderTest.createBindableChannel(..)

Fixes #1137
Resolves #1138
---
 .../cloud/stream/binder/AbstractTestBinder.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
index 1cab5e15e..46f8e6041 100644
--- a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
+++ b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractTestBinder.java
@@ -43,7 +43,7 @@ public abstract class AbstractTestBinder<C extends AbstractBinder<MessageChannel
 	@Override
 	public Binding<MessageChannel> bindConsumer(String name, String group, MessageChannel moduleInputChannel,
 			CP properties) {
-		this.checkChannelIsConfigured(moduleInputChannel);
+		this.checkChannelIsConfigured(moduleInputChannel, properties);
 		queues.add(name);
 		return binder.bindConsumer(name, group, moduleInputChannel, properties);
 	}
@@ -79,8 +79,8 @@ public abstract class AbstractTestBinder<C extends AbstractBinder<MessageChannel
 	 * methods was properly configured (i.e., interceptors, converters etc).
 	 * see org.springframework.cloud.stream.binding.MessageConverterConfigurer
 	 */
-	private void checkChannelIsConfigured(MessageChannel messageChannel) {
-		if (messageChannel instanceof AbstractSubscribableChannel){
+	private void checkChannelIsConfigured(MessageChannel messageChannel, CP properties) {
+		if (messageChannel instanceof AbstractSubscribableChannel && !properties.isUseNativeDecoding()){
 			Assert.isTrue(!CollectionUtils.isEmpty(((AbstractSubscribableChannel)messageChannel).getChannelInterceptors()),
 					"'messageChannel' appears to be misconfigured. Consider creating channel via AbstractBinderTest.createBindableChannel(..)");
 		}