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

Use file based loader with MockServletContext

Browse Source 
Update SpringApplicationContextLoader so that the MockServletContext
uses FileSystemResourceLoader. This allows `/src/main/webapp` folder
to be found.

See gh-2654
This commit is contained in:
Phillip Webb
2015-03-25 11:04:40 -07:00
parent 219317e8c7
commit 35bfa16315
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
View File

@@ -39,6 +39,7 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.mock.web.MockServletContext;
import org.springframework.test.context.ContextConfigurationAttributes;
import org.springframework.test.context.ContextLoader;
@@ -261,7 +262,8 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
List<ApplicationContextInitializer<?>> initializers,
WebMergedContextConfiguration webConfiguration) {
MockServletContext servletContext = new MockServletContext(
webConfiguration.getResourceBasePath());
webConfiguration.getResourceBasePath(),
new FileSystemResourceLoader());
initializers.add(0, new ServletContextApplicationContextInitializer(
servletContext));
}