From 07e662a4ad216e655084b8828622d7663f7067c8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 14 Nov 2018 14:54:27 +0100 Subject: [PATCH] Making tests less brittle --- .../contract/wiremock/WiremockMockServerApplicationTests.java | 4 ++-- .../src/test/resources/mappings/url-matches.json | 2 +- .../src/test/resources/mappings/url-path-pattern.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java index ede21d9ff0..e254d21534 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java @@ -387,7 +387,7 @@ public class WiremockMockServerApplicationTests { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // .baseUrl("http://example.org") // .stubs("classpath:/mappings/url-path-pattern.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/123", + assertThat(this.restTemplate.getForObject("http://example.org/123/url-path-pattern/", String.class)).isEqualTo("Hello Url Path Matcher"); server.verify(); } @@ -397,7 +397,7 @@ public class WiremockMockServerApplicationTests { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // .baseUrl("http://example.org") // .stubs("classpath:/mappings/url-matches.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/123", + assertThat(this.restTemplate.getForObject("http://example.org/123/hello-url-matcher/", String.class)).isEqualTo("Hello Url Matcher"); server.verify(); } diff --git a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-matches.json b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-matches.json index 0d4ce3a135..781c28907c 100644 --- a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-matches.json +++ b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-matches.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPattern": "^.*[0-9]{3}$" + "urlPattern": "^.*[0-9]{3}/hello-url-matcher/" }, "response" : { "status" : 200, diff --git a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json index 0821ef4f0d..3c177e7eaa 100644 --- a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json +++ b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPathPattern": "/([a-zA-Z0-9/-]*)" + "urlPathPattern": "([a-zA-Z0-9/-]*)/url-path-pattern/" }, "response" : { "status" : 200,