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

Make headers matches in generated jUnit code escape regex '\'s. (#592)

Browse Source 
+ Update tests to reflect desired behavior.
This commit is contained in:
Devon D'Apuzzo
2018-03-21 14:49:14 -05:00
committed by Marcin Grzejszczak
parent 811a28deb1
commit 1f51191327
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import org.springframework.cloud.contract.verifier.util.MapConverter
import java.util.regex.Pattern
import static groovy.json.StringEscapeUtils.escapeJava
import static org.springframework.cloud.contract.verifier.config.TestFramework.JUNIT
/**
@@ -220,7 +221,8 @@ class JUnitMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder {
}
protected String createHeaderComparison(Pattern headerValue) {
return "matches(\"$headerValue\");"
String escapedJavaHeader = escapeJava(headerValue.toString())
return "matches(\"$escapedJavaHeader\");"
}
private String patternText(Pattern value) {

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

@@ -527,7 +527,7 @@ Contract.make {
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
test.contains('assertThat(response.getHeader("processId").toString()).matches("\\d+");')
test.contains('assertThat(response.getHeader("processId").toString()).matches("\\\\d+");')
}
@@ -634,21 +634,12 @@ Contract.make {
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
String expectedMsg =
'''
// when:
requestIsCalled();
// then:
ContractVerifierMessage response = contractVerifierMessaging.receive("topic.rateablequote");
assertThat(response).isNotNull();
assertThat(response.getHeader("processId")).isNotNull();
assertThat(response.getHeader("processId").toString()).matches("[\\S\\s]+");
// and:
DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
assertThatJson(parsedJson).field("['eventId']").matches("[\\S\\s]+");
'''
stripped(test) == stripped(expectedMsg)
test.contains('ContractVerifierMessage response = contractVerifierMessaging.receive("topic.rateablequote")')
test.contains('assertThat(response).isNotNull()')
test.contains('assertThat(response.getHeader("processId")).isNotNull()')
test.contains('assertThat(response.getHeader("processId").toString()).matches("[\\\\S\\\\s]+")')
test.contains('DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()))')
test.contains('assertThatJson(parsedJson).field("[\'eventId\']").matches("[\\\\S\\\\s]+")')
}
@Issue("336")