From cfba5e836147742be9ee17321422754bfb8f5b73 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 25 Feb 2014 12:51:36 +0000 Subject: [PATCH] Disable default configuration detection in @SpringApplicationConfiguration This is a holding pattern until SPR-11455 is fixed. We now throw an exception with a helpful message instead of ttrying to detect default configuration. Fixes gh-380 --- .../boot/test/SpringApplicationContextLoader.java | 6 +++--- ...ngApplicationConfigurationDefaultConfigurationTests.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java index fe4723b812..8d733904f3 100644 --- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java @@ -91,9 +91,9 @@ public class SpringApplicationContextLoader extends AbstractContextLoader { sources.addAll(Arrays.asList(mergedConfig.getClasses())); sources.addAll(Arrays.asList(mergedConfig.getLocations())); if (sources.isEmpty()) { - Class[] defaultConfigClasses = detectDefaultConfigurationClasses(mergedConfig - .getTestClass()); - sources.addAll(Arrays.asList(defaultConfigClasses)); + throw new IllegalStateException( + "No configuration resources found (use classes= or locations= in @SpringApplicationConfiguration). " + + "Default configuration detection is not supported with this loader (see SPR-11455 for details)"); } return sources; } diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationDefaultConfigurationTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationDefaultConfigurationTests.java index 8a7bafebf4..9daa7c1da4 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationDefaultConfigurationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationDefaultConfigurationTests.java @@ -16,6 +16,7 @@ package org.springframework.boot.test; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +33,7 @@ import static org.junit.Assert.assertNotNull; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration +@Ignore("Ignore until gh-380, SPR-11455 can be resolved") public class SpringApplicationConfigurationDefaultConfigurationTests { @Autowired