Browse Source

Merge branch '1.2.x'

pull/2938/head
Andy Wilkinson 11 years ago
parent
commit
0bcbac6ce7
  1. 2
      spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java

2
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java

@ -67,6 +67,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext; @@ -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 { @@ -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())) {

Loading…
Cancel
Save