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

When referencing from request a number adds "L" for longs

Browse Source 
fixes gh-702
This commit is contained in:
Marcin Grzejszczak
2018-08-01 11:43:46 +02:00
parent 58ce759ce6
commit 85406875e1
2 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/handlebars/HandlebarsJsonPathHelper.groovy
View File

@@ -40,7 +40,11 @@ class HandlebarsJsonPathHelper implements Helper<Map<String, Object>> {
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) {

52
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
View File

@@ -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: