root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Phillip Webb 2019-04-05 11:15:05 -07:00
parent 1221b0650b
commit ef151f578d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
View File

@ -227,23 +227,23 @@ public class AnnotatedElementUtilsTests {
* If the "value" entry contains both "DerivedTxConfig" AND "TxConfig", then
* the algorithm is accidentally picking up shadowed annotations of the same
* type within the class hierarchy. Such undesirable behavior would cause the
* logic in {@link org.springframework.context.annotation.ProfileCondition}
* logic in {@code org.springframework.context.annotation.ProfileCondition}
* to fail.
* @see org.springframework.core.env.EnvironmentSystemIntegrationTests#mostSpecificDerivedClassDrivesEnvironment_withDevEnvAndDerivedDevConfigClass
*/
@Test
public void getAllAnnotationAttributesOnClassWithLocalAnnotationThatShadowsAnnotationFromSuperclass() {
// See org.springframework.core.env.EnvironmentSystemIntegrationTests#mostSpecificDerivedClassDrivesEnvironment_withDevEnvAndDerivedDevConfigClass
MultiValueMap<String, Object> attributes = getAllAnnotationAttributes(DerivedTxConfig.class, TX_NAME);
assertNotNull("Annotation attributes map for @Transactional on DerivedTxConfig", attributes);
assertEquals("value for DerivedTxConfig", asList("DerivedTxConfig"), attributes.get("value"));
}
/**
* Note: this functionality is required by {@link org.springframework.context.annotation.ProfileCondition}.
* @see org.springframework.core.env.EnvironmentSystemIntegrationTests
* Note: this functionality is required by {@code org.springframework.context.annotation.ProfileCondition}.
*/
@Test
public void getAllAnnotationAttributesOnClassWithMultipleComposedAnnotations() {
// See org.springframework.core.env.EnvironmentSystemIntegrationTests
MultiValueMap<String, Object> attributes = getAllAnnotationAttributes(TxFromMultipleComposedAnnotations.class, TX_NAME);
assertNotNull("Annotation attributes map for @Transactional on TxFromMultipleComposedAnnotations", attributes);
assertEquals("value for TxFromMultipleComposedAnnotations.", asList("TxInheritedComposed", "TxComposed"),

4
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
View File

@ -196,7 +196,7 @@ public class MergedAnnotationsTests {
* the algorithm is accidentally picking up shadowed annotations of the same
* type within the class hierarchy. Such undesirable behavior would cause
* the logic in
* {@link org.springframework.context.annotation.ProfileCondition} to fail.
* {@code org.springframework.context.annotation.ProfileCondition} to fail.
*/
@Test
public void collectMultiValueMapFromClassWithLocalAnnotationThatShadowsAnnotationFromSuperclass() {
@ -208,7 +208,7 @@ public class MergedAnnotationsTests {
/**
* Note: this functionality is required by
* {@link org.springframework.context.annotation.ProfileCondition}.
* {@code org.springframework.context.annotation.ProfileCondition}.
*/
@Test
public void collectMultiValueMapFromClassWithMultipleComposedAnnotations() {