SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use MockServerWebExchange

Browse Source
This commit is contained in:
Spencer Gibb
2017-03-21 09:45:27 -06:00
parent be712f64c6
commit 34c35fbcc9
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java
View File

@@ -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);

5
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java
View File

@@ -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);

9
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/handler/predicate/BetweenRequestPredicateFactoryTests.java
View File

@@ -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));
}
}

3
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/FormIntegrationTests.java
View File

@@ -94,7 +94,8 @@ public class FormIntegrationTests extends BaseWebClientTests {
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
Map<String, Object> 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