From b7514a72e10e1d836e7180a713bb24862d865d9e Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Wed, 22 Mar 2017 13:04:41 +0100 Subject: [PATCH] wiremock update --- build.gradle | 2 +- .../main/groovy/com/ofg/infrastructure/stub/Stub.groovy | 2 +- .../base/CollaboratorStubIntegrationSpec.groovy | 8 ++++---- .../base/CollaboratorStubIntegrationTest.groovy | 8 ++++---- .../groovy/com/ofg/infrastructure/stub/StubSpec.groovy | 7 +++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 0722b0f0..892bfc17 100644 --- a/build.gradle +++ b/build.gradle @@ -122,7 +122,7 @@ configure(srcSubprojects) { //test dependency "ch.qos.logback:logback-classic:1.1.7" dependency "com.jayway.restassured:rest-assured:2.9.0" - dependency "com.github.tomakehurst:wiremock:2.0.10-beta" + dependency "com.github.tomakehurst:wiremock:2.1.6" dependency "cglib:cglib-nodep:3.2.0" dependency "org.objenesis:objenesis:2.1" diff --git a/micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/stub/Stub.groovy b/micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/stub/Stub.groovy index 5447ef46..243cd13f 100644 --- a/micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/stub/Stub.groovy +++ b/micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/stub/Stub.groovy @@ -1,7 +1,7 @@ package com.ofg.infrastructure.stub -import com.github.tomakehurst.wiremock.client.RequestPatternBuilder import com.github.tomakehurst.wiremock.client.WireMock +import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder import com.github.tomakehurst.wiremock.stubbing.ListStubMappingsResult import com.github.tomakehurst.wiremock.stubbing.StubMapping import groovy.transform.CompileStatic diff --git a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationSpec.groovy b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationSpec.groovy index de88eb40..c77c732a 100755 --- a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationSpec.groovy +++ b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationSpec.groovy @@ -1,8 +1,9 @@ package com.ofg.infrastructure.base -import com.github.tomakehurst.wiremock.client.RequestPatternBuilder -import com.github.tomakehurst.wiremock.client.UrlMatchingStrategy +import com.github.tomakehurst.wiremock.client.WireMock import com.github.tomakehurst.wiremock.http.RequestMethod +import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder +import com.github.tomakehurst.wiremock.matching.UrlPattern import com.ofg.infrastructure.BaseConfiguration import com.ofg.infrastructure.discovery.ServiceAlias import com.ofg.infrastructure.discovery.ServiceConfigurationResolver @@ -41,8 +42,7 @@ class CollaboratorStubIntegrationSpec extends MvcWiremockIntegrationSpec { } private RequestPatternBuilder expectedRequest() { - def matchingPongEndpoint = new UrlMatchingStrategy() - matchingPongEndpoint.setUrlPath("/$STUB_NAME") + UrlPattern matchingPongEndpoint = WireMock.urlEqualTo("/$STUB_NAME") return new RequestPatternBuilder(RequestMethod.GET, matchingPongEndpoint) } diff --git a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationTest.groovy b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationTest.groovy index 5db25bff..8429aec6 100755 --- a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationTest.groovy +++ b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/base/CollaboratorStubIntegrationTest.groovy @@ -1,8 +1,9 @@ package com.ofg.infrastructure.base -import com.github.tomakehurst.wiremock.client.RequestPatternBuilder -import com.github.tomakehurst.wiremock.client.UrlMatchingStrategy +import com.github.tomakehurst.wiremock.client.WireMock import com.github.tomakehurst.wiremock.http.RequestMethod +import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder +import com.github.tomakehurst.wiremock.matching.UrlPattern import com.ofg.infrastructure.BaseConfiguration import com.ofg.infrastructure.discovery.ServiceAlias import com.ofg.infrastructure.discovery.ServiceConfigurationResolver @@ -47,8 +48,7 @@ class CollaboratorStubIntegrationTest extends MvcWiremockIntegrationTest { } private RequestPatternBuilder expectedRequest() { - def matchingPongEndpoint = new UrlMatchingStrategy() - matchingPongEndpoint.setUrlPath("/$STUB_NAME") + UrlPattern matchingPongEndpoint = WireMock.urlEqualTo("/$STUB_NAME") return new RequestPatternBuilder(RequestMethod.GET, matchingPongEndpoint) } diff --git a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/stub/StubSpec.groovy b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/stub/StubSpec.groovy index 6440da12..5e785e27 100644 --- a/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/stub/StubSpec.groovy +++ b/micro-deps/micro-deps-spring-test-config/src/test/groovy/com/ofg/infrastructure/stub/StubSpec.groovy @@ -1,12 +1,12 @@ package com.ofg.infrastructure.stub import com.github.tomakehurst.wiremock.client.RemoteMappingBuilder -import com.github.tomakehurst.wiremock.client.RequestPatternBuilder -import com.github.tomakehurst.wiremock.client.UrlMatchingStrategy import com.github.tomakehurst.wiremock.client.WireMock import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder import com.github.tomakehurst.wiremock.client.VerificationException import com.github.tomakehurst.wiremock.http.RequestMethod +import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder +import com.github.tomakehurst.wiremock.matching.UrlPattern import com.google.common.base.Optional import com.ofg.infrastructure.discovery.MicroserviceConfiguration import com.ofg.infrastructure.discovery.ServiceAlias @@ -158,8 +158,7 @@ class StubSpec extends Specification { } private RequestPatternBuilder expectedRequest() { - def matchingPongEndpoint = new UrlMatchingStrategy() - matchingPongEndpoint.setUrlPath(PONG_ENDPOINT) + UrlPattern matchingPongEndpoint = WireMock.urlPathEqualTo(PONG_ENDPOINT) return new RequestPatternBuilder(RequestMethod.GET, matchingPongEndpoint) }