SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added ExecutionProperty resolution for sentTo; fixes #440

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-10-19 11:16:36 +02:00
parent 5062ff5880
commit 6aa8910ae8
4 changed files with 610 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

843
docs/src/main/asciidoc/verifier_contract.adoc
View File

File diff suppressed because it is too large Load Diff

9
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnitMessagingMethodBodyBuilder.groovy
View File

@@ -119,7 +119,7 @@ class JUnitMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder {
@Override
protected void validateResponseHeadersBlock(BlockBuilder bb) {
bb.addLine("""ContractVerifierMessage response = contractVerifierMessaging.receive("${outputMessage.sentTo.serverValue}");""")
bb.addLine("""ContractVerifierMessage response = contractVerifierMessaging.receive("${sentToValue(outputMessage.sentTo.serverValue)}");""")
bb.addLine("""assertThat(response).isNotNull();""")
outputMessage.headers?.executeForEachHeader { Header header ->
processHeaderElement(bb, header.name, header.serverValue instanceof NotToEscapePattern ?
@@ -128,6 +128,13 @@ class JUnitMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder {
}
}
private String sentToValue(Object sentTo) {
if (sentTo instanceof ExecutionProperty) {
return ((ExecutionProperty) sentTo).executionCommand
}
return '"' + sentTo.toString() + '"'
}
@Override
protected String getResponseAsString() {
return 'contractVerifierObjectMapper.writeValueAsString(response.getPayload())'

9
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockMessagingMethodBodyBuilder.groovy
View File

@@ -96,13 +96,20 @@ class SpockMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder {
@Override
protected void validateResponseCodeBlock(BlockBuilder bb) {
if (outputMessage) {
bb.addLine("""ContractVerifierMessage response = contractVerifierMessaging.receive('${outputMessage.sentTo.serverValue}')""")
bb.addLine("""ContractVerifierMessage response = contractVerifierMessaging.receive(${sentToValue(outputMessage.sentTo.serverValue)})""")
bb.addLine("""assert response != null""")
} else {
bb.addLine('noExceptionThrown()')
}
}
private String sentToValue(Object sentTo) {
if (sentTo instanceof ExecutionProperty) {
return ((ExecutionProperty) sentTo).executionCommand
}
return "'" + sentTo.toString() + "'"
}
@Override
protected void validateResponseHeadersBlock(BlockBuilder bb) {
outputMessage.headers?.executeForEachHeader { Header header ->

87
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy
View File

@@ -542,4 +542,91 @@ Contract.make {
stripped(test) == stripped(expectedMsg)
}
@Issue("440")
def "should generate tests with sentTo having a method execution for Spock"() {
given:
def contractDsl =
org.springframework.cloud.contract.spec.Contract.make {
label 'trigger_event'
input {
triggeredBy('requestIsCalled()')
}
outputMessage {
sentTo $(producer(execute("toString()")), consumer('topic.rateablequote'))
headers {
header('processId', value(producer(regex('[0-9]+')), consumer('123')))
}
body([
eventId: value(producer(regex('[0-9]+')), consumer('1'))
])
}
}
MethodBodyBuilder builder = new SpockMessagingMethodBodyBuilder(contractDsl, properties)
BlockBuilder blockBuilder = new BlockBuilder(" ")
when:
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
String expectedMsg =
'''
when:
requestIsCalled()
then:
ContractVerifierMessage response = contractVerifierMessaging.receive(toString())
assert response != null
response.getHeader('processId')?.toString() ==~ java.util.regex.Pattern.compile('[0-9]+')
and:
DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.payload))
assertThatJson(parsedJson).field("['eventId']").matches("[0-9]+")
'''
stripped(test) == stripped(expectedMsg)
}
@Issue("440")
def "should generate tests with sentTo having a method execution for JUnit"() {
given:
def contractDsl =
org.springframework.cloud.contract.spec.Contract.make {
label 'trigger_event'
input {
triggeredBy('requestIsCalled()')
}
outputMessage {
sentTo $(producer(execute("toString()")), consumer('topic.rateablequote'))
headers {
header('processId', value(producer(regex('[0-9]+')), consumer('123')))
}
body([
eventId: value(producer(regex('[0-9]+')), consumer('1'))
])
}
}
MethodBodyBuilder builder = new JUnitMessagingMethodBodyBuilder(contractDsl, properties)
BlockBuilder blockBuilder = new BlockBuilder(" ")
when:
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
String expectedMsg =
'''
// when:
requestIsCalled();
// then:
ContractVerifierMessage response = contractVerifierMessaging.receive(toString());
assertThat(response).isNotNull();
assertThat(response.getHeader("processId")).isNotNull();
assertThat(response.getHeader("processId").toString()).matches("[0-9]+");
// and:
DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
assertThatJson(parsedJson).field("['eventId']").matches("[0-9]+");
'''
stripped(test) == stripped(expectedMsg)
}
}