From 34c35fbcc9d991316badfaa53cc01a6c585f64c5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 21 Mar 2017 09:45:27 -0600 Subject: [PATCH] Use MockServerWebExchange --- .../filter/factory/RewritePathWebFilterFactoryTests.java | 5 ++--- .../filter/factory/SetPathWebFilterFactoryTests.java | 5 ++--- .../predicate/BetweenRequestPredicateFactoryTests.java | 9 ++++----- .../cloud/gateway/test/FormIntegrationTests.java | 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java index 47ff3422..fd64e9ea 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java @@ -21,11 +21,10 @@ import org.assertj.core.api.Assertions; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; -import org.springframework.mock.http.server.reactive.MockServerHttpResponse; +import org.springframework.mock.http.server.reactive.MockServerWebExchange; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import org.springframework.web.server.adapter.DefaultServerWebExchange; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -57,7 +56,7 @@ public class RewritePathWebFilterFactoryTests { .get("http://localhost"+ actualPath) .build(); - DefaultServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse()); + ServerWebExchange exchange = new MockServerWebExchange(request); WebFilterChain filterChain = mock(WebFilterChain.class); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java index 3ff191fd..2cefb80c 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java @@ -23,12 +23,11 @@ import org.assertj.core.api.Assertions; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; -import org.springframework.mock.http.server.reactive.MockServerHttpResponse; +import org.springframework.mock.http.server.reactive.MockServerWebExchange; import org.springframework.web.reactive.function.server.RouterFunctions; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; -import org.springframework.web.server.adapter.DefaultServerWebExchange; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -62,7 +61,7 @@ public class SetPathWebFilterFactoryTests { .get("http://localhost"+ actualPath) .build(); - DefaultServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse()); + ServerWebExchange exchange = new MockServerWebExchange(request); exchange.getAttributes().put(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, variables); WebFilterChain filterChain = mock(WebFilterChain.class); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRequestPredicateFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRequestPredicateFactoryTests.java index 829f0a0e..bce0505f 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRequestPredicateFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRequestPredicateFactoryTests.java @@ -21,11 +21,10 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import org.junit.Test; -import org.springframework.mock.http.server.reactive.MockServerHttpRequest; -import org.springframework.mock.http.server.reactive.MockServerHttpResponse; import org.springframework.cloud.gateway.handler.support.ExchangeServerRequest; +import org.springframework.mock.http.server.reactive.MockServerHttpRequest; +import org.springframework.mock.http.server.reactive.MockServerWebExchange; import org.springframework.web.reactive.function.server.ServerRequest; -import org.springframework.web.server.adapter.DefaultServerWebExchange; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.cloud.gateway.handler.predicate.BetweenRequestPredicateFactory.DATETIME1_KEY; @@ -121,7 +120,7 @@ public class BetweenRequestPredicateFactoryTests { } static ServerRequest getRequest() { - final MockServerHttpRequest request = MockServerHttpRequest.get("http://example.com").build(); - return new ExchangeServerRequest(new DefaultServerWebExchange(request, new MockServerHttpResponse())); + MockServerHttpRequest request = MockServerHttpRequest.get("http://example.com").build(); + return new ExchangeServerRequest(new MockServerWebExchange(request)); } } diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/FormIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/FormIntegrationTests.java index 8468c1fe..8ee0ef30 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/FormIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/FormIntegrationTests.java @@ -94,7 +94,8 @@ public class FormIntegrationTests extends BaseWebClientTests { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); Map files = getMap(response.getBody(), "files"); assertThat(files).containsKey("file"); - assertThat((String)files.get("file")).startsWith("data:application/octet-stream;base64,"); + String file = (String) files.get("file"); + assertThat(file).startsWith("data:").contains(";base64,"); } @EnableAutoConfiguration