Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-30 10:02:27 +00:00
commit 15639d39b0
1 changed files with 0 additions and 5 deletions

View File

@ -55,11 +55,6 @@ public class ImportsContextCustomizerTests {
SecondDeterminableImportSelectorAnnotatedClass.class)); SecondDeterminableImportSelectorAnnotatedClass.class));
} }
@Test
public void importAutoConfigurationCanIgnoreAdditionalAnnotations() throws Exception {
}
@Test @Test
public void customizersForTestClassesWithDifferentKotlinMetadataAreEqual() { public void customizersForTestClassesWithDifferentKotlinMetadataAreEqual() {
assertThat(new ImportsContextCustomizer(FirstKotlinAnnotatedTestClass.class)) assertThat(new ImportsContextCustomizer(FirstKotlinAnnotatedTestClass.class))