Polish
This commit is contained in:
parent
b487db294b
commit
cb34b0b963
|
@ -1,64 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2002-2017 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.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.test.web.reactive.server.samples;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import org.springframework.http.HttpHeaders;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.test.web.reactive.server.WebTestClient;
|
|
||||||
import org.springframework.web.bind.annotation.CookieValue;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests with error status codes or error conditions.
|
|
||||||
*
|
|
||||||
* @author Anton Bondarenko
|
|
||||||
* @since 5.0
|
|
||||||
*/
|
|
||||||
public class CookieTests {
|
|
||||||
|
|
||||||
private final WebTestClient client = WebTestClient
|
|
||||||
.bindToController(new TestController())
|
|
||||||
.configureClient().baseUrl("/cookie")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void setCookies() {
|
|
||||||
this.client.get().uri("/send-cookies")
|
|
||||||
.cookies(cookies -> cookies.add("k1", "v1"))
|
|
||||||
.exchange()
|
|
||||||
.expectHeader().valueMatches("Set-Cookie", "k1=v1");
|
|
||||||
}
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("cookie")
|
|
||||||
static class TestController {
|
|
||||||
|
|
||||||
@GetMapping("send-cookies")
|
|
||||||
ResponseEntity<Void> handleCookie(@CookieValue("k1") String cookieValue) {
|
|
||||||
HttpHeaders headers = new HttpHeaders();
|
|
||||||
headers.set("Set-Cookie", "k1=" + cookieValue);
|
|
||||||
return new ResponseEntity<>(headers, HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -18,58 +18,70 @@ package org.springframework.test.web.reactive.server.samples;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.test.web.reactive.server.WebTestClient;
|
import org.springframework.test.web.reactive.server.WebTestClient;
|
||||||
|
import org.springframework.web.bind.annotation.CookieValue;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestHeader;
|
import org.springframework.web.bind.annotation.RequestHeader;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests with custom headers.
|
* Tests with headers and cookies.
|
||||||
*
|
|
||||||
* @author Rossen Stoyanchev
|
* @author Rossen Stoyanchev
|
||||||
* @since 5.0
|
* @since 5.0
|
||||||
*/
|
*/
|
||||||
public class HeaderTests {
|
public class HeaderAndCookieTests {
|
||||||
|
|
||||||
private final WebTestClient client = WebTestClient
|
private final WebTestClient client = WebTestClient.bindToController(new TestController()).build();
|
||||||
.bindToController(new TestController())
|
|
||||||
.configureClient().baseUrl("/header")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void requestResponseHeaderPair() throws Exception {
|
public void requestResponseHeaderPair() throws Exception {
|
||||||
this.client.get().uri("/request-response-pair").header("h1", "in")
|
this.client.get().uri("/header-echo").header("h1", "in")
|
||||||
.exchange()
|
.exchange()
|
||||||
.expectStatus().isOk()
|
.expectStatus().isOk()
|
||||||
.expectHeader().valueEquals("h1", "in-out");
|
.expectHeader().valueEquals("h1", "in-out");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void headerMultivalue() throws Exception {
|
public void headerMultipleValues() throws Exception {
|
||||||
this.client.get().uri("/multivalue")
|
this.client.get().uri("header-multi-value")
|
||||||
.exchange()
|
.exchange()
|
||||||
.expectStatus().isOk()
|
.expectStatus().isOk()
|
||||||
.expectHeader().valueEquals("h1", "v1", "v2", "v3");
|
.expectHeader().valueEquals("h1", "v1", "v2", "v3");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void setCookies() {
|
||||||
|
this.client.get().uri("/cookie-echo")
|
||||||
|
.cookies(cookies -> cookies.add("k1", "v1"))
|
||||||
|
.exchange()
|
||||||
|
.expectHeader().valueMatches("Set-Cookie", "k1=v1");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("header")
|
|
||||||
static class TestController {
|
static class TestController {
|
||||||
|
|
||||||
@GetMapping("request-response-pair")
|
@GetMapping("header-echo")
|
||||||
ResponseEntity<Void> handleHeader(@RequestHeader("h1") String myHeader) {
|
ResponseEntity<Void> handleHeader(@RequestHeader("h1") String myHeader) {
|
||||||
String value = myHeader + "-out";
|
String value = myHeader + "-out";
|
||||||
return ResponseEntity.ok().header("h1", value).build();
|
return ResponseEntity.ok().header("h1", value).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("multivalue")
|
@GetMapping("header-multi-value")
|
||||||
ResponseEntity<Void> multivalue() {
|
ResponseEntity<Void> multiValue() {
|
||||||
return ResponseEntity.ok().header("h1", "v1", "v2", "v3").build();
|
return ResponseEntity.ok().header("h1", "v1", "v2", "v3").build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("cookie-echo")
|
||||||
|
ResponseEntity<Void> handleCookie(@CookieValue("k1") String cookieValue) {
|
||||||
|
HttpHeaders headers = new HttpHeaders();
|
||||||
|
headers.set("Set-Cookie", "k1=" + cookieValue);
|
||||||
|
return new ResponseEntity<>(headers, HttpStatus.OK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -270,8 +270,7 @@ class DefaultWebClient implements WebClient {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DefaultRequestBodyUriSpec cookies(
|
public DefaultRequestBodyUriSpec cookies(Consumer<MultiValueMap<String, String>> cookiesConsumer) {
|
||||||
Consumer<MultiValueMap<String, String>> cookiesConsumer) {
|
|
||||||
Assert.notNull(cookiesConsumer, "'cookiesConsumer' must not be null");
|
Assert.notNull(cookiesConsumer, "'cookiesConsumer' must not be null");
|
||||||
cookiesConsumer.accept(getCookies());
|
cookiesConsumer.accept(getCookies());
|
||||||
return this;
|
return this;
|
||||||
|
|
|
@ -88,7 +88,9 @@ public class DefaultWebClientTests {
|
||||||
@Test
|
@Test
|
||||||
public void requestHeaderAndCookie() throws Exception {
|
public void requestHeaderAndCookie() throws Exception {
|
||||||
WebClient client = builder().build();
|
WebClient client = builder().build();
|
||||||
client.get().uri("/path").accept(MediaType.APPLICATION_JSON).cookie("id", "123").exchange();
|
client.get().uri("/path").accept(MediaType.APPLICATION_JSON)
|
||||||
|
.cookies(cookies -> cookies.add("id", "123")) // SPR-16178
|
||||||
|
.exchange();
|
||||||
|
|
||||||
ClientRequest request = verifyExchange();
|
ClientRequest request = verifyExchange();
|
||||||
assertEquals("application/json", request.headers().getFirst("Accept"));
|
assertEquals("application/json", request.headers().getFirst("Accept"));
|
||||||
|
|
Loading…
Reference in New Issue