Merge pull request #5685 from izeye/polish-20160414

* pr/5685:
  Polish

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
  */

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();

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
 	 */

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.
  * <p>
  * NOTE: {@code @AutoConfigureJsonTesters} works in conjunction with
  * {@link JsonTesterInitializationTestExecutionListener}. If you declare your own

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.
  * <p>
  * 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.
  *

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).
  * <p>
  * 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.
  * <p>

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersTestContextCustomizerFactoryTests.java → 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();
 

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcSpringApplicationTestIntegrationTests.java → 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;

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
  */

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.
  */

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.
  * <p>
  * 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