From 5dc29af8aeb26461b386f090916b3aa173c0d94d Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Tue, 4 Aug 2020 19:57:39 +0200
Subject: [PATCH] Add test to validate GH-573 from s-c-function

---
 .../stream/function/StreamBridgeTests.java    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java
index 7c74e2bff..e1b2ddba4 100644
--- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java
+++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.stream.function;
 
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.junit.Before;
@@ -49,6 +50,24 @@ public class StreamBridgeTests {
 		System.clearProperty("spring.cloud.function.definition");
 	}
 
+
+	//see https://github.com/spring-cloud/spring-cloud-function/issues/573 for more details
+	@Test
+	public void testBridgeActivationWhenFunctionDefinitionIsPresent() {
+		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
+				.getCompleteConfiguration(SimpleConfiguration.class))
+						.web(WebApplicationType.NONE).run(
+								"--spring.cloud.function.definition=echo;uppercase",
+								"--spring.jmx.enabled=false")) {
+
+			StreamBridge bridge = context.getBean(StreamBridge.class);
+			bridge.send("echo-in-0", "hello foo");
+
+			OutputDestination outputDestination = context.getBean(OutputDestination.class);
+			assertThat(new String(outputDestination.receive(100, "echo-out-0").getPayload())).isEqualTo("hello foo");
+		}
+	}
+
 	@Test(expected = NoSuchBeanDefinitionException.class)
 	public void testNoBridgeIfNoSourcePropertyDefined() {
 
@@ -127,7 +146,7 @@ public class StreamBridgeTests {
 	}
 
 	@Test
-	public void testSendingMessageToOutputOfExistingSupplier() {
+	public void testSendingMessageToOutputOfExistingSupplier() throws Exception {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration
 				.getCompleteConfiguration(TestConfiguration.class))
 						.web(WebApplicationType.NONE).run("--spring.cloud.stream.source=supplier;foo",
@@ -201,6 +220,20 @@ public class StreamBridgeTests {
 		}
 	}
 
+	@EnableAutoConfiguration
+	public static class SimpleConfiguration {
+
+		@Bean
+		public Function<String, String> echo() {
+			return v -> v;
+		}
+
+		@Bean
+		public Function<String, String> uppercase() {
+			return v -> v.toUpperCase();
+		}
+	}
+
 	@EnableAutoConfiguration
 	public static class IntegrationFlowConfiguration {