Skip to content

Commit

Permalink
Add integration test for spring-projectsgh-24110
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrannen committed Dec 3, 2019
1 parent 7203da7 commit f049a6e
Showing 1 changed file with 39 additions and 1 deletion.
Expand Up @@ -488,6 +488,20 @@ public void getMergedAnnotationWithImplicitAliasesInMetaAnnotationOnComposedAnno
assertTrue(isAnnotated(element, name));
}

@Test
public void getMergedAnnotationWithImplicitAliasesWithDefaultsInMetaAnnotationOnComposedAnnotation() {
Class<?> element = ImplicitAliasesWithDefaultsClass.class;
String name = AliasesWithDefaults.class.getName();
AliasesWithDefaults annotation = getMergedAnnotation(element, AliasesWithDefaults.class);

assertNotNull("Should find @AliasesWithDefaults on " + element.getSimpleName(), annotation);
assertEquals("a1", "ImplicitAliasesWithDefaults", annotation.a1());
assertEquals("a2", "ImplicitAliasesWithDefaults", annotation.a2());

// Verify contracts between utility methods:
assertTrue(isAnnotated(element, name));
}

@Test
public void getMergedAnnotationAttributesWithInvalidConventionBasedComposedAnnotation() {
Class<?> element = InvalidConventionBasedComposedContextConfigClass.class;
Expand Down Expand Up @@ -958,7 +972,6 @@ static class MetaCycleAnnotatedClass {
String[] xmlConfigFiles() default {};
}


@ContextConfig
@Retention(RetentionPolicy.RUNTIME)
@interface AliasedComposedContextConfig {
Expand Down Expand Up @@ -999,6 +1012,27 @@ static class MetaCycleAnnotatedClass {
@interface ComposedImplicitAliasesContextConfig {
}

@Retention(RetentionPolicy.RUNTIME)
@interface AliasesWithDefaults {

@AliasFor("a2")
String a1() default "AliasesWithDefaults";

@AliasFor("a1")
String a2() default "AliasesWithDefaults";
}

@Retention(RetentionPolicy.RUNTIME)
@AliasesWithDefaults
@interface ImplicitAliasesWithDefaults {

@AliasFor(annotation = AliasesWithDefaults.class, attribute = "a1")
String b1() default "ImplicitAliasesWithDefaults";

@AliasFor(annotation = AliasesWithDefaults.class, attribute = "a2")
String b2() default "ImplicitAliasesWithDefaults";
}

@ImplicitAliasesContextConfig
@Retention(RetentionPolicy.RUNTIME)
@interface TransitiveImplicitAliasesContextConfig {
Expand Down Expand Up @@ -1296,6 +1330,10 @@ static class ImplicitAliasesContextConfigClass2 {
static class ImplicitAliasesContextConfigClass3 {
}

@ImplicitAliasesWithDefaults
static class ImplicitAliasesWithDefaultsClass {
}

@TransitiveImplicitAliasesContextConfig(groovy = "test.groovy")
static class TransitiveImplicitAliasesContextConfigClass {
}
Expand Down

0 comments on commit f049a6e

Please sign in to comment.