From 6c287a09ecd9110404f4b0a9fd40e572a29eeaf6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 11 Jul 2016 10:43:34 +0100 Subject: [PATCH] Wrangle tests to pass --- pom.xml | 8 ++++++-- .../spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- .../pom.xml | 2 +- ...tubRunnerSpringCloudAutoConfigurationSpec.groovy | 2 ++ .../pom.xml | 2 +- .../spring-cloud-contract-stub-runner/pom.xml | 13 +++++++++++++ .../util/JsonToJsonPathsConverterSpec.groovy | 12 ++++++------ 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index ab1919840b..5772ce04e0 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ org.slf4j slf4j-api - 1.6.0 + 1.7.21 commons-io @@ -316,11 +316,15 @@ maven-aether-provider 3.3.9 + + org.spockframework + spock-spring + 1.0-groovy-2.4 + org.spockframework spock-core 1.0-groovy-2.4 - test diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/pom.xml index 20ba4c5d53..49bf802187 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-boot/pom.xml @@ -28,7 +28,7 @@ org.spockframework - spock-core + spock-spring test diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/pom.xml index 1eb569cc72..5e4eaf63ff 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/pom.xml +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/pom.xml @@ -38,7 +38,7 @@ org.spockframework - spock-core + spock-spring test diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy index 8a3c6f886e..0388fd9817 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring-cloud/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy @@ -19,6 +19,7 @@ package org.springframework.cloud.contract.stubrunner.spring.cloud import org.apache.curator.test.TestingServer import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.EnableAutoConfiguration +import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationContextLoader import org.springframework.boot.test.WebIntegrationTest import org.springframework.cloud.contract.stubrunner.StubFinder @@ -39,6 +40,7 @@ import spock.lang.Specification */ @ContextConfiguration(classes = Config, loader = SpringApplicationContextLoader) @WebIntegrationTest(randomPort = true) +@IntegrationTest class StubRunnerSpringCloudAutoConfigurationSpec extends Specification { @Autowired StubFinder stubFinder diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/pom.xml index 8a89ae8bbe..382994f61b 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/pom.xml +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-spring/pom.xml @@ -32,7 +32,7 @@ org.spockframework - spock-core + spock-spring test diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml index 9e6d28b053..eac2023942 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/pom.xml @@ -69,6 +69,11 @@ org.apache.maven maven-aether-provider + + cglib + cglib + test + org.spockframework spock-core @@ -80,4 +85,12 @@ test + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverterSpec.groovy b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverterSpec.groovy index 7bbf672dca..aefe865f00 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverterSpec.groovy +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/test/groovy/org/springframework/cloud/contract/verifier/util/JsonToJsonPathsConverterSpec.groovy @@ -196,16 +196,16 @@ class JsonToJsonPathsConverterSpec extends Specification { JsonPaths pathAndValues = new JsonToJsonPathsConverter().transformToJsonPathWithTestsSideValues(new JsonSlurper().parseText(json)) then: pathAndValues.find { - it.method() == """.field("extensions").field("7").isEqualTo(28)""" && - it.jsonPath() == '''$.extensions[?(@.7 == 28)]''' + it.method() == """.field("extensions").field("7").isEqualTo(28.00)""" && + it.jsonPath() == '''$.extensions[?(@.7 == 28.00)]''' } pathAndValues.find { - it.method() == """.field("extensions").field("14").isEqualTo(41)""" && - it.jsonPath() == '''$.extensions[?(@.14 == 41)]''' + it.method() == """.field("extensions").field("14").isEqualTo(41.00)""" && + it.jsonPath() == '''$.extensions[?(@.14 == 41.00)]''' } pathAndValues.find { - it.method() == """.field("extensions").field("30").isEqualTo(60)""" && - it.jsonPath() == '''$.extensions[?(@.30 == 60)]''' + it.method() == """.field("extensions").field("30").isEqualTo(60.00)""" && + it.jsonPath() == '''$.extensions[?(@.30 == 60.00)]''' } and: assertThatJsonPathsInMapAreValid(json, pathAndValues)