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

Fixed invalid OptionalProperty conversion

Browse Source 
without this change a toString was executed on an optional property due to a missing method that parses those kind of props.
with this change we've added a missing method and also we've made optional property toString return the proper pattern

fixes #173
This commit is contained in:
Marcin Grzejszczak
2016-12-21 16:14:30 +01:00
parent 5a32b73f26
commit 73d4d652ff
5 changed files with 92 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/ExecutionProperty.groovy
View File

@@ -45,6 +45,6 @@ class ExecutionProperty {
@Override
public String toString() {
return executionCommand;
return executionCommand
}
}

6
spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/OptionalProperty.groovy
View File

@@ -38,4 +38,10 @@ class OptionalProperty {
String optionalPattern() {
return "($value)?"
}
@Override
public String toString() {
return optionalPattern()
}
}

7
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilder.groovy
View File

@@ -365,6 +365,13 @@ abstract class MethodBodyBuilder {
return value.toString()
}
/**
* Converts the query parameter DSL Property until a concrete value is reached
*/
protected String resolveParamValue(OptionalProperty value) {
return resolveParamValue(value.optionalPattern())
}
/**
* Converts the query parameter value into String
*/

40
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy
View File

@@ -24,6 +24,7 @@ import org.springframework.cloud.contract.verifier.file.ContractMetadata
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
import spock.lang.Unroll
import spock.util.environment.RestoreSystemProperties
class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStubVerifier {
@@ -870,7 +871,8 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub
}
@Issue('#149')
def "should allow easier way of providing dynamic values"() {
@Unroll
def "should allow easier way of providing dynamic values for [#methodBuilderName]"() {
given:
Contract contractDsl = Contract.make {
request {
@@ -931,4 +933,40 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub
private String stripped(String string) {
return string.stripMargin().stripIndent().replace('\t', '').replace('\n', '').replace(' ','')
}
@Issue('#173')
@Unroll
def "should resolve Optional object when used in query parameters for [#methodBuilderName]"() {
given:
Contract contractDsl = Contract.make {
request {
method 'GET'
urlPath('/blacklist') {
queryParameters {
parameter 'isActive': value(consumer(optional(regex('(true|false)'))))
parameter 'limit': value(consumer(optional(regex('([0-9]{1,10})'))))
parameter 'offset': value(consumer(optional(regex('([0-9]{1,10})'))))
}
}
headers {
header 'Content-Type': 'application/json'
}
}
response {
status(200)
}
}
MethodBodyBuilder builder = methodBuilder(contractDsl)
BlockBuilder blockBuilder = new BlockBuilder(" ")
when:
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
!test.contains('org.springframework.cloud.contract.spec.internal.OptionalProperty')
test.contains('(([0-9]{1,10}))?')
where:
methodBuilderName | methodBuilder
"JaxRsClientSpockMethodRequestProcessingBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientSpockMethodRequestProcessingBodyBuilder(dsl, properties) }
"JaxRsClientJUnitMethodBodyBuilder" | { org.springframework.cloud.contract.spec.Contract dsl -> new JaxRsClientJUnitMethodBodyBuilder(dsl, properties) }
}
}

40
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderSpec.groovy
View File

@@ -31,7 +31,10 @@ import java.util.regex.Pattern
*/
class MockMvcMethodBodyBuilderSpec extends Specification implements WireMockStubVerifier {
@Shared ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(assertJsonSize: true)
@Shared ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(
assertJsonSize: true
)
@Shared
// tag::contract_with_regex[]
@@ -1803,4 +1806,39 @@ World.'''"""
methodBuilder << [{ Contract dsl -> new MockMvcSpockMethodRequestProcessingBodyBuilder(dsl, properties)},
{ Contract dsl -> new MockMvcJUnitMethodBodyBuilder(dsl, properties)}]
}
@Issue('#173')
@Unroll
def "should resolve Optional object when used in query parameters"() {
given:
Contract contractDsl = Contract.make {
request {
method 'GET'
urlPath('/blacklist') {
queryParameters {
parameter 'isActive': value(consumer(optional(regex('(true|false)'))))
parameter 'limit': value(consumer(optional(regex('([0-9]{1,10})'))))
parameter 'offset': value(consumer(optional(regex('([0-9]{1,10})'))))
}
}
headers {
header 'Content-Type': 'application/json'
}
}
response {
status(200)
}
}
MethodBodyBuilder builder = methodBuilder(contractDsl)
BlockBuilder blockBuilder = new BlockBuilder(" ")
when:
builder.appendTo(blockBuilder)
def test = blockBuilder.toString()
then:
!test.contains('org.springframework.cloud.contract.spec.internal.OptionalProperty')
test.contains('(([0-9]{1,10}))?')
where:
methodBuilder << [{ Contract dsl -> new MockMvcSpockMethodRequestProcessingBodyBuilder(dsl, properties)},
{ Contract dsl -> new MockMvcJUnitMethodBodyBuilder(dsl, properties)}]
}
}