From 79c8a9e2b059af3da7652f67a06691b71941ede2 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Mon, 18 May 2020 13:44:12 -0400
Subject: [PATCH] Fix AbstractTestBinder

---
 .../stream/binder/AbstractTestBinder.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 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 f6e24e141..6ac6de5ed 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
@@ -19,7 +19,10 @@ package org.springframework.cloud.stream.binder;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.springframework.integration.channel.AbstractSubscribableChannel;
 import org.springframework.messaging.MessageChannel;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Abstract class that adds test support for {@link Binder}.
@@ -83,15 +86,15 @@ public abstract class AbstractTestBinder<C extends AbstractBinder<MessageChannel
 	 * org.springframework.cloud.stream.binding.MessageConverterConfigurer
 	 */
 	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(..)");
-//		}
+		if (messageChannel instanceof AbstractSubscribableChannel
+				&& !properties.isUseNativeDecoding()) {
+			Assert.isTrue(
+					!CollectionUtils
+							.isEmpty(((AbstractSubscribableChannel) messageChannel)
+									.getInterceptors()),
+					"'messageChannel' appears to be misconfigured. "
+							+ "Consider creating channel via AbstractBinderTest.createBindableChannel(..)");
+		}
 	}
 
 }