Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Synthesize annotation from defaults

Browse Source 
This commit introduces a convenience method in AnnotationUtils for
synthesizing an annotation from its default attribute values.

TransactionalTestExecutionListener has been refactored to invoke this
new convenience method.

Issue: SPR-13087
This commit is contained in:
Sam Brannen
2015-06-20 18:27:36 +02:00
parent a0040245ca
commit d0c0d9fc5a
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java
View File

@@ -56,8 +56,6 @@ import static org.springframework.core.annotation.AnnotationUtils.*;
*/
public class AnnotationUtilsTests {
private static final Map<String, Object> EMPTY_ATTRS = Collections.emptyMap();
@Rule
public final ExpectedException exception = ExpectedException.none();
@@ -840,8 +838,8 @@ public class AnnotationUtilsTests {
}
@Test
public void synthesizeAnnotationFromMapWithEmptyAttributesWithDefaultsWithoutAttributeAliases() throws Exception {
AnnotationWithDefaults annotationWithDefaults = synthesizeAnnotation(EMPTY_ATTRS, AnnotationWithDefaults.class, null);
public void synthesizeAnnotationFromDefaultsWithoutAttributeAliases() throws Exception {
AnnotationWithDefaults annotationWithDefaults = synthesizeAnnotation(AnnotationWithDefaults.class);
assertNotNull(annotationWithDefaults);
assertEquals("text: ", "enigma", annotationWithDefaults.text());
assertTrue("predicate: ", annotationWithDefaults.predicate());
@@ -849,8 +847,8 @@ public class AnnotationUtilsTests {
}
@Test
public void synthesizeAnnotationFromMapWithEmptyAttributesWithDefaultsWithAttributeAliases() throws Exception {
ContextConfig contextConfig = synthesizeAnnotation(EMPTY_ATTRS, ContextConfig.class, null);
public void synthesizeAnnotationFromDefaultsWithAttributeAliases() throws Exception {
ContextConfig contextConfig = synthesizeAnnotation(ContextConfig.class);
assertNotNull(contextConfig);
assertEquals("value: ", "", contextConfig.value());
assertEquals("locations: ", "", contextConfig.locations());
@@ -868,7 +866,7 @@ public class AnnotationUtilsTests {
@Test
public void synthesizeAnnotationFromMapWithMissingAttributeValue() throws Exception {
assertMissingTextAttribute(EMPTY_ATTRS);
assertMissingTextAttribute(Collections.emptyMap());
}
@Test