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

Merge pull request #8204 from izeye:fix-test-20170206

Browse Source 
* pr/8204:
  Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
This commit is contained in:
Stephane Nicoll
2017-02-06 14:06:08 +01:00
parent e9057354c2 09998d1155
commit 8c31000efa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ public class ImportAutoConfigurationImportSelectorTests {
Set<Object> set1 = this.importSelector.determineImports( Set<Object> set1 = this.importSelector.determineImports(
getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class));
Set<Object> set2 = this.importSelector.determineImports( Set<Object> set2 = this.importSelector.determineImports(
getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); getAnnotationMetadata(ImportAutoConfigurationWithItemsTwo.class));
assertThat(set1).isEqualTo(set2); assertThat(set1).isEqualTo(set2);
} }
@@ -269,7 +269,7 @@ public class ImportAutoConfigurationImportSelectorTests {
} }
@ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class)
@UnrelatedOne @UnrelatedTwo
static class ImportAutoConfigurationWithItemsTwo { static class ImportAutoConfigurationWithItemsTwo {
} }