mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fix failing tests
See gh-6897
This commit is contained in:
parent
5f7897ba41
commit
25c4e261e9
@ -20,7 +20,7 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
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.test.context.junit4.SpringRunner;
|
||||
|
||||
@ -44,7 +44,7 @@ public class AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests {
|
||||
assertThat(this.context).isNotNull();
|
||||
}
|
||||
|
||||
@SpringBootConfiguration
|
||||
@TestConfiguration
|
||||
static class Config {
|
||||
|
||||
}
|
||||
|
@ -67,7 +67,8 @@ final class SpringBootConfigurationFinder {
|
||||
Set<BeanDefinition> components = this.scanner.findCandidateComponents(source);
|
||||
if (!components.isEmpty()) {
|
||||
Assert.state(components.size() == 1,
|
||||
"Found multiple @SpringBootConfiguration annotated classes");
|
||||
"Found multiple @SpringBootConfiguration annotated classes "
|
||||
+ components);
|
||||
return ClassUtils.resolveClassName(
|
||||
components.iterator().next().getBeanClassName(), null);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user