Update for new spring apis

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

@@ -64,7 +64,8 @@ public class FormIntegrationTests extends BaseWebClientTests {
 		Mono<Map> 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)

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<Map> result = webClient.get()
+		Mono<Map> 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<Map> 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)

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<Map> 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 { }
+
+}