Polish "Honour base path from @WebAppConfiguration in @WebMvcTest"

See gh-16485

Author: wilkinsona

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestContextBootstrapper.java

@@ -34,8 +34,7 @@ class WebMvcTestContextBootstrapper extends SpringBootTestContextBootstrapper {
 	@Override
 	protected MergedContextConfiguration processMergedContextConfiguration(MergedContextConfiguration mergedConfig) {
 		MergedContextConfiguration processedMergedConfiguration = super.processMergedContextConfiguration(mergedConfig);
-		return new WebMergedContextConfiguration(processedMergedConfiguration,
-				getServletResourceBasePath(mergedConfig));
+		return new WebMergedContextConfiguration(processedMergedConfiguration, determineResourceBasePath(mergedConfig));
 	}
 
 	@Override

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWithWebAppConfigurationTests.java

@@ -32,8 +32,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link WebMvcTest} when loading resources via {@link ServletContext} with
- * {@link WebAppConfiguration}.
+ * Tests for {@link WebMvcTest @WebMvcTest} when loading resources via the
+ * {@link ServletContext} with {@link WebAppConfiguration @WebAppConfiguration}.
  *
  * @author Lorenzo Dee
  */
@@ -46,7 +46,7 @@ public class WebMvcTestWithWebAppConfigurationTests {
 	private ServletContext servletContext;
 
 	@Test
-	public void getResourceLocation() throws Exception {
+	public void whenBasePathIsCustomizedResourcesCanBeLoadedFromThatLocation() throws Exception {
 		testResource("/inwebapp", "src/test/webapp");
 		testResource("/inmetainfresources", "/META-INF/resources");
 		testResource("/inresources", "/resources");

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java

@@ -154,8 +154,7 @@ protected MergedContextConfiguration processMergedContextConfiguration(MergedCon
 			WebApplicationType webApplicationType = getWebApplicationType(mergedConfig);
 			if (webApplicationType == WebApplicationType.SERVLET
 					&& (webEnvironment.isEmbedded() || webEnvironment == WebEnvironment.MOCK)) {
-				mergedConfig = new WebMergedContextConfiguration(mergedConfig,
-						getServletResourceBasePath(mergedConfig));
+				mergedConfig = new WebMergedContextConfiguration(mergedConfig, determineResourceBasePath(mergedConfig));
 			}
 			else if (webApplicationType == WebApplicationType.REACTIVE
 					&& (webEnvironment.isEmbedded() || webEnvironment == WebEnvironment.MOCK)) {
@@ -187,7 +186,15 @@ private WebApplicationType deduceWebApplicationType() {
 		return WebApplicationType.SERVLET;
 	}
 
-	protected String getServletResourceBasePath(MergedContextConfiguration configuration) {
+	/**
+	 * Determines the resource base path for web applications using the value of
+	 * {@link WebAppConfiguration @WebAppConfiguration}, if any, on the test class of the
+	 * given {@code configuration}. Defaults to {@code src/main/webapp} in its absence.
+	 * @param configuration the configure to examine
+	 * @return the resource base path
+	 * @since 2.1.6
+	 */
+	protected String determineResourceBasePath(MergedContextConfiguration configuration) {
 		WebAppConfiguration webAppConfiguration = AnnotatedElementUtils
 				.findMergedAnnotation(configuration.getTestClass(), WebAppConfiguration.class);
 		return (webAppConfiguration != null) ? webAppConfiguration.value() : "src/main/webapp";