From 0c4c2f4bf4d2c1268e042a411092d507750123ac Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 16 Mar 2017 11:36:41 +0100 Subject: [PATCH] Harmonize webflux sample test --- ...pleWebFluxApplicationIntegrationTests.java | 47 ------------------- .../SampleWebFluxApplicationTests.java | 13 +++-- 2 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationIntegrationTests.java diff --git a/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationIntegrationTests.java b/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationIntegrationTests.java deleted file mode 100644 index a1609053d7f..00000000000 --- a/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationIntegrationTests.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2012-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 sample.webflux; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.reactive.server.WebTestClient; - -/** - * Basic integration tests for WebFlux application. - * - * @author Brian Clozel - */ -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class SampleWebFluxApplicationIntegrationTests { - - @Autowired - private WebTestClient webClient; - - @Test - public void testWelcome() throws Exception { - this.webClient.get().uri("/").accept(MediaType.TEXT_PLAIN).exchange() - .expectBody(String.class).value().isEqualTo("Hello World"); - } - -} diff --git a/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationTests.java b/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationTests.java index 56524f96e81..bc35ef4ee46 100644 --- a/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-webflux/src/test/java/sample/webflux/SampleWebFluxApplicationTests.java @@ -19,9 +19,12 @@ package sample.webflux; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.reactive.server.WebTestClient; /** * Basic integration tests for WebFlux application. @@ -29,12 +32,16 @@ import org.springframework.test.context.junit4.SpringRunner; * @author Brian Clozel */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.NONE) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class SampleWebFluxApplicationTests { - @Test - public void testSomething() throws Exception { + @Autowired + private WebTestClient webClient; + @Test + public void testWelcome() throws Exception { + this.webClient.get().uri("/").accept(MediaType.TEXT_PLAIN).exchange() + .expectBody(String.class).value().isEqualTo("Hello World"); } }