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

Refactor exchange mutator

Browse Source 
As a follow-up to the recent commit 246e72 some slight modifications
to MockServerExchangeMutator (renamed to ExchnageMutatorWebFilter).

Aside from the name change, the main difference is that "per request"
exchange processors are now simply applied via WebTestClient#filter(..).

Issue: SPR-15570
This commit is contained in:
Rossen Stoyanchev
2017-05-25 11:37:33 -04:00
parent 6fcf3a104f
commit fd51893a44
8 changed files with 236 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorWebFilterTests.java Normal file
View File

@@ -0,0 +1,100 @@
/*
* 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 java.security.Principal;
import java.util.function.UnaryOperator;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import org.springframework.test.web.reactive.server.ExchangeMutatorWebFilter;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ServerWebExchange;
/**
* Samples tests that demonstrate applying ServerWebExchange initialization.
* @author Rossen Stoyanchev
*/
public class ExchangeMutatorWebFilterTests {
private ExchangeMutatorWebFilter exchangeMutator;
private WebTestClient webTestClient;
@Before
public void setUp() throws Exception {
this.exchangeMutator = new ExchangeMutatorWebFilter(userIdentity("Pablo"));
this.webTestClient = WebTestClient.bindToController(new TestController())
.webFilter(this.exchangeMutator)
.build();
}
@Test
public void globalMutator() throws Exception {
this.webTestClient.get().uri("/userIdentity")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Pablo!");
}
@Test
public void perRequestMutators() throws Exception {
this.webTestClient
.filter(this.exchangeMutator.perClient(userIdentity("Giovanni")))
.get().uri("/userIdentity")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Giovanni!");
}
private UnaryOperator<ServerWebExchange> userIdentity(String userName) {
return exchange -> exchange.mutate().principal(Mono.just(new TestUser(userName))).build();
}
@RestController
static class TestController {
@GetMapping("/userIdentity")
public String handle(Principal principal) {
return "Hello " + principal.getName() + "!";
}
}
private static class TestUser implements Principal {
private final String name;
TestUser(String name) {
this.name = name;
}
@Override
public String getName() {
return this.name;
}
}
}

98
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ApplicationContextTests.java
View File

