From 09998d1155cda1399a7624c7ed79b4611d974c4b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 6 Feb 2017 20:43:22 +0900 Subject: [PATCH 1/2] Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame() Closes gh-8204 --- .../ImportAutoConfigurationImportSelectorTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java index cbd254b1a5..d8e93faca2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java @@ -157,7 +157,7 @@ public class ImportAutoConfigurationImportSelectorTests { Set set1 = this.importSelector.determineImports( getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); Set set2 = this.importSelector.determineImports( - getAnnotationMetadata(ImportAutoConfigurationWithItemsOne.class)); + getAnnotationMetadata(ImportAutoConfigurationWithItemsTwo.class)); assertThat(set1).isEqualTo(set2); } @@ -269,7 +269,7 @@ public class ImportAutoConfigurationImportSelectorTests { } @ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class) - @UnrelatedOne + @UnrelatedTwo static class ImportAutoConfigurationWithItemsTwo { } From 519a03ccdaac02860a1a2f7884556a4effee98fd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 6 Feb 2017 14:08:10 +0100 Subject: [PATCH 2/2] Polish --- .../ImportAutoConfigurationImportSelectorTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java index d8e93faca2..3dfc9183b4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java @@ -228,13 +228,13 @@ public class ImportAutoConfigurationImportSelectorTests { @Retention(RetentionPolicy.RUNTIME) @ImportAutoConfiguration(FreeMarkerAutoConfiguration.class) - static @interface ImportOne { + @interface ImportOne { } @Retention(RetentionPolicy.RUNTIME) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class) - static @interface ImportTwo { + @interface ImportTwo { } @@ -288,7 +288,7 @@ public class ImportAutoConfigurationImportSelectorTests { @ImportAutoConfiguration @Retention(RetentionPolicy.RUNTIME) - static @interface MetaImportAutoConfiguration { + @interface MetaImportAutoConfiguration { @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") Class[] exclude() default {}; @@ -296,19 +296,19 @@ public class ImportAutoConfigurationImportSelectorTests { } @Retention(RetentionPolicy.RUNTIME) - static @interface UnrelatedOne { + @interface UnrelatedOne { } @Retention(RetentionPolicy.RUNTIME) - static @interface UnrelatedTwo { + @interface UnrelatedTwo { } @Retention(RetentionPolicy.RUNTIME) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class) @SelfAnnotating - static @interface SelfAnnotating { + @interface SelfAnnotating { @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") Class[] excludeAutoConfiguration() default {};