Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source 
Closes gh-829
This commit is contained in:
Andy Wilkinson
2022-07-15 12:39:18 +01:00
parent ef6aa137e0 ebe70a91c7
commit b4fd66ff9b
45 changed files with 223 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2021 the original author or authors.
* Copyright 2014-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void getRequestWithQueryStringPopulatesParameters() throws Exception {
public void getRequestWithQueryStringPopulatesParameters() {
ExchangeResult result = WebTestClient.bindToRouterFunction(RouterFunctions.route(GET("/foo"), (req) -> null))
.configureClient().baseUrl("http://localhost").build().get().uri("/foo?a=alpha&b=bravo").exchange()
.expectBody().returnResult();
@@ -116,7 +116,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void postRequestWithFormDataParameters() throws Exception {
public void postRequestWithFormDataParameters() {
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.addAll("a", Arrays.asList("alpha", "apple"));
parameters.addAll("b", Arrays.asList("br&vo"));
@@ -134,7 +134,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void postRequestWithQueryStringParameters() throws Exception {
public void postRequestWithQueryStringParameters() {
ExchangeResult result = WebTestClient.bindToRouterFunction(RouterFunctions.route(POST("/foo"), (req) -> {
req.body(BodyExtractors.toFormData()).block();
return null;
@@ -150,7 +150,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void postRequestWithQueryStringAndFormDataParameters() throws Exception {
public void postRequestWithQueryStringAndFormDataParameters() {
MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
parameters.addAll("a", Arrays.asList("apple"));
ExchangeResult result = WebTestClient.bindToRouterFunction(RouterFunctions.route(POST("/foo"), (req) -> {
@@ -168,7 +168,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void postRequestWithNoContentType() throws Exception {
public void postRequestWithNoContentType() {
ExchangeResult result = WebTestClient
.bindToRouterFunction(RouterFunctions.route(POST("/foo"), (req) -> ServerResponse.ok().build()))
.configureClient().baseUrl("http://localhost").build().post().uri("/foo").exchange().expectBody()
@@ -179,7 +179,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void multipartUpload() throws Exception {
public void multipartUpload() {
MultiValueMap<String, Object> multipartData = new LinkedMultiValueMap<>();
multipartData.add("file", new byte[] { 1, 2, 3, 4 });
ExchangeResult result = WebTestClient
@@ -205,7 +205,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void multipartUploadFromResource() throws Exception {
public void multipartUploadFromResource() {
MultiValueMap<String, Object> multipartData = new LinkedMultiValueMap<>();
multipartData.add("file", new ByteArrayResource(new byte[] { 1, 2, 3, 4 }) {
@@ -241,7 +241,7 @@ public class WebTestClientRequestConverterTests {
}
@Test
public void requestWithCookies() throws Exception {
public void requestWithCookies() {
ExchangeResult result = WebTestClient.bindToRouterFunction(RouterFunctions.route(GET("/foo"), (req) -> null))
.configureClient().baseUrl("http://localhost").build().get().uri("/foo")
.cookie("cookieName1", "cookieVal1").cookie("cookieName2", "cookieVal2").exchange().expectBody()

12
spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2021 the original author or authors.
* Copyright 2014-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -133,7 +133,7 @@ public class WebTestClientRestDocumentationIntegrationTests {
}
@Test
public void multipart() throws Exception {
public void multipart() {
MultiValueMap<String, Object> multipartData = new LinkedMultiValueMap<>();
multipartData.add("a", "alpha");
multipartData.add("b", "bravo");
@@ -147,7 +147,7 @@ public class WebTestClientRestDocumentationIntegrationTests {
}
@Test
public void responseWithSetCookie() throws Exception {
public void responseWithSetCookie() {
this.webTestClient.get().uri("/set-cookie").exchange().expectStatus().isOk().expectBody()
.consumeWith(document("set-cookie"));
assertThat(new File("build/generated-snippets/set-cookie/http-response.adoc"))
@@ -156,7 +156,7 @@ public class WebTestClientRestDocumentationIntegrationTests {
}
@Test
public void curlSnippetWithCookies() throws Exception {
public void curlSnippetWithCookies() {
this.webTestClient.get().uri("/").cookie("cookieName", "cookieVal").accept(MediaType.APPLICATION_JSON)
.exchange().expectStatus().isOk().expectBody().consumeWith(document("curl-snippet-with-cookies"));
assertThat(new File("build/generated-snippets/curl-snippet-with-cookies/curl-request.adoc"))
@@ -166,7 +166,7 @@ public class WebTestClientRestDocumentationIntegrationTests {
}
@Test
public void curlSnippetWithEmptyParameterQueryString() throws Exception {
public void curlSnippetWithEmptyParameterQueryString() {
this.webTestClient.get().uri("/?a=").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk()
.expectBody().consumeWith(document("curl-snippet-with-empty-parameter-query-string"));
assertThat(
@@ -177,7 +177,7 @@ public class WebTestClientRestDocumentationIntegrationTests {
}
@Test
public void httpieSnippetWithCookies() throws Exception {
public void httpieSnippetWithCookies() {
this.webTestClient.get().uri("/").cookie("cookieName", "cookieVal").accept(MediaType.APPLICATION_JSON)
.exchange().expectStatus().isOk().expectBody().consumeWith(document("httpie-snippet-with-cookies"));
assertThat(new File("build/generated-snippets/httpie-snippet-with-cookies/httpie-request.adoc"))