root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix failing tests 

See gh-6897
This commit is contained in:
Phillip Webb 2016-09-15 17:16:26 -07:00
parent 5f7897ba41
commit 25c4e261e9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java
View File

@ -20,7 +20,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
@ -44,7 +44,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
assertThat(this.context).isNotNull(); assertThat(this.context).isNotNull();
} }
@SpringBootConfiguration @TestConfiguration
static class Config { static class Config {
} }

3
spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootConfigurationFinder.java
View File

@ -67,7 +67,8 @@ final class SpringBootConfigurationFinder {
Set<BeanDefinition> components = this.scanner.findCandidateComponents(source); Set<BeanDefinition> components = this.scanner.findCandidateComponents(source);
if (!components.isEmpty()) { if (!components.isEmpty()) {
Assert.state(components.size() == 1, Assert.state(components.size() == 1,
"Found multiple @SpringBootConfiguration annotated classes"); "Found multiple @SpringBootConfiguration annotated classes "
+ components);
return ClassUtils.resolveClassName( return ClassUtils.resolveClassName(
components.iterator().next().getBeanClassName(), null); components.iterator().next().getBeanClassName(), null);
} }