Browse Source

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

* pr/8204:
  Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame()
pull/8206/merge
Stephane Nicoll 9 years ago
parent
commit
8c31000efa
  1. 4
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java

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

@ -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 {
} }

Loading…
Cancel
Save