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

Polish

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-02-02 17:16:36 +01:00
parent 1e9e7a4792
commit e135e618ec
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/WiremockMappingDescriptor.java
View File

@@ -21,7 +21,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping;
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping;
import org.springframework.util.StreamUtils;
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
@@ -40,7 +40,7 @@ class WiremockMappingDescriptor {
public StubMapping getMapping() {
try {
return WireMock2_1_7_StubMapping.buildFrom(StreamUtils.copyToString(
return WireMockStubMapping.buildFrom(StreamUtils.copyToString(
new FileInputStream(this.descriptor), Charset.forName("UTF-8")));
}
catch (IOException e) {

4
spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy
View File

@@ -21,7 +21,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import org.skyscreamer.jsonassert.JSONAssert
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping
import org.springframework.cloud.contract.verifier.file.ContractMetadata
import spock.lang.Issue
import spock.lang.Specification
@@ -579,7 +579,7 @@ class DslToWireMockClientConverterSpec extends Specification {
}
void stubMappingIsValidWireMockStub(String mappingDefinition) {
StubMapping stubMapping = WireMock2_1_7_StubMapping.buildFrom(mappingDefinition)
StubMapping stubMapping = WireMockStubMapping.buildFrom(mappingDefinition)
stubMapping.request.bodyPatterns.findAll { it.isPresent() && it instanceof RegexPattern }.every {
Pattern.compile(it.getValue())
}

4
spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/WireMockToDslConverterSpec.groovy
View File

@@ -17,7 +17,7 @@
package org.springframework.cloud.contract.verifier.wiremock
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping
import org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter
import spock.lang.Specification
@@ -554,6 +554,6 @@ class WireMockToDslConverterSpec extends Specification {
}
void stubMappingIsValidWireMockStub(String mappingDefinition) {
WireMock2_1_7_StubMapping.buildFrom(mappingDefinition)
WireMockStubMapping.buildFrom(mappingDefinition)
}
}

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMapping.java → spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMapping.java
View File

@@ -7,7 +7,7 @@ import com.jayway.jsonpath.JsonPath;
/**
* @author Marcin Grzejszczak
*/
public class WireMock2_1_7_StubMapping {
public class WireMockStubMapping {
public static StubMapping buildFrom(String mappingDefinition) {
DocumentContext context = JsonPath.parse(mappingDefinition);
context.delete("$.id");

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/WireMockStubVerifier.groovy
View File

@@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.dsl
import com.github.tomakehurst.wiremock.matching.RegexPattern
import com.github.tomakehurst.wiremock.stubbing.StubMapping
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMock2_1_7_StubMapping
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubMapping
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubStrategy
import org.springframework.cloud.contract.verifier.file.ContractMetadata
@@ -27,7 +27,7 @@ import java.util.regex.Pattern
trait WireMockStubVerifier {
void stubMappingIsValidWireMockStub(String mappingDefinition) {
StubMapping stubMapping = WireMock2_1_7_StubMapping.buildFrom(mappingDefinition)
StubMapping stubMapping = WireMockStubMapping.buildFrom(mappingDefinition)
stubMapping.request.bodyPatterns.findAll { it.isPresent() && it instanceof RegexPattern }.every {
Pattern.compile(it.getValue())
}

6
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMock2_1_7_StubMappingSpec.groovy → spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy
View File

@@ -7,7 +7,7 @@ import spock.lang.Specification
/**
* @author Marcin Grzejszczak
*/
class WireMock2_1_7_StubMappingSpec extends Specification {
class WireMockStubMappingSpec extends Specification {
private static final String stub_2_1_7 = """
{
"request" : {
@@ -33,14 +33,14 @@ class WireMock2_1_7_StubMappingSpec extends Specification {
def "should successfully parse a WireMock 2.1.7 stub"() {
when:
StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_1_7)
StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_1_7)
then:
JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false)
}
def "should successfully parse a WireMock 2.5.1 stub"() {
when:
StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_5_1)
StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_5_1)
then:
JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false)
}

2
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
View File

@@ -103,7 +103,7 @@ public class WireMockConfiguration implements SmartLifecycle {
pattern = pattern + "**/*.json";
}
for (Resource resource : resolver.getResources(pattern)) {
this.server.addStubMapping(WireMock2_1_7_StubMapping
this.server.addStubMapping(WireMockStubMapping
.buildFrom(StreamUtils.copyToString(resource.getInputStream(), Charset.forName("UTF-8"))));
}
}

2
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMapping.java → spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockStubMapping.java
View File

@@ -7,7 +7,7 @@ import com.jayway.jsonpath.JsonPath;
/**
* @author Marcin Grzejszczak
*/
public class WireMock2_1_7_StubMapping {
public class WireMockStubMapping {
public static StubMapping buildFrom(String mappingDefinition) {
DocumentContext context = JsonPath.parse(mappingDefinition);
context.delete("$.id");

6
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMock2_1_7_StubMappingTest.java → spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WireMockStubMappingTest.java
View File

@@ -8,14 +8,14 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping;
/**
* @author Marcin Grzejszczak
*/
public class WireMock2_1_7_StubMappingTest {
public class WireMockStubMappingTest {
private static final String stub_2_1_7 = "{\"request\" : { \"method\" : \"GET\" }, \"response\" : { \"status\" : 200 }}";
private static final String stub_2_5_1 = "{\"id\" : \"77514bd4-a102-4478-a3c0-0fda8b905591\", \"request\" : { \"method\" : \"GET\" }, \"response\" : { \"status\" : 200 }, \"uuid\" : \"77514bd4-a102-4478-a3c0-0fda8b905591\"}";
@Test
public void should_successfully_parse_a_WireMock_2_1_7_stub() {
// when:
StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_1_7);
StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_1_7);
// then:
JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false);
}
@@ -23,7 +23,7 @@ public class WireMock2_1_7_StubMappingTest {
@Test
public void should_successfully_parse_a_WireMock_2_5_1_stub() {
// when:
StubMapping mapping = WireMock2_1_7_StubMapping.buildFrom(stub_2_5_1);
StubMapping mapping = WireMockStubMapping.buildFrom(stub_2_5_1);
// then:
JSONAssert.assertEquals(stub_2_1_7, mapping.toString(), false);
}

6
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockSnippetTests.java
View File

@@ -15,7 +15,7 @@ import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.cloud.contract.wiremock.WireMock2_1_7_StubMapping;
import org.springframework.cloud.contract.wiremock.WireMockStubMapping;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -68,7 +68,7 @@ public class WireMockSnippetTests {
File stub = new File(this.outputFolder, "stubs/foo.json");
assertThat(stub).exists();
StubMapping stubMapping = WireMock2_1_7_StubMapping
StubMapping stubMapping = WireMockStubMapping
.buildFrom(new String(Files.readAllBytes(stub.toPath())));
assertThat(stubMapping.getResponse().getStatus())
.isEqualTo(HttpStatus.ACCEPTED.value());
@@ -84,7 +84,7 @@ public class WireMockSnippetTests {
File stub = new File(this.outputFolder, "stubs/foo.json");
assertThat(stub).exists();
StubMapping stubMapping = WireMock2_1_7_StubMapping
StubMapping stubMapping = WireMockStubMapping
.buildFrom(new String(Files.readAllBytes(stub.toPath())));
assertThat(stubMapping.getRequest().getBodyPatterns().get(0))
.isInstanceOf(EqualToJsonPattern.class);