Skip to content

S
spring-boot
Commit 0bcbac6c authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.2.x'

parents b9cc4ec5 4977e48e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
View file @ 0bcbac6c
......@@ -67,6 +67,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
*
* @author Dave Syer
* @author Phillip Webb
* @author Andy Wilkinson
* @see IntegrationTest
* @see WebIntegrationTest
* @see TestRestTemplate
......@@ -80,6 +81,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
throws Exception {
assertValidAnnotations(config.getTestClass());
SpringApplication application = getSpringApplication();
application.setMainApplicationClass(config.getTestClass());
application.setSources(getSources(config));
ConfigurableEnvironment environment = new StandardEnvironment();
if (!ObjectUtils.isEmpty(config.getActiveProfiles())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment