From 0b1d32e76284fc47b33168ce9b1a21ee97dc2685 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Wed, 15 Mar 2017 14:42:30 -0700 Subject: [PATCH] Add tests for TestRestTemplate in reactive env Closes gh-8543 --- ...stEmbeddedReactiveWebEnvironmentTests.java | 10 +++ ...nmentUserDefinedTestRestTemplateTests.java | 65 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java index ea52027e62..5b144bbe7d 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java @@ -21,6 +21,7 @@ import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory; import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext; import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory; @@ -55,6 +56,9 @@ public abstract class AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests @Autowired private WebTestClient webClient; + @Autowired + private TestRestTemplate restTemplate; + public ReactiveWebApplicationContext getContext() { return this.context; } @@ -73,6 +77,12 @@ public abstract class AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests .isEqualTo("Hello World"); } + @Test + public void injectTestRestTemplate() { + String body = this.restTemplate.getForObject("/", String.class); + assertThat(body).isEqualTo("Hello World"); + } + @Test public void annotationAttributesOverridePropertiesFile() throws Exception { assertThat(this.value).isEqualTo(123); diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java new file mode 100644 index 0000000000..73de15ea4b --- /dev/null +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests.java @@ -0,0 +1,65 @@ +/* + * 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 org.springframework.boot.test.context; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.reactive.config.EnableWebFlux; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link SpringBootTest} in a reactive environment configured with + * a user-defined {@link TestRestTemplate}. + * + * @author Madhura Bhave + */ +@RunWith(SpringRunner.class) +@DirtiesContext +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, + properties = { "spring.main.web-application-type=reactive", "value=123" }) +public class SpringBootTestReactiveWebEnvironmentUserDefinedTestRestTemplateTests + extends AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests { + + @Test + public void restTemplateIsUserDefined() throws Exception { + assertThat(getContext().getBean("testRestTemplate")) + .isInstanceOf(RestTemplate.class); + } + + @Configuration + @EnableWebFlux + @RestController + protected static class Config extends AbstractConfig { + + @Bean + public RestTemplate testRestTemplate() { + return new RestTemplate(); + } + + } + +}