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

Shortcut factory method in MockServerWebExchange

Browse Source 
MockServerWebExchange now has a second factory method that accepts a
MockServerHttpRequest.BaseBuilder.

Issue: SPR-16079
This commit is contained in:
Rossen Stoyanchev
2017-10-17 12:23:12 -04:00
parent 3d1023be8c
commit 94c4a7f941
76 changed files with 401 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/test/java/org/springframework/mock/web/test/server/MockServerWebExchange.java
View File

@@ -55,4 +55,14 @@ public final class MockServerWebExchange extends DefaultServerWebExchange {
return new MockServerWebExchange(request);
}
/**
* A variant of {@link #from(MockServerHttpRequest)} that accepts a request
* builder. Internally invokes the {@code build()} to build the request.
* @param requestBuilder the builder for the request.
* @return the exchange
*/
public static MockServerWebExchange from(MockServerHttpRequest.BaseBuilder<?> requestBuilder) {
return new MockServerWebExchange(requestBuilder.build());
}
}

4
spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
View File

@@ -181,8 +181,8 @@ public class WebExchangeDataBinderTests {
@Test
public void testBindingWithQueryParams() throws Exception {
String url = "/path?spouse=someValue&spouse.name=test";
MockServerHttpRequest request = MockServerHttpRequest.post(url).build();
this.binder.bind(MockServerWebExchange.from(request)).block(Duration.ofSeconds(5));
ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.post(url));
this.binder.bind(exchange).block(Duration.ofSeconds(5));
assertNotNull(this.testBean.getSpouse());
assertEquals("test", this.testBean.getSpouse().getName());

61
spring-web/src/test/java/org/springframework/web/cors/reactive/CorsWebFilterTests.java
View File

@@ -65,14 +65,6 @@ public class CorsWebFilterTests {
@Test
public void validActualRequest() {
MockServerHttpRequest request = MockServerHttpRequest
.get("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header("header2", "foo")
.build();
WebFilterChain filterChain = (filterExchange) -> {
try {
HttpHeaders headers = filterExchange.getResponse().getHeaders();
@@ -84,19 +76,23 @@ public class CorsWebFilterTests {
return Mono.empty();
};
filter.filter(MockServerWebExchange.from(request), filterChain);
MockServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest
.get("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header("header2", "foo"));
this.filter.filter(exchange, filterChain);
}
@Test
public void invalidActualRequest() throws ServletException, IOException {
MockServerHttpRequest request = MockServerHttpRequest
.delete("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header("header2", "foo")
.build();
MockServerWebExchange exchange = MockServerWebExchange.from(request);
MockServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest
.delete("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header("header2", "foo"));
WebFilterChain filterChain = (filterExchange) -> Mono.error(
new AssertionError("Invalid requests must not be forwarded to the filter chain"));
@@ -108,14 +104,14 @@ public class CorsWebFilterTests {
@Test
public void validPreFlightRequest() throws ServletException, IOException {
MockServerHttpRequest request = MockServerHttpRequest
.options("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header(ACCESS_CONTROL_REQUEST_METHOD, HttpMethod.GET.name())
.header(ACCESS_CONTROL_REQUEST_HEADERS, "header1, header2")
.build();
MockServerWebExchange exchange = MockServerWebExchange.from(request);
MockServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest
.options("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header(ACCESS_CONTROL_REQUEST_METHOD, HttpMethod.GET.name())
.header(ACCESS_CONTROL_REQUEST_HEADERS, "header1, header2")
);
WebFilterChain filterChain = (filterExchange) -> Mono.error(
new AssertionError("Preflight requests must not be forwarded to the filter chain"));
@@ -131,14 +127,13 @@ public class CorsWebFilterTests {
@Test
public void invalidPreFlightRequest() throws ServletException, IOException {
MockServerHttpRequest request = MockServerHttpRequest
.options("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header(ACCESS_CONTROL_REQUEST_METHOD, HttpMethod.DELETE.name())
.header(ACCESS_CONTROL_REQUEST_HEADERS, "header1, header2")
.build();
MockServerWebExchange exchange = MockServerWebExchange.from(request);
MockServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest
.options("http://domain1.com/test.html")
.header(HOST, "domain1.com")
.header(ORIGIN, "http://domain2.com")
.header(ACCESS_CONTROL_REQUEST_METHOD, HttpMethod.DELETE.name())
.header(ACCESS_CONTROL_REQUEST_HEADERS, "header1, header2"));
WebFilterChain filterChain = (filterExchange) -> Mono.error(
new AssertionError("Preflight requests must not be forwarded to the filter chain"));

45
spring-web/src/test/java/org/springframework/web/cors/reactive/DefaultCorsProcessorTests.java
View File

@@ -152,8 +152,8 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestAllOriginsAllowed() throws Exception {
MockServerHttpRequest request = preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
ServerWebExchange exchange = MockServerWebExchange.from(
preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET"));
this.conf.addAllowedOrigin("*");
this.processor.process(this.conf, exchange);
@@ -163,8 +163,8 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestWrongAllowedMethod() throws Exception {
MockServerHttpRequest request = preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "DELETE").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
ServerWebExchange exchange = MockServerWebExchange.from(
preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "DELETE"));
this.conf.addAllowedOrigin("*");
this.processor.process(this.conf, exchange);
@@ -173,8 +173,8 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestMatchedAllowedMethod() throws Exception {
MockServerHttpRequest request = preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
ServerWebExchange exchange = MockServerWebExchange.from(
preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET"));
this.conf.addAllowedOrigin("*");
this.processor.process(this.conf, exchange);
@@ -185,7 +185,7 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestTestWithOriginButWithoutOtherHeaders() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest().build());
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest());
this.processor.process(this.conf, exchange);
ServerHttpResponse response = exchange.getResponse();
@@ -195,8 +195,8 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestWithoutRequestMethod() throws Exception {
MockServerHttpRequest request = preFlightRequest().header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
ServerWebExchange exchange = MockServerWebExchange.from(
preFlightRequest().header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1"));
this.processor.process(this.conf, exchange);
ServerHttpResponse response = exchange.getResponse();
@@ -208,8 +208,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestWithRequestAndMethodHeaderButNoConfig() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1"));
this.processor.process(this.conf, exchange);
@@ -222,8 +221,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestValidRequestAndConfig() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1"));
this.conf.addAllowedOrigin("*");
this.conf.addAllowedMethod("GET");
@@ -246,8 +244,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestCredentials() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1"));
this.conf.addAllowedOrigin("http://domain1.com");
this.conf.addAllowedOrigin("http://domain2.com");
@@ -269,8 +266,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestCredentialsWithOriginWildcard() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1"));
this.conf.addAllowedOrigin("http://domain1.com");
this.conf.addAllowedOrigin("*");
@@ -290,8 +286,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestAllowedHeaders() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1, Header2")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1, Header2"));
this.conf.addAllowedHeader("Header1");
this.conf.addAllowedHeader("Header2");
@@ -313,8 +308,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestAllowsAllHeaders() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1, Header2")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, "Header1, Header2"));
this.conf.addAllowedHeader("*");
this.conf.addAllowedOrigin("http://domain2.com");
@@ -334,8 +328,7 @@ public class DefaultCorsProcessorTests {
public void preflightRequestWithEmptyHeaders() throws Exception {
ServerWebExchange exchange = MockServerWebExchange.from(preFlightRequest()
.header(ACCESS_CONTROL_REQUEST_METHOD, "GET")
.header(ACCESS_CONTROL_REQUEST_HEADERS, "")
.build());
.header(ACCESS_CONTROL_REQUEST_HEADERS, ""));
this.conf.addAllowedHeader("*");
this.conf.addAllowedOrigin("http://domain2.com");
@@ -350,8 +343,8 @@ public class DefaultCorsProcessorTests {
@Test
public void preflightRequestWithNullConfig() throws Exception {
MockServerHttpRequest request = preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
ServerWebExchange exchange = MockServerWebExchange.from(
preFlightRequest().header(ACCESS_CONTROL_REQUEST_METHOD, "GET"));
this.conf.addAllowedOrigin("*");
this.processor.process(null, exchange);
@@ -362,7 +355,7 @@ public class DefaultCorsProcessorTests {
private ServerWebExchange actualRequest() {
return MockServerWebExchange.from(corsRequest(HttpMethod.GET).build());
return MockServerWebExchange.from(corsRequest(HttpMethod.GET));
}
private MockServerHttpRequest.BaseBuilder<?> preFlightRequest() {

6
spring-web/src/test/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSourceTests.java
View File

@@ -40,7 +40,7 @@ public class UrlBasedCorsConfigurationSourceTests {
@Test
public void empty() {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/bar/test.html").build());
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/bar/test.html"));
assertNull(this.configSource.getCorsConfiguration(exchange));
}
@@ -49,10 +49,10 @@ public class UrlBasedCorsConfigurationSourceTests {
CorsConfiguration config = new CorsConfiguration();
this.configSource.registerCorsConfiguration("/bar/**", config);
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/foo/test.html").build());
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/foo/test.html"));
assertNull(this.configSource.getCorsConfiguration(exchange));
exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/bar/test.html").build());
exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/bar/test.html"));
assertEquals(config, this.configSource.getCorsConfiguration(exchange));
}

31
spring-web/src/test/java/org/springframework/web/filter/reactive/ForwardedHeaderFilterTests.java
View File

@@ -43,13 +43,13 @@ public class ForwardedHeaderFilterTests {
@Test
public void removeOnly() {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/")
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest
.get("/")
.header("Forwarded", "for=192.0.2.60;proto=http;by=203.0.113.43")
.header("X-Forwarded-Host", "example.com")
.header("X-Forwarded-Port", "8080")
.header("X-Forwarded-Proto", "http")
.header("X-Forwarded-Prefix", "prefix")
.build());
.header("X-Forwarded-Prefix", "prefix"));
this.filter.setRemoveOnly(true);
this.filter.filter(exchange, this.filterChain).block(Duration.ZERO);
@@ -65,11 +65,11 @@ public class ForwardedHeaderFilterTests {
@Test
public void xForwardedRequest() throws Exception {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://example.com/path")
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest
.get("http://example.com/path")
.header("X-Forwarded-Host", "84.198.58.199")
.header("X-Forwarded-Port", "443")
.header("X-Forwarded-Proto", "https")
.build());
.header("X-Forwarded-Proto", "https"));
this.filter.filter(exchange, this.filterChain).block(Duration.ZERO);
@@ -79,10 +79,9 @@ public class ForwardedHeaderFilterTests {
@Test
public void forwardedRequest() throws Exception {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://example.com/path")
.header("Forwarded", "host=84.198.58.199;proto=https")
.build());
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest
.get("http://example.com/path")
.header("Forwarded", "host=84.198.58.199;proto=https"));
this.filter.filter(exchange, this.filterChain).block(Duration.ZERO);
@@ -92,9 +91,9 @@ public class ForwardedHeaderFilterTests {
@Test
public void requestUriWithForwardedPrefix() throws Exception {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://example.com/path")
.header("X-Forwarded-Prefix", "/prefix")
.build());
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest
.get("http://example.com/path")
.header("X-Forwarded-Prefix", "/prefix"));
this.filter.filter(exchange, this.filterChain).block(Duration.ZERO);
@@ -104,9 +103,9 @@ public class ForwardedHeaderFilterTests {
@Test
public void requestUriWithForwardedPrefixTrailingSlash() throws Exception {
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://example.com/path")
.header("X-Forwarded-Prefix", "/prefix/")
.build());
MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest
.get("http://example.com/path")
.header("X-Forwarded-Prefix", "/prefix/"));
this.filter.filter(exchange, this.filterChain).block(Duration.ZERO);

20
spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeCheckNotModifiedTests.java
View File

@@ -91,7 +91,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
@Test // SPR-14559
public void checkNotModifiedInvalidIfNoneMatchHeader() {
String eTag = "\"etagvalue\"";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch("missingquotes").build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch("missingquotes"));
assertFalse(exchange.checkNotModified(eTag));
assertNull(exchange.getResponse().getStatusCode());
assertEquals(eTag, exchange.getResponse().getHeaders().getETag());
@@ -135,7 +135,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
@Test
public void checkNotModifiedETag() {
String eTag = "\"Foo\"";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag));
assertTrue(exchange.checkNotModified(eTag));
@@ -146,7 +146,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
@Test
public void checkNotModifiedETagWithSeparatorChars() {
String eTag = "\"Foo, Bar\"";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag));
assertTrue(exchange.checkNotModified(eTag));
@@ -159,7 +159,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
public void checkModifiedETag() {
String currentETag = "\"Foo\"";
String oldEtag = "Bar";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(oldEtag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(oldEtag));
assertFalse(exchange.checkNotModified(currentETag));
@@ -171,7 +171,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
public void checkNotModifiedUnpaddedETag() {
String eTag = "Foo";
String paddedEtag = String.format("\"%s\"", eTag);
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(paddedEtag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(paddedEtag));
assertTrue(exchange.checkNotModified(eTag));
@@ -183,7 +183,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
public void checkModifiedUnpaddedETag() {
String currentETag = "Foo";
String oldEtag = "Bar";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(oldEtag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(oldEtag));
assertFalse(exchange.checkNotModified(currentETag));
@@ -194,7 +194,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
@Test
public void checkNotModifiedWildcardIsIgnored() {
String eTag = "\"Foo\"";
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch("*").build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch("*"));
assertFalse(exchange.checkNotModified(eTag));
assertNull(exchange.getResponse().getStatusCode());
@@ -223,7 +223,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
MockServerWebExchange exchange = MockServerWebExchange.from(get("/")
.ifNoneMatch(eTag)
.ifModifiedSince(oneMinuteAgo.toEpochMilli())
.build());
);
assertTrue(exchange.checkNotModified(eTag, currentDate));
@@ -251,7 +251,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
public void checkNotModifiedETagWeakStrong() {
String eTag = "\"Foo\"";
String weakEtag = String.format("W/%s", eTag);
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(eTag));
assertTrue(exchange.checkNotModified(weakEtag));
@@ -275,7 +275,7 @@ public class DefaultServerWebExchangeCheckNotModifiedTests {
public void checkNotModifiedMultipleETags() {
String eTag = "\"Bar\"";
String multipleETags = String.format("\"Foo\", %s", eTag);
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(multipleETags).build());
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").ifNoneMatch(multipleETags));
assertTrue(exchange.checkNotModified(eTag));

3
spring-web/src/test/java/org/springframework/web/server/adapter/ServerWebExchangeTests.java
View File

@@ -35,8 +35,7 @@ public class ServerWebExchangeTests {
@Before
public void createExchange() {
MockServerHttpRequest request = MockServerHttpRequest.get("http://example.com").build();
this.exchange = MockServerWebExchange.from(request);
this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get("http://example.com"));
}
@Test

4
spring-web/src/test/java/org/springframework/web/server/handler/ExceptionHandlingWebHandlerTests.java
View File

@@ -41,8 +41,8 @@ public class ExceptionHandlingWebHandlerTests {
private final WebHandler targetHandler = new StubWebHandler(new IllegalStateException("boo"));
private final ServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest.get("http://localhost:8080").build());
private final ServerWebExchange exchange =
MockServerWebExchange.from(MockServerHttpRequest.get("http://localhost:8080"));
@Test

8
spring-web/src/test/java/org/springframework/web/server/handler/FilteringWebHandlerTests.java
View File

@@ -58,7 +58,7 @@ public class FilteringWebHandlerTests {
StubWebHandler targetHandler = new StubWebHandler();
new FilteringWebHandler(targetHandler, Arrays.asList(filter1, filter2, filter3))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/")))
.block(Duration.ZERO);
assertTrue(filter1.invoked());
@@ -73,7 +73,7 @@ public class FilteringWebHandlerTests {
StubWebHandler targetHandler = new StubWebHandler();
new FilteringWebHandler(targetHandler, Collections.emptyList())
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/")))
.block(Duration.ZERO);
assertTrue(targetHandler.invoked());
@@ -88,7 +88,7 @@ public class FilteringWebHandlerTests {
StubWebHandler targetHandler = new StubWebHandler();
new FilteringWebHandler(targetHandler, Arrays.asList(filter1, filter2, filter3))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/")))
.block(Duration.ZERO);
assertTrue(filter1.invoked());
@@ -104,7 +104,7 @@ public class FilteringWebHandlerTests {
StubWebHandler targetHandler = new StubWebHandler();
new FilteringWebHandler(targetHandler, Collections.singletonList(filter))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/").build()))
.handle(MockServerWebExchange.from(MockServerHttpRequest.get("/")))
.block(Duration.ofSeconds(5));
assertTrue(filter.invoked());

3
spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java
View File

@@ -39,8 +39,7 @@ public class ResponseStatusExceptionHandlerTests {
private final ResponseStatusExceptionHandler handler = new ResponseStatusExceptionHandler();
private final MockServerWebExchange exchange = MockServerWebExchange.from(
MockServerHttpRequest.get("/").build());
private final MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/"));
@Test

3
spring-web/src/test/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolverTests.java
View File

@@ -81,8 +81,7 @@ public class AcceptHeaderLocaleContextResolverTests {
private ServerWebExchange exchange(Locale... locales) {
MockServerHttpRequest request = MockServerHttpRequest.get("").acceptLanguageAsLocales(locales).build();
return MockServerWebExchange.from(request);
return MockServerWebExchange.from(MockServerHttpRequest.get("").acceptLanguageAsLocales(locales));
}
}

3
spring-web/src/test/java/org/springframework/web/server/i18n/FixedLocaleContextResolverTests.java
View File

@@ -55,8 +55,7 @@ public class FixedLocaleContextResolverTests {
}
private ServerWebExchange exchange(Locale... locales) {
MockServerHttpRequest request = MockServerHttpRequest.get("").acceptLanguageAsLocales(locales).build();
return MockServerWebExchange.from(request);
return MockServerWebExchange.from(MockServerHttpRequest.get("").acceptLanguageAsLocales(locales));
}
}

8
spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
View File

@@ -41,7 +41,7 @@ public class HeaderWebSessionIdResolverTests {
@Before
public void setUp() {
this.idResolver = new HeaderWebSessionIdResolver();
this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path").build());
this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path"));
}
@Test
@@ -123,8 +123,7 @@ public class HeaderWebSessionIdResolverTests {
public void resolveSessionIdsWhenIdThenIdFound() {
String id = "123";
this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/path")
.header(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME, id)
.build());
.header(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME, id));
List<String> ids = this.idResolver.resolveSessionIds(this.exchange);
@@ -137,8 +136,7 @@ public class HeaderWebSessionIdResolverTests {
String id2 = "abc";
this.exchange = MockServerWebExchange.from(
MockServerHttpRequest.get("/path")
.header(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME, id1, id2)
.build());
.header(HeaderWebSessionIdResolver.DEFAULT_HEADER_NAME, id1, id2));
List<String> ids = this.idResolver.resolveSessionIds(this.exchange);