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

Revert "Merge branch 'master' into 2.0.x"

Browse Source 
This reverts commit 63a1981f54, reversing
changes made to 0cca942e86.
This commit is contained in:
Marcin Grzejszczak
2017-12-20 16:31:52 +01:00
parent f69a2f63d0
commit 822dd4b732
200 changed files with 3075 additions and 1690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java
View File

@@ -1,28 +0,0 @@
package org.springframework.cloud.contract.wiremock.restdocs;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.test.autoconfigure.restdocs.RestDocsRestAssuredConfigurationCustomizer;
import org.springframework.context.annotation.Configuration;
import org.springframework.restdocs.restassured3.RestAssuredRestDocumentationConfigurer;
/**
* Custom configuration for Spring RestDocs that adds a WireMock snippet (for generating
* JSON stubs). Applied automatically if you use
* {@link org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs @AutoConfigureRestDocs} in your test case and this class
* is available. JSON stubs are generated and added to the restdocs path under "stubs".
*
* @see WireMockRestDocs for a convenient entry point for customizing and asserting the
* stub behaviour
*
* @author Eddú Meléndez
*/
@Configuration
@ConditionalOnClass(RestAssuredRestDocumentationConfigurer.class)
public class WireMockRestAssuredConfiguration implements RestDocsRestAssuredConfigurationCustomizer {
@Override
public void customize(RestAssuredRestDocumentationConfigurer configurer) {
configurer.snippets().withDefaults(new WireMockSnippet());
}
}

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

@@ -16,7 +16,6 @@
package org.springframework.cloud.contract.wiremock.restdocs;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.test.autoconfigure.restdocs.RestDocsMockMvcConfigurationCustomizer;
import org.springframework.context.annotation.Configuration;
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentationConfigurer;
@@ -34,7 +33,6 @@ import org.springframework.restdocs.mockmvc.MockMvcRestDocumentationConfigurer;
*
*/
@Configuration
@ConditionalOnClass(MockMvcRestDocumentationConfigurer.class)
public class WireMockRestDocsConfiguration
implements RestDocsMockMvcConfigurationCustomizer {

3
spring-cloud-contract-wiremock/src/main/resources/META-INF/spring.factories
View File

@@ -4,5 +4,4 @@ org.springframework.cloud.contract.wiremock.WireMockApplicationListener
# RestDocs Auto Configuration
org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs=\
org.springframework.cloud.contract.wiremock.restdocs.WireMockRestDocsConfiguration,\
org.springframework.cloud.contract.wiremock.restdocs.WireMockRestAssuredConfiguration
org.springframework.cloud.contract.wiremock.restdocs.WireMockRestDocsConfiguration

83
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockServerRestAssuredApplicationTests.java
View File

@@ -1,83 +0,0 @@
package org.springframework.cloud.contract.wiremock;
import io.restassured.specification.RequestSpecification;
import org.junit.Test;
import org.junit.runner.RunWith;
import wiremock.org.eclipse.jetty.http.HttpStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {ServletWebServerFactoryAutoConfiguration.EmbeddedTomcat.class, DispatcherServletAutoConfiguration.class},
webEnvironment = WebEnvironment.RANDOM_PORT)
@AutoConfigureRestDocs(outputDir = "target/snippets")
public class WiremockServerRestAssuredApplicationTests {
@Autowired
private RequestSpecification documentationSpec;
@LocalServerPort
private int port;
@Test
public void contextLoads() throws Exception {
given()
.port(this.port)
.when()
.get("/resource")
.then()
.assertThat()
.statusCode(is(200))
.content(equalTo("Hello World"));
}
@Test
public void statusIsMaintained() throws Exception {
given(this.documentationSpec)
.filter(document("status"))
.when()
.get("/status")
.then()
.assertThat()
.statusCode(is(202))
.content(equalTo("Hello World"));
}
@Configuration
@EnableWebMvc
@RestController
protected static class TestConfiguration {
@ResponseBody
@RequestMapping("/resource")
public String resource() {
return "Hello World";
}
@ResponseBody
@RequestMapping("/status")
public ResponseEntity<String> status() {
return ResponseEntity.status(HttpStatus.ACCEPTED_202).body("Hello World");
}
}
}

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

@@ -1,7 +1,15 @@
package org.springframework.cloud.contract.wiremock.restdocs;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.Collection;
import com.github.tomakehurst.wiremock.matching.EqualToJsonPattern;
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -9,7 +17,8 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.cloud.contract.wiremock.WireMockStubMapping;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -22,19 +31,10 @@ import org.springframework.restdocs.operation.OperationRequest;
import org.springframework.restdocs.operation.OperationRequestPart;
import org.springframework.restdocs.operation.OperationResponse;
import org.springframework.restdocs.operation.Parameters;
import org.springframework.restdocs.operation.RequestCookie;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.Collection;
import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.anyString;
/**
* @author Marcin Grzejszczak
@@ -192,11 +192,6 @@ public class WireMockSnippetTests {
public URI getUri() {
return URI.create("http://foo/bar");
}
@Override
public Collection<RequestCookie> getCookies() {
return Collections.emptySet();
}
};
}
@@ -240,11 +235,6 @@ public class WireMockSnippetTests {
public URI getUri() {
return URI.create("http://foo/bar");
}
@Override
public Collection<RequestCookie> getCookies() {
return Collections.emptySet();
}
};
}
@@ -286,10 +276,6 @@ public class WireMockSnippetTests {
public URI getUri() {
return URI.create("http://foo/bar");
}
@Override public Collection<RequestCookie> getCookies() {
return Collections.emptySet();
}
};
}
}