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

Merge pull request #85 from dstepanov/removeJsonMatching

Browse Source 
Remove extra Json matching
This commit is contained in:
Marcin Grzejszczak
2015-06-15 18:31:48 +02:00
parent 9c3c172ad2 67f9e76d7d
commit 4643ec348f
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy
View File

@@ -125,26 +125,6 @@ class Request extends Common {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON)
}
MatchingStrategy equalToJson(Object value, JSONCompareMode jsonCompareMode) {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON)
}
MatchingStrategy equalToJsonStrictly(Object value) {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON, JSONCompareMode.STRICT)
}
MatchingStrategy equalToJsonLeniently(Object value) {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON, JSONCompareMode.LENIENT)
}
MatchingStrategy equalToJsonNonExtensibly(Object value) {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON, JSONCompareMode.NON_EXTENSIBLE)
}
MatchingStrategy equalToJsonWithStrictOrder(Object value) {
return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO_JSON, JSONCompareMode.STRICT_ORDER)
}
}
@CompileStatic

36
accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy
View File

@@ -400,42 +400,6 @@ class WiremockGroovyDslSpec extends WiremockSpec {
stubMappingIsValidWiremockStub(json)
}
def 'should use equalToJson compare mode'() {
given:
GroovyDsl groovyDsl = GroovyDsl.make {
request {
method 'GET'
url "/users"
body equalToJsonWithStrictOrder('''{"name":"Jan"}''')
}
response {
status 200
}
}
when:
String json = toWiremockClientJsonStub(groovyDsl)
then:
parseJson(json) == parseJson('''
{
"request": {
"method": "GET",
"url": "/users",
"bodyPatterns": [
{
"equalToJson":"{\\"name\\":\\"Jan\\"}",
"jsonCompareMode":"STRICT_ORDER"
}
]
},
"response": {
"status": 200
}
}
''')
and:
stubMappingIsValidWiremockStub(json)
}
def 'should use equalToJson'() {
given:
GroovyDsl groovyDsl = GroovyDsl.make {