From 68aa6297c41a3217633504039770a3816ddc1960 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 30 Mar 2017 12:01:28 -0600 Subject: [PATCH] Update for new spring apis --- .../gateway/test/FormIntegrationTests.java | 3 +- .../gateway/test/GatewayIntegrationTests.java | 17 +---- .../cloud/gateway/test/PostTests.java | 65 +++++++++++++++++++ 3 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PostTests.java 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 8ee0ef30a..f727d6bfa 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 @@ -64,7 +64,8 @@ public class FormIntegrationTests extends BaseWebClientTests { Mono result = webClient.post() .uri("/post") .contentType(contentType) - .exchange(BodyInserters.fromFormData(formData)) + .body(BodyInserters.fromFormData(formData)) + .exchange() .then(response -> response.body(toMono(Map.class))); StepVerifier.create(result) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java index 83a54e541..cf30c73ba 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java @@ -61,9 +61,10 @@ public class GatewayIntegrationTests extends BaseWebClientTests { @Test public void complexContentTypeWorks() { - Mono result = webClient.get() + Mono result = webClient.post() .uri("/headers") .contentType(MediaType.APPLICATION_JSON_UTF8) + .body("testdata") .header("Host", "www.complexcontenttype.org") .exchange() .then(response -> response.body(toMono(Map.class))); @@ -143,20 +144,6 @@ public class GatewayIntegrationTests extends BaseWebClientTests { .verify(DURATION); } - @Test - public void postWorks() { - Mono result = webClient.post() - .uri("/post") - .header("Host", "www.example.org") - .exchange(Mono.just("testdata"), String.class) - .then(response -> response.body(toMono(Map.class))); - - StepVerifier.create(result) - .consumeNextWith(map -> assertThat(map).containsEntry("data", "testdata")) - .expectComplete() - .verify(DURATION); - } - @EnableAutoConfiguration @SpringBootConfiguration @Import(DefaultTestConfig.class) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PostTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PostTests.java new file mode 100644 index 000000000..0dbe0c5cf --- /dev/null +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/PostTests.java @@ -0,0 +1,65 @@ +/* + * Copyright 2013-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.cloud.gateway.test; + +import java.util.Map; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import static org.springframework.web.reactive.function.BodyExtractors.toMono; + +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = RANDOM_PORT) +@DirtiesContext +@SuppressWarnings("unchecked") +//TODO: why does this have to be in a separate test? +public class PostTests extends BaseWebClientTests { + + @Test + public void postWorks() { + Mono result = webClient.post() + .uri("/post") + .header("Host", "www.example.org") + .body("testdata") + .exchange() + .then(response -> response.body(toMono(Map.class))); + + StepVerifier.create(result) + .consumeNextWith(map -> assertThat(map).containsEntry("data", "testdata")) + .expectComplete() + .verify(DURATION); + } + + @EnableAutoConfiguration + @SpringBootConfiguration + @Import(DefaultTestConfig.class) + public static class TestConfig { } + +}