diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/AssertionUtil.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/AssertionUtil.groovy index c7eda70dbd..58b3c94d31 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/AssertionUtil.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/AssertionUtil.groovy @@ -22,7 +22,7 @@ class AssertionUtil { private static boolean NON_STRICT = false - public static void assertThatJsonsAreEqual(String expected, String actual) { + static void assertThatJsonsAreEqual(String expected, String actual) { JSONAssert.assertEquals(expected, actual, NON_STRICT) } } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy index bef06db968..ab95088594 100755 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockGroovyDslSpec.groovy @@ -200,7 +200,8 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie when: String wireMockStub = new WireMockStubStrategy("Test", new ContractMetadata(null, false, 0, null, groovyDsl), groovyDsl).toWireMockClientStub() then: - AssertionUtil.assertThatJsonsAreEqual((''' + def actual = new JsonSlurper().parseText(wireMockStub) + def expected = new JsonSlurper().parseText(''' { "request" : { "urlPattern" : "/[0-9]{2}", @@ -214,7 +215,13 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie } } } -'''), wireMockStub) +''') + actual.request == expected.request + actual.response.status == expected.response.status + actual.response.headers == expected.response.headers + def actualBody = new JsonSlurper().parseText(actual.response.body) + def expectedBody = new JsonSlurper().parseText(expected.response.body) + actualBody == expectedBody and: stubMappingIsValidWireMockStub(wireMockStub) }