Refactor tests to use toExchange() shortcuts

Issue: SPR-15350

Author: rstoyanchev

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

@@ -27,13 +27,11 @@
 
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
-import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.adapter.DefaultServerWebExchange;
 
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
@@ -173,8 +171,7 @@ public void testBindingWithNestedObjectCreationAndWrongOrder() throws Exception
 	public void testBindingWithQueryParams() throws Exception {
 		String url = "/path?spouse=someValue&spouse.name=test";
 		MockServerHttpRequest request = MockServerHttpRequest.post(url).build();
-		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
-		this.binder.bind(exchange).block(Duration.ofMillis(5000));
+		this.binder.bind(request.toExchange()).block(Duration.ofSeconds(5));
 
 		assertNotNull(this.testBean.getSpouse());
 		assertEquals("test", this.testBean.getSpouse().getName());
@@ -208,13 +205,11 @@ private String generateForm(MultiValueMap<String, String> form) {
 	}
 
 	private ServerWebExchange exchange(MultiValueMap<String, String> formData) {
-
-		MockServerHttpRequest request = MockServerHttpRequest
+		return MockServerHttpRequest
 				.post("/")
 				.contentType(MediaType.APPLICATION_FORM_URLENCODED)
-				.body(generateForm(formData));
-
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
+				.body(generateForm(formData))
+				.toExchange();
 	}
 
 

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

@@ -18,13 +18,9 @@
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
-import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.adapter.DefaultServerWebExchange;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -42,7 +38,7 @@ public class UrlBasedCorsConfigurationSourceTests {
 
 	@Test
 	public void empty() {
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/bar/test.html");
+		ServerWebExchange exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
 		assertNull(this.configSource.getCorsConfiguration(exchange));
 	}
 
@@ -51,10 +47,10 @@ public void registerAndMatch() {
 		CorsConfiguration config = new CorsConfiguration();
 		this.configSource.registerCorsConfiguration("/bar/**", config);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/foo/test.html");
+		ServerWebExchange exchange = MockServerHttpRequest.get("/foo/test.html").toExchange();
 		assertNull(this.configSource.getCorsConfiguration(exchange));
 
-		exchange = createExchange(HttpMethod.GET, "/bar/test.html");
+		exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
 		assertEquals(config, this.configSource.getCorsConfiguration(exchange));
 	}
 
@@ -63,10 +59,4 @@ public void unmodifiableConfigurationsMap() {
 		this.configSource.getCorsConfigurations().put("/**", new CorsConfiguration());
 	}
 
-	private ServerWebExchange createExchange(HttpMethod httpMethod, String url) {
-		ServerHttpRequest request = MockServerHttpRequest.method(httpMethod, url).build();
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		return new DefaultServerWebExchange(request, response);
-	}
-
 }

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

@@ -27,10 +27,8 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
-import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilterChain;
-import org.springframework.web.server.adapter.DefaultServerWebExchange;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -145,9 +143,7 @@ private ServerWebExchange createExchange(String methodName, Optional<String> opt
 				.map(method -> builder.body(methodName + "=" + method))
 				.orElse(builder.build());
 
-		MockServerHttpResponse response = new MockServerHttpResponse();
-
-		return new DefaultServerWebExchange(request, response);
+		return request.toExchange();
 	}
 
 }