diff --git a/docs/src/main/asciidoc/verifier_contract.adoc b/docs/src/main/asciidoc/verifier_contract.adoc
index 8301317b46..9c23c7837f 100644
--- a/docs/src/main/asciidoc/verifier_contract.adoc
+++ b/docs/src/main/asciidoc/verifier_contract.adoc
@@ -1139,7 +1139,7 @@ include::{samples_url}/producer_webflux/src/test/java/com/example/BeerRestBase.j
// your tests go here
// in this config class you define all controllers and mocked services
- include::{samples_url}/producer_webflux/src/test/java/com/example/BeerRestBase.java[tags=config,indent=0]
+include::{samples_url}/producer_webflux/src/test/java/com/example/BeerRestBase.java[tags=config,indent=0]
}
----
diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml
index 8ffe3ed321..2a84442dd7 100644
--- a/samples/standalone/dsl/http-client/pom.xml
+++ b/samples/standalone/dsl/http-client/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml
index d9e913d755..f2cf0bc565 100644
--- a/samples/standalone/pact/pact-http-client/pom.xml
+++ b/samples/standalone/pact/pact-http-client/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml
index cfe99c5869..9b28fee51a 100644
--- a/samples/standalone/yml/http-client/pom.xml
+++ b/samples/standalone/yml/http-client/pom.xml
@@ -13,14 +13,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
UTF-8
1.8
- Finchley.BUILD-SNAPSHOT
+ 2.0.3.RELEASE
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
index cb3d4456ae..9b9c0000e6 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
@@ -28,7 +28,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
index 5f1572451d..fe0933073e 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
@@ -28,7 +28,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
index cad5480328..784986df59 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
@@ -28,7 +28,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
index e799171efa..f645fb0d56 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
@@ -28,7 +28,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
index c46b999596..801cb2ecb5 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
@@ -28,7 +28,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.0.3.RELEASE
+ 2.0.4.RELEASE
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy
index caa431b732..7cdb9f9059 100755
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/TestGenerator.groovy
@@ -20,6 +20,7 @@ import java.nio.charset.StandardCharsets
import java.nio.file.Path
import java.util.concurrent.atomic.AtomicInteger
+import groovy.transform.CompileStatic
import groovy.transform.PackageScope
import org.apache.commons.logging.Log
import org.apache.commons.logging.LogFactory
@@ -39,14 +40,16 @@ import static org.springframework.cloud.contract.verifier.util.NamesUtil.beforeL
import static org.springframework.cloud.contract.verifier.util.NamesUtil.convertIllegalPackageChars
import static org.springframework.cloud.contract.verifier.util.NamesUtil.directoryToPackage
import static org.springframework.cloud.contract.verifier.util.NamesUtil.toLastDot
+
/**
* @author Jakub Kubrynski, codearte.io
*/
+@CompileStatic
class TestGenerator {
- private static final Log log = LogFactory.getLog(TestGenerator)
private static final String DEFAULT_CLASS_PREFIX = "ContractVerifier"
private static final String DEFAULT_TEST_PACKAGE = "org.springframework.cloud.contract.verifier.tests"
+ private static final Log log = LogFactory.getLog(TestGenerator)
private final ContractVerifierConfigProperties configProperties
private AtomicInteger counter = new AtomicInteger()
@@ -105,7 +108,7 @@ class TestGenerator {
}
}
- private String relativizeContractPath(Map.Entry> entry) {
+ private String relativizeContractPath(Map.Entry> entry) {
Path relativePath = configProperties.contractsDslDir.toPath().relativize(entry.getKey())
if (StringUtils.isEmpty(relativePath.toString())) {
return DEFAULT_CLASS_PREFIX
@@ -116,7 +119,7 @@ class TestGenerator {
private void processIncludedDirectory(
final String includedDirectoryRelativePath, Collection contracts, final String basePackageNameForClass) {
if (log.isDebugEnabled()) {
- log.debug("Collected contracts with metadata ${contracts}")
+ log.debug("Collected contracts with metadata ${contracts} relative path is [${includedDirectoryRelativePath}]")
}
if (contracts.size()) {
def className = afterLast(includedDirectoryRelativePath.toString(), File.separator) + resolveNameSuffix()
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilder.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilder.groovy
index 1f99951cf7..5b6b5cb61b 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilder.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilder.groovy
@@ -18,10 +18,12 @@ package org.springframework.cloud.contract.verifier.builder
import groovy.transform.CompileStatic
import groovy.transform.PackageScope
+import org.apache.commons.logging.Log
+import org.apache.commons.logging.LogFactory
-import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
import org.springframework.cloud.contract.verifier.util.NamesUtil
+import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
/**
* Builds a class. Adds all the imports, static imports etc.
@@ -34,6 +36,8 @@ import org.springframework.cloud.contract.verifier.util.NamesUtil
@PackageScope
class ClassBuilder {
+ private static final Log log = LogFactory.getLog(ClassBuilder)
+
private static final String SEPARATOR = "_REPLACEME_"
private final String className
@@ -73,11 +77,15 @@ class ClassBuilder {
}
protected static String retrieveBaseClass(ContractVerifierConfigProperties properties, String includedDirectoryRelativePath) {
+ String contractPathAsPackage = includedDirectoryRelativePath.replace(File.separator, ".")
String contractPackage = includedDirectoryRelativePath.replace(File.separator, SEPARATOR)
// package mapping takes super precedence
if (properties.baseClassMappings) {
Map.Entry mapping = properties.baseClassMappings.find { String pattern, String fqn ->
- return contractPackage.matches(pattern)
+ return contractPathAsPackage.matches(pattern)
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Matching pattern for contract package [${contractPathAsPackage}] with setup ${properties.baseClassMappings} is [${mapping}]")
}
if (mapping) {
return mapping.value
diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy
index ff29a72e22..35ac89d92e 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy
@@ -40,7 +40,11 @@ class HandlebarsJsonPathHelper implements Helper> {
private Object returnObjectForTest(Object model, String jsonPath) {
String body = removeSurroundingQuotes(((TestSideRequestTemplateModel) model).rawBody).replace('\\"', '"')
DocumentContext documentContext = JsonPath.parse(body)
- return documentContext.read(jsonPath)
+ Object value = documentContext.read(jsonPath)
+ if (value instanceof Long) {
+ return String.valueOf(value) + "L"
+ }
+ return value
}
private String removeSurroundingQuotes(String body) {
diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
index fdb7a8b043..17f6b88339 100644
--- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
+++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java
@@ -16,6 +16,7 @@
package org.springframework.cloud.contract.verifier.messaging.stream;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -28,6 +29,7 @@ import org.springframework.cloud.stream.test.binder.MessageCollector;
import org.springframework.context.ApplicationContext;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
+import org.springframework.util.StringUtils;
/**
* @author Marcin Grzejszczak
@@ -54,7 +56,7 @@ public class StreamStubMessages implements MessageVerifier> {
public void send(Message message, String destination) {
try {
MessageChannel messageChannel = this.context
- .getBean(resolvedDestination(destination), MessageChannel.class);
+ .getBean(resolvedDestination(destination, DefaultChannels.OUTPUT), MessageChannel.class);
messageChannel.send(message);
}
catch (Exception e) {
@@ -68,7 +70,7 @@ public class StreamStubMessages implements MessageVerifier> {
public Message receive(String destination, long timeout, TimeUnit timeUnit) {
try {
MessageChannel messageChannel = this.context
- .getBean(resolvedDestination(destination), MessageChannel.class);
+ .getBean(resolvedDestination(destination, DefaultChannels.INPUT), MessageChannel.class);
return this.messageCollector.forChannel(messageChannel).poll(timeout, timeUnit);
}
catch (Exception e) {
@@ -78,10 +80,11 @@ public class StreamStubMessages implements MessageVerifier> {
}
}
- private String resolvedDestination(String destination) {
+ private String resolvedDestination(String destination, DefaultChannels defaultChannel) {
try {
BindingServiceProperties channelBindingServiceProperties = this.context
.getBean(BindingServiceProperties.class);
+ Map channels = new HashMap<>();
for (Map.Entry entry : channelBindingServiceProperties
.getBindings().entrySet()) {
if (destination.equals(entry.getValue().getDestination())) {
@@ -89,9 +92,24 @@ public class StreamStubMessages implements MessageVerifier> {
log.debug("Found a channel named [{}] with destination [{}]",
entry.getKey(), destination);
}
- return entry.getKey();
+ channels.put(entry.getKey().toLowerCase(), destination);
}
}
+ if (channels.size() == 1) {
+ return channels.keySet().iterator().next();
+ } else if (channels.size() > 0) {
+ if (log.isDebugEnabled()) {
+ log.debug("Found following channels [{}] for destination [{}]. "
+ + "Will pick the one that matches the default channel name or the first one if none is matching",
+ channels, destination);
+ }
+ String defaultChannelName = channels.get(defaultChannel.name().toLowerCase());
+ String matchingChannelName = StringUtils.hasText(defaultChannelName) ? defaultChannel.name().toLowerCase() : channels.keySet().iterator().next();
+ if (log.isDebugEnabled()) {
+ log.debug("Picked channel name is [{}]", matchingChannelName);
+ }
+ return matchingChannelName;
+ }
} catch (Exception e) {
log.error("Exception took place while trying to resolve the destination. Will assume the name [" + destination + "]", e);
}
@@ -109,3 +127,8 @@ public class StreamStubMessages implements MessageVerifier> {
}
}
+
+
+enum DefaultChannels {
+ INPUT, OUTPUT
+}
\ No newline at end of file
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilderSpec.groovy
index 5c7020876e..7181fe45c3 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilderSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ClassBuilderSpec.groovy
@@ -1,5 +1,7 @@
package org.springframework.cloud.contract.verifier.builder
+import spock.lang.Issue
+
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import spock.lang.Specification
@@ -49,6 +51,16 @@ class ClassBuilderSpec extends Specification {
ClassBuilder.retrieveBaseClass(props, contractRelativeFolder) == 'com.example.base.SuperClass'
}
+ @Issue("701")
+ def "should match base class when mapping regex has multiple folders"() {
+ given:
+ ContractVerifierConfigProperties props = new ContractVerifierConfigProperties(
+ baseClassMappings: ['.*bar.baz.some.*' : 'com.example.base.SuperClass'])
+ String contractRelativeFolder = 'foo/bar/baz/some/package'.split("/").join(File.separator)
+ expect:
+ ClassBuilder.retrieveBaseClass(props, contractRelativeFolder) == 'com.example.base.SuperClass'
+ }
+
def "should return the first matching base class when provided mapping doesn't match"() {
given:
ContractVerifierConfigProperties props = new ContractVerifierConfigProperties(
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
index 7d68656ffc..fcca42324b 100644
--- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
@@ -491,6 +491,58 @@ DocumentContext parsedJson = JsonPath.parse(json);
"JaxRsClientJUnitMethodBodyBuilder" | { Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl, properties) }
}
+ @Issue("#702")
+ def "should generate proper type for large numbers [#methodBuilderName]"() {
+ given:
+ Contract contractDsl = Contract.make {
+ request {
+ method 'PUT'
+ urlPath '/example/create'
+ headers {
+ contentType applicationJson()
+ }
+ body(
+ [
+ "name" : $(consumer(~/.+/), producer("string-1")),
+ "updatedTs" : $(consumer(~/\d{13}/), producer(1531916906000L)),
+ "isDisabled": $(consumer(regex(anyBoolean())), producer(true))
+ ]
+ )
+ }
+
+ response {
+ status 200
+ headers {
+ contentType applicationJsonUtf8()
+ }
+ body(
+ [
+ "id" : $(consumer(2222L), producer(~/\d+/)),
+ "name" : fromRequest().body("name"),
+ "updatedTs" : fromRequest().body("updatedTs"),
+ "isDisabled": fromRequest().body("isDisabled")
+ ]
+ )
+ }
+ }
+ MethodBodyBuilder builder = methodBuilder(contractDsl)
+ BlockBuilder blockBuilder = new BlockBuilder(" ")
+ when:
+ builder.appendTo(blockBuilder)
+ then:
+ String test = blockBuilder.toString()
+ SyntaxChecker.tryToCompileWithoutCompileStatic(methodBuilderName, test)
+ test.contains('''assertThatJson(parsedJson).field("['updatedTs']").isEqualTo(1531916906000L)''')
+ and:
+ stubMappingIsValidWireMockStub(contractDsl)
+ where:
+ methodBuilderName | methodBuilder
+ "MockMvcSpockMethodBuilder" | { Contract dsl -> new MockMvcSpockMethodRequestProcessingBodyBuilder(dsl, properties) }
+ "MockMvcJUnitMethodBuilder" | { Contract dsl -> new MockMvcJUnitMethodBodyBuilder(dsl, properties) }
+ "JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl, properties) }
+ "JaxRsClientJUnitMethodBodyBuilder" | { Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl, properties) }
+ }
+
@Issue("#465")
def "should work for '/' url for [#methodBuilderName]"() {
given:
diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessagesSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessagesSpec.groovy
new file mode 100644
index 0000000000..8cfcd09210
--- /dev/null
+++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessagesSpec.groovy
@@ -0,0 +1,109 @@
+package org.springframework.cloud.contract.verifier.messaging.stream
+
+import spock.lang.Issue
+import spock.lang.Specification
+
+import org.springframework.cloud.stream.config.BindingProperties
+import org.springframework.cloud.stream.config.BindingServiceProperties
+import org.springframework.cloud.stream.test.binder.MessageCollector
+import org.springframework.context.ApplicationContext
+import org.springframework.messaging.MessageChannel
+
+/**
+ * @author Marcin Grzejszczak
+ */
+class StreamStubMessagesSpec extends Specification {
+
+ @Issue("694")
+ def "should resolve input channel if input and output have same destination and receive is called"() {
+ given:
+ ApplicationContext applicationContext = Mock(ApplicationContext)
+ BindingServiceProperties properties = new BindingServiceProperties(
+ bindings: [
+ input: new BindingProperties(destination: "verifications"),
+ output: new BindingProperties(destination: "verifications"),
+ ]
+ )
+ MessageCollector collector = Stub(MessageCollector)
+ and:
+ applicationContext.getBean(BindingServiceProperties) >> properties
+ applicationContext.getBean(MessageCollector) >> collector
+ and:
+ StreamStubMessages messages = new StreamStubMessages(applicationContext)
+ when:
+ messages.receive("verifications")
+ then:
+ 1 * applicationContext.getBean("input", MessageChannel) >> null
+ }
+
+ @Issue("694")
+ def "should resolve output channel if input and output have same destination and send is called"() {
+ given:
+ ApplicationContext applicationContext = Mock(ApplicationContext)
+ BindingServiceProperties properties = new BindingServiceProperties(
+ bindings: [
+ input: new BindingProperties(destination: "verifications"),
+ output: new BindingProperties(destination: "verifications"),
+ ]
+ )
+ MessageCollector collector = Stub(MessageCollector)
+ MessageChannel channel = Stub(MessageChannel)
+ and:
+ applicationContext.getBean(BindingServiceProperties) >> properties
+ applicationContext.getBean(MessageCollector) >> collector
+ and:
+ StreamStubMessages messages = new StreamStubMessages(applicationContext)
+ when:
+ messages.send("foo", [:], "verifications")
+ then:
+ 1 * applicationContext.getBean("output", MessageChannel) >> channel
+ }
+
+ def "should resolve channel via destination for send and receive"() {
+ given:
+ ApplicationContext applicationContext = Mock(ApplicationContext)
+ BindingServiceProperties properties = new BindingServiceProperties(
+ bindings: [
+ foo: new BindingProperties(destination: "verifications")
+ ]
+ )
+ MessageCollector collector = Stub(MessageCollector)
+ MessageChannel channel = Stub(MessageChannel)
+ and:
+ applicationContext.getBean(BindingServiceProperties) >> properties
+ applicationContext.getBean(MessageCollector) >> collector
+ and:
+ StreamStubMessages messages = new StreamStubMessages(applicationContext)
+ when:
+ messageInteraction(messages)
+ then:
+ 1 * applicationContext.getBean("foo", MessageChannel) >> channel
+ where:
+ messageInteraction << [ { StreamStubMessages stream -> stream.send("foo", [:], "verifications")},
+ { StreamStubMessages stream -> stream.receive("verifications")}]
+ }
+
+ def "should resolve channel via channel name for send and receive"() {
+ given:
+ ApplicationContext applicationContext = Mock(ApplicationContext)
+ BindingServiceProperties properties = new BindingServiceProperties(
+ bindings: [
+ verifications: new BindingProperties(destination: "bar")
+ ]
+ )
+ MessageCollector collector = Stub(MessageCollector)
+ MessageChannel channel = Stub(MessageChannel)
+ and:
+ applicationContext.getBean(BindingServiceProperties) >> properties
+ applicationContext.getBean(MessageCollector) >> collector
+ and:
+ StreamStubMessages messages = new StreamStubMessages(applicationContext)
+ when:
+ messageInteraction(messages)
+ then:
+ 1 * applicationContext.getBean("verifications", MessageChannel) >> channel
+ where:
+ messageInteraction << [ { StreamStubMessages stream -> stream.send("foo", [:], "verifications")},
+ { StreamStubMessages stream -> stream.receive("verifications")}]
+ }
+}
diff --git a/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
index 71f804412d..abcf7f3a9b 100644
--- a/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
+++ b/tests/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
@@ -40,7 +40,7 @@ import javax.inject.Inject
@DirtiesContext
@SpringBootTest(properties = "debug=true")
@AutoConfigureMessageVerifier
-public class StreamMessagingApplicationSpec extends Specification {
+class StreamMessagingApplicationSpec extends Specification {
// ALL CASES
@Inject MessageVerifier> contractVerifierMessaging