From 90d897eb9d7276814ddd873e9595e756dcf47fad Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 14 Apr 2016 11:04:52 +0900 Subject: [PATCH] Polish Closes gh-5685 --- .../test/web/UserVehicleControllerApplicationTests.java | 2 +- .../boot/test/autoconfigure/OverrideAutoConfiguration.java | 2 +- .../boot/test/autoconfigure/filter/TypeExcludeFilters.java | 4 ++-- .../test/autoconfigure/json/AutoConfigureJsonTesters.java | 2 +- .../boot/test/autoconfigure/orm/jpa/DataJpaTest.java | 2 +- .../boot/test/autoconfigure/web/servlet/WebMvcTest.java | 2 +- ...a => TypeExcludeFiltersContextCustomizerFactoryTests.java} | 2 +- ...nTests.java => MockMvcSpringBootTestIntegrationTests.java} | 2 +- .../web/servlet/WebMvcTestOneControllerIntegrationTests.java | 2 +- .../boot/test/SpringApplicationContextLoader.java | 2 +- .../org/springframework/boot/context/TypeExcludeFilter.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/{TypeExcludeFiltersTestContextCustomizerFactoryTests.java => TypeExcludeFiltersContextCustomizerFactoryTests.java} (98%) rename spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/{MockMvcSpringApplicationTestIntegrationTests.java => MockMvcSpringBootTestIntegrationTests.java} (97%) diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java index 77540a9b62..2c92a71eb9 100644 --- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java @@ -38,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * {@code @SpringApplicationTest} based tests for {@link UserVehicleController}. + * {@code @SpringBootTest} based tests for {@link UserVehicleController}. * * @author Phillip Webb */ diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java index ac28293f40..379987d9d0 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java @@ -42,7 +42,7 @@ public @interface OverrideAutoConfiguration { /** * The value of the {@link EnableAutoConfiguration#ENABLED_OVERRIDE_PROPERTY enabled - * property override}. + * override property}. * @return the override value */ boolean enabled(); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java index 0bfa41208e..0acc6f58a8 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.TypeExcludeFilter; /** - * Annotation that can on tests to define a set of {@link TypeExcludeFilter } classes that + * Annotation that can be on tests to define a set of {@link TypeExcludeFilter} classes that * should be applied to {@link SpringBootApplication @SpringBootApplication} component * scanning. * @@ -43,7 +43,7 @@ public @interface TypeExcludeFilters { * Specifies {@link TypeExcludeFilter} classes that should be applied to * {@link SpringBootApplication @SpringBootApplication} component scanning. Classes * specified here can either have a no-arg constructor or accept a single - * {@code Class} argument if then need access to the {@code testClass}. + * {@code Class} argument if they need access to the {@code testClass}. * @see TypeExcludeFilter * @return the type exclude filters to apply */ diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java index 8790caae51..646e1b30c1 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java @@ -32,7 +32,7 @@ import org.springframework.test.context.TestExecutionListeners.MergeMode; /** * Annotation that can be applied to a test class to enable and configure - * auto-configuration of JSON Testers. + * auto-configuration of JSON testers. *

* NOTE: {@code @AutoConfigureJsonTesters} works in conjunction with * {@link JsonTesterInitializationTestExecutionListener}. If you declare your own diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java index 6684c7bcaa..55bc798359 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java @@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional; * override these settings. *

* If you are looking to load your full application configuration, but use an embedded - * database, you should consider {@link SpringBootTest @SpringApplicationTest} + * database, you should consider {@link SpringBootTest @SpringBootTest} * combined with {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} rather than * this annotation. * diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java index 52ab607f91..7db43f75ab 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java @@ -46,7 +46,7 @@ import org.springframework.test.web.servlet.MockMvc; * {@code @Component}, {@code @Service} or {@code @Repository} beans). *

* By default, tests annotated with {@code @WebMvcTest} will also auto-configure - * {@link MockMvc} (include support for HtmlUnit WebDriver and Selenium WebClient). For + * {@link MockMvc} (include support for HtmlUnit WebClient and Selenium WebDriver). For * more fine-grained control of MockMVC that * {@link AutoConfigureMockMvc @AutoConfigureMockMvc} annotation can be used. *

diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersTestContextCustomizerFactoryTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java similarity index 98% rename from spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersTestContextCustomizerFactoryTests.java rename to spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java index f357ebb4c0..c4358faad0 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersTestContextCustomizerFactoryTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizerFactoryTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; * * @author Phillip Webb */ -public class TypeExcludeFiltersTestContextCustomizerFactoryTests { +public class TypeExcludeFiltersContextCustomizerFactoryTests { private TypeExcludeFiltersContextCustomizerFactory factory = new TypeExcludeFiltersContextCustomizerFactory(); diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringApplicationTestIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringBootTestIntegrationTests.java similarity index 97% rename from spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringApplicationTestIntegrationTests.java rename to spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringBootTestIntegrationTests.java index 8f00cb1209..6badecfd18 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringApplicationTestIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringBootTestIntegrationTests.java @@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest @AutoConfigureMockMvc(alwaysPrint = false) -public class MockMvcSpringApplicationTestIntegrationTests { +public class MockMvcSpringBootTestIntegrationTests { @MockBean private ExampleMockableService service; diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestOneControllerIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestOneControllerIntegrationTests.java index 7a3a19a5c7..d115401522 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestOneControllerIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestOneControllerIntegrationTests.java @@ -28,7 +28,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * Tests for {@link WebMvcTest} when no explicit controller is defined. + * Tests for {@link WebMvcTest} when a specific controller is defined. * * @author Phillip Webb */ diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java index 62de522a93..dd3587a762 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java @@ -70,7 +70,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.boot.test.IntegrationTest * @see org.springframework.boot.test.WebIntegrationTest - * @deprecated as of 1.4 in favor of {@link SpringBootTest @SpringApplicationTest} + * @deprecated as of 1.4 in favor of {@link SpringBootTest @SpringBootTest} * {@link org.springframework.boot.test.context.SpringBootContextLoader} can also be * considered if absolutely necessary. */ diff --git a/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java b/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java index eb17d03480..03e6402843 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java @@ -39,7 +39,7 @@ import org.springframework.core.type.filter.TypeFilter; * override the {@link #match(MetadataReader, MetadataReaderFactory)} method. *

* Note that {@code TypeExcludeFilters} are initialized very early in the application - * lifecycle, they should generally not have dependencies on any other beans. They and are + * lifecycle, they should generally not have dependencies on any other beans. They are * primarily used internally to support {@code spring-boot-test}. * * @author Phillip Webb