Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-05-11 10:01:30 +02:00
parent c35cb1b69f 6ddf1c27dd
commit 00a43d8f4d
10 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java
View File

@@ -51,14 +51,14 @@ public class AutoConfigurationImportSelectorIntegrationTests {
}
@Test
public void multipleSelectorShouldMergeAndSortCorrectly() {
public void multipleSelectorsShouldMergeAndSortCorrectly() {
this.contextRunner.withUserConfiguration(Config.class, AnotherConfig.class)
.run((context) -> assertThat(getImportedConfigBeans(context))
.containsExactly("ConfigA", "ConfigB", "ConfigC", "ConfigD"));
}
@Test
public void multipleSelectorWithRedundantImportsShouldMergeAndSortCorrectly() {
public void multipleSelectorsWithRedundantImportsShouldMergeAndSortCorrectly() {
this.contextRunner
.withUserConfiguration(SingleConfig.class, Config.class,
AnotherConfig.class)