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

Fixed quite a few tests

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-10-09 18:22:19 +02:00
parent 9026e08b16
commit 43eef1a1a8
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java
View File

@@ -94,8 +94,8 @@ public class WireMockHttpServerStub implements HttpServerStub {
@Override
public HttpServerStub start() {
if (isRunning()) {
if (log.isDebugEnabled()) {
log.debug("The server is already running at port [" + port() + "]");
if (log.isTraceEnabled()) {
log.trace("The server is already running at port [" + port() + "]");
}
return this;
}
@@ -113,8 +113,8 @@ public class WireMockHttpServerStub implements HttpServerStub {
@Override
public HttpServerStub stop() {
if (!isRunning()) {
if (log.isDebugEnabled()) {
log.debug("Trying to stop a non started server!");
if (log.isTraceEnabled()) {
log.trace("Trying to stop a non started server!");
}
return this;
}

BIN
spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT-stubs.jar
View File

Binary file not shown.

15
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/BaseWireMockStubStrategy.groovy
View File

@@ -96,9 +96,7 @@ abstract class BaseWireMockStubStrategy {
*/
String parseBody(Map map, ContentType contentType) {
def transformedMap = MapConverter.getStubSideValues(map)
String responseSideBody = toJson(MapConverter.getTestSideValues(contract.request.body))
DocumentContext context = JsonPath.parse(responseSideBody)
transformedMap = processEntriesForTemplating(transformedMap, context)
transformedMap = transformMapIfRequestPresent(transformedMap)
String json = toJson(transformedMap)
// the space is important cause at the end of the json body you also have a }
// you can't have 4 } next to each other
@@ -106,6 +104,17 @@ abstract class BaseWireMockStubStrategy {
return parseBody(unquotedJson, contentType)
}
private Object transformMapIfRequestPresent(Object transformedMap) {
def requestBody = contract.request.body
if (requestBody == null) {
return transformedMap
}
String testSideBody = toJson(
MapConverter.getTestSideValues(requestBody))
DocumentContext context = JsonPath.parse(testSideBody)
return processEntriesForTemplating(transformedMap, context)
}
private Object processEntriesForTemplating(transformedMap, DocumentContext context) {
return transformValues(transformedMap, {
if (it instanceof String && processor.containsJsonPathTemplateEntry(it)) {