From 6d6d76ca0680f42df924f5f78ee7be4e56ddcd30 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 16 Mar 2017 09:54:06 +0100 Subject: [PATCH] Polish See gh-8543 --- ...activeWebEnvironmentUserDefinedTestRestTemplateTests.java | 3 +-- ...a => SpringBootTestUserDefinedTestRestTemplateTests.java} | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename spring-boot-test/src/test/java/org/springframework/boot/test/context/{SpringBootTestTestRestTemplateDefinedByUser.java => SpringBootTestUserDefinedTestRestTemplateTests.java} (90%) 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 index 73de15ea4b..8856997b2d 100644 --- 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 @@ -20,7 +20,6 @@ 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; @@ -33,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link SpringBootTest} in a reactive environment configured with - * a user-defined {@link TestRestTemplate}. + * a user-defined {@link RestTemplate} that is named {@code testRestTemplate}. * * @author Madhura Bhave */ diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestTestRestTemplateDefinedByUser.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java similarity index 90% rename from spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestTestRestTemplateDefinedByUser.java rename to spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java index 59151964b0..02b5c3d1f3 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestTestRestTemplateDefinedByUser.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestUserDefinedTestRestTemplateTests.java @@ -31,7 +31,8 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link SpringBootTest} configured with {@link WebEnvironment#RANDOM_PORT}. + * Tests for {@link SpringBootTest} configured with a user-defined {@link RestTemplate} + * that is named {@code testRestTemplate}. * * @author Phillip Webb * @author Andy Wilkinson @@ -39,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; @RunWith(SpringRunner.class) @DirtiesContext @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "value=123" }) -public class SpringBootTestTestRestTemplateDefinedByUser +public class SpringBootTestUserDefinedTestRestTemplateTests extends AbstractSpringBootTestWebServerWebEnvironmentTests { @Test