Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider WebAppConfiguration in @SpringBootTest

Browse Source 
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
This commit is contained in:
Phillip Webb
2016-07-11 16:38:10 -07:00
parent df8dfb093b
commit 43afc149a1
7 changed files with 134 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
View File

@@ -33,6 +33,7 @@ import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.TestContext;
import org.springframework.test.context.TestContextBootstrapper;
import org.springframework.test.context.support.DefaultTestContextBootstrapper;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.context.web.WebMergedContextConfiguration;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@@ -122,7 +123,13 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
if (webEnvironment != null) {
if (webEnvironment.isEmbedded() || (webEnvironment == WebEnvironment.MOCK
&& hasWebEnvironmentClasses())) {
mergedConfig = new WebMergedContextConfiguration(mergedConfig, "");
WebAppConfiguration webAppConfiguration = AnnotatedElementUtils
.findMergedAnnotation(mergedConfig.getTestClass(),
WebAppConfiguration.class);
String resourceBasePath = (webAppConfiguration == null ? "src/main/webapp"
: webAppConfiguration.value());
mergedConfig = new WebMergedContextConfiguration(mergedConfig,
resourceBasePath);
}
}
return mergedConfig;