From db21bcdff686b264b1987e7a76f877a592b18c3c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 9 May 2016 12:27:44 +0100 Subject: [PATCH] Make SpringApplicationConfiguration use SpringApplicationContextLoader The intention in 1.4 is for the deprecated testing functionality to behave exactly as it did in 1.3. To help with this, this commit updates SpringApplicationConfiguration to use SpringApplicationContextLoader as its loader, just as it did in 1.3. Closes gh-5882 --- .../boot/test/SpringApplicationConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java b/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java index 0c70a5b86f4..b08e7a15fef 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.test.context.ContextConfiguration; * {@code ApplicationContext} for integration tests. *

* Similar to the standard {@link ContextConfiguration @ContextConfiguration} but uses - * Spring Boot's {@link SpringBootContextLoader}. + * Spring Boot's {@link SpringApplicationContextLoader}. * * @author Dave Syer * @author Sam Brannen @@ -44,7 +44,7 @@ import org.springframework.test.context.ContextConfiguration; * @deprecated as of 1.4 in favor of {@link SpringBootTest} or direct use of * {@link SpringBootContextLoader}. */ -@ContextConfiguration(loader = SpringBootContextLoader.class) +@ContextConfiguration(loader = SpringApplicationContextLoader.class) @Documented @Inherited @Retention(RetentionPolicy.RUNTIME)