Merge branch '1.5.x'

15639d39 · Andy Wilkinson · 784c0851 · dd405168 · 15639d39
Commit 15639d39 authored Jan 30, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

ImportsContextCustomizerTests.java ...work/boot/test/context/ImportsContextCustomizerTests.java +0 -5

No files found.
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java
@@ -55,11 +55,6 @@ public class ImportsContextCustomizerTests {
 								SecondDeterminableImportSelectorAnnotatedClass.class));
 	}

-	@Test
-	public void importAutoConfigurationCanIgnoreAdditionalAnnotations() throws Exception {
-
-	}
-
 	@Test
 	public void customizersForTestClassesWithDifferentKotlinMetadataAreEqual() {
 		assertThat(new ImportsContextCustomizer(FirstKotlinAnnotatedTestClass.class))