Updates to use new test-binder from stream

Fixes gh-259

pom.xml

@@ -31,8 +31,8 @@
 
 	<properties>
 		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-stream.version>4.0.0-M2</spring-cloud-stream.version>
-		<spring-cloud-function.version>4.0.0-M2</spring-cloud-function.version>
+		<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
 		<bintray.package>bus</bintray.package>
 	</properties>
 

spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java

@@ -48,7 +48,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 		"spring.cloud.stream.bindings.springCloudBusOutput.producer.errorChannelEnabled=true",
 		"logging.level.org.springframework.cloud.bus=TRACE", "spring.cloud.bus.id=app:1",
 		"spring.autoconfigure.exclude=org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration" })
-@Testcontainers(disabledWithoutDocker = true)
+@Testcontainers
 public class BusAmqpIntegrationTests {
 
 	@Container

spring-cloud-bus/pom.xml

@@ -71,11 +71,14 @@
 			<artifactId>spring-cloud-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!--<dependency>
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
+			<artifactId>spring-cloud-stream</artifactId>
+			<version>${spring-cloud-stream.version}</version>
+			<type>test-jar</type>
+			<classifier>test-binder</classifier>
 			<scope>test</scope>
-		</dependency>-->
+		</dependency>
 	</dependencies>
 
 </project>

spring-cloud-bus/src/test/java/org/springframework/cloud/bus/BusAutoConfigurationTests.java

@@ -21,7 +21,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.boot.SpringApplication;
@@ -35,6 +34,7 @@ import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 import org.springframework.cloud.bus.event.SentApplicationEvent;
 import org.springframework.cloud.bus.event.UnknownRemoteApplicationEvent;
 import org.springframework.cloud.context.refresh.ContextRefresher;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.cloud.stream.config.BindingProperties;
 import org.springframework.cloud.stream.config.BindingServiceProperties;
 import org.springframework.cloud.stream.function.StreamBridge;
@@ -50,7 +50,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@Ignore // see gh-259
 public class BusAutoConfigurationTests {
 
 	private ConfigurableApplicationContext context;
@@ -230,7 +229,7 @@ public class BusAutoConfigurationTests {
 	// see https://github.com/spring-cloud/spring-cloud-bus/issues/101
 	@Test
 	public void serviceMatcherIdIsConstantAfterRefresh() {
-		this.context = SpringApplication.run(new Class[] { RefreshConfig.class, },
+		this.context = SpringApplication.run(new Class[] { RefreshConfig.class, TestChannelBinderConfiguration.class },
 				new String[] { "--server.port=0", "--spring.main.allow-bean-definition-overriding=true" });
 		String originalServiceId = this.context.getBean(ServiceMatcher.class).getBusId();
 		this.context.getBean(ContextRefresher.class).refresh();
@@ -246,10 +245,7 @@ public class BusAutoConfigurationTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
-	@ImportAutoConfiguration({ BusAutoConfiguration.class, /*
-															 * TestSupportBinderAutoConfiguration
-															 * .class,
-															 */
+	@ImportAutoConfiguration({ BusAutoConfiguration.class, TestChannelBinderConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class })
 	protected static class OutboundMessageHandlerConfiguration {
 
@@ -282,10 +278,7 @@ public class BusAutoConfigurationTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration
-	@ImportAutoConfiguration({ BusAutoConfiguration.class, /*
-															 * TestSupportBinderAutoConfiguration
-															 * .class,
-															 */
+	@ImportAutoConfiguration({ BusAutoConfiguration.class, TestChannelBinderConfiguration.class,
 			PropertyPlaceholderAutoConfiguration.class })
 	protected static class InboundMessageHandlerConfiguration
 			implements ApplicationListener<RefreshRemoteApplicationEvent> {

spring-cloud-bus/src/test/java/org/springframework/cloud/bus/RefreshListenerIntegrationTests.java

@@ -27,6 +27,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -50,7 +52,6 @@ public class RefreshListenerIntegrationTests {
 	@MockBean
 	private BusBridge busBridge;
 
-	@Ignore // see gh-259
 	@Test
 	public void testEndpoint() {
 		System.out.println(rest.getForObject("/actuator", String.class));
@@ -62,6 +63,7 @@ public class RefreshListenerIntegrationTests {
 	}
 
 	@SpringBootApplication
+	@Import(TestChannelBinderConfiguration.class)
 	static class MyApp {
 
 	}