diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index f0ba8ffb2c..0629042ea2 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" } } @@ -49,10 +49,6 @@ test { } } -task wrapper(type: Wrapper) { - gradleVersion = '2.14' -} - task resolveDependencies { doLast { project.rootProject.allprojects.each { subProject -> diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index a0ddf7521b..dd2d04459d 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.0.BUILD-SNAPSHOT + 1.5.3.RELEASE diff --git a/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java index c7c9358873..817c2dc72f 100644 --- a/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java +++ b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java @@ -18,13 +18,20 @@ package com.example.sink; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.cloud.contract.stubrunner.StubTrigger; import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner; +import org.springframework.cloud.stream.messaging.Sink; +import org.springframework.integration.support.management.MessageChannelMetrics; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici */ @@ -36,8 +43,14 @@ public class MessageConsumedTests { @Autowired StubTrigger stubTrigger; + @Autowired + @Qualifier(Sink.INPUT) + SubscribableChannel input; + @Test public void testMessageConsumed() throws Exception { + int count = ((MessageChannelMetrics) input).getSendCount(); stubTrigger.trigger("sensor1"); + assertThat(((MessageChannelMetrics) input).getSendCount()).isEqualTo(count + 1); } } diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 3308258840..3d25eaaec9 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" classpath "io.rest-assured:rest-assured:3.0.2" classpath "io.rest-assured:spring-mock-mvc:3.0.2" @@ -84,10 +84,6 @@ test { } } -task wrapper(type: Wrapper) { - gradleVersion = '2.14' -} - clean.doFirst { delete "~/.m2/repository/com/example/stream-source-gradle" } diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index e11c1616e0..2a519d7a7f 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.0.BUILD-SNAPSHOT + 1.5.3.RELEASE