@@ -16,29 +16,20 @@
package org.springframework.test.web.reactive.server.samples.bind;
import java.security.Principal;
import java.util.function.UnaryOperator;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.web.reactive.server.MockServerExchangeMutator;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.reactive.config.EnableWebFlux;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import static org.junit.Assert.assertEquals;
/**
* Binding to server infrastructure declared in a Spring ApplicationContext.
* Sample tests demonstrating "mock" server tests binding to server infrastructure
* declared in a Spring ApplicationContext.
*
* @author Rossen Stoyanchev
* @since 5.0
@@ -47,8 +38,6 @@ public class ApplicationContextTests {
private WebTestClient client;
private MockServerExchangeMutator exchangeMutator;
@Before
public void setUp() throws Exception {
@@ -57,65 +46,15 @@ public class ApplicationContextTests {
context.register(WebConfig.class);
context.refresh();
this.exchangeMutator = new MockServerExchangeMutator(principal("Pablo"));
WebFilter userPrefixFilter = (exchange, chain) -> {
Mono<Principal> user = exchange.getPrincipal().map(p -> new TestUser("Mr. " + p.getName()));
return chain.filter(exchange.mutate().principal(user).build());
};
this.client = WebTestClient.bindToApplicationContext(context)
.webFilter(this.exchangeMutator, userPrefixFilter)
.build();
}
@Test
public void bodyContent() throws Exception {
this.client.get().uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Mr. Pablo!");
this.client = WebTestClient.bindToApplicationContext(context).build();
}
@Test
public void bodyContentWithConsumer() throws Exception {
this.client.get().uri("/principal")
public void test() throws Exception {
this.client.get().uri("/test")
.exchange()
.expectStatus().isOk()
.expectBody(String.class)
.consumeWith(result -> assertEquals("Hello Mr. Pablo!", result.getResponseBody()));
}
@Test
public void perRequestExchangeMutator() throws Exception {
this.exchangeMutator.filterClient(this.client, principal("Giovanni"))
.get().uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Mr. Giovanni!");
}
@Test
public void perRequestMultipleExchangeMutators() throws Exception {
this.exchangeMutator
.filterClient(this.client, attribute("attr1", "foo"), attribute("attr2", "bar"))
.get().uri("/attributes")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("foo+bar");
}
private UnaryOperator<ServerWebExchange> principal(String userName) {
return exchange -> exchange.mutate().principal(Mono.just(new TestUser(userName))).build();
}
private UnaryOperator<ServerWebExchange> attribute(String attrName, String attrValue) {
return exchange -> {
exchange.getAttributes().put(attrName, attrValue);
return exchange;
};
.expectBody(String.class).isEqualTo("It works!");
}
@@ -133,28 +72,9 @@ public class ApplicationContextTests {
@RestController
static class TestController {
@GetMapping("/principal")
public String handle(Principal principal) {
return "Hello " + principal.getName() + "!";
}
@GetMapping("/attributes")
public String handle(@RequestAttribute String attr1, @RequestAttribute String attr2) {
return attr1 + "+" + attr2;
}
}
private static class TestUser implements Principal {
private final String name;
TestUser(String name) {
this.name = name;
}
@Override
public String getName() {
return this.name;
@GetMapping("/test")
public String handle() {
return "It works!";
}
}

100
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/ControllerTests.java
View File

@@ -16,125 +16,45 @@
package org.springframework.test.web.reactive.server.samples.bind;
import java.security.Principal;
import java.util.function.UnaryOperator;
import org.junit.Before;
import org.junit.Test;
import reactor.core.publisher.Mono;
import org.springframework.test.web.reactive.server.MockServerExchangeMutator;
import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import static org.junit.Assert.assertEquals;
/**
* Bind to annotated controllers.
* Sample tests demonstrating "mock" server tests binding to an annotated
* controller.
*
* @author Rossen Stoyanchev
* @since 5.0
*/
public class ControllerTests {
private WebTestClient client;
private MockServerExchangeMutator exchangeMutator;
@Before
public void setUp() throws Exception {
this.exchangeMutator = new MockServerExchangeMutator(principal("Pablo"));
WebFilter userPrefixFilter = (exchange, chain) -> {
Mono<Principal> user = exchange.getPrincipal().map(p -> new TestUser("Mr. " + p.getName()));
return chain.filter(exchange.mutate().principal(user).build());
};
this.client = WebTestClient.bindToController(new TestController())
.webFilter(this.exchangeMutator, userPrefixFilter)
.build();
this.client = WebTestClient.bindToController(new TestController()).build();
}
@Test
public void bodyContent() throws Exception {
this.client.get().uri("/principal")
public void test() throws Exception {
this.client.get().uri("/test")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Mr. Pablo!");
}
@Test
public void bodyContentWithConsumer() throws Exception {
this.client.get().uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody(String.class)
.consumeWith(result -> assertEquals("Hello Mr. Pablo!", result.getResponseBody()));
}
@Test
public void perRequestExchangeMutator() throws Exception {
this.exchangeMutator.filterClient(this.client, principal("Giovanni"))
.get().uri("/principal")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("Hello Mr. Giovanni!");
}
@Test
public void perRequestMultipleExchangeMutators() throws Exception {
this.exchangeMutator
.filterClient(this.client, attribute("attr1", "foo"), attribute("attr2", "bar"))
.get().uri("/attributes")
.exchange()
.expectStatus().isOk()
.expectBody(String.class).isEqualTo("foo+bar");
}
private UnaryOperator<ServerWebExchange> principal(String userName) {
return exchange -> exchange.mutate().principal(Mono.just(new TestUser(userName))).build();
}
private UnaryOperator<ServerWebExchange> attribute(String attrName, String attrValue) {
return exchange -> {
exchange.getAttributes().put(attrName, attrValue);
return exchange;
};
.expectBody(String.class).isEqualTo("It works!");
}
@RestController
static class TestController {
@GetMapping("/principal")
public String handle(Principal principal) {
return "Hello " + principal.getName() + "!";
}
@GetMapping("/attributes")
public String handle(@RequestAttribute String attr1, @RequestAttribute String attr2) {
return attr1 + "+" + attr2;
}
}
private static class TestUser implements Principal {
private final String name;
TestUser(String name) {
this.name = name;
}
@Override
public String getName() {
return this.name;
@GetMapping("/test")
public String handle() {
return "It works!";
}
}

2
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/HttpServerTests.java
View File

@@ -30,7 +30,7 @@ import static org.springframework.web.reactive.function.server.RequestPredicates
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
/**
* Bind to a running server, making actual requests over a socket.
* Sample tests demonstrating live server integration tests.
*
* @author Rossen Stoyanchev
* @since 5.0

2
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/bind/RouterFunctionTests.java
View File

@@ -27,7 +27,7 @@ import static org.springframework.web.reactive.function.server.RequestPredicates
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
/**
* Bind to a {@link RouterFunction} and functional endpoints.
* Sample tests demonstrating "mock" server tests binding to a RouterFunction.
*
* @author Rossen Stoyanchev
* @since 5.0