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

Ensure AnnotationUtilsTests pass in Eclipse again

Browse Source
This commit is contained in:
Sam Brannen
2018-08-08 13:23:51 +02:00
parent be211ceead
commit 7b608ab995
1 changed files with 11 additions and 1 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

@@ -23,6 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -145,7 +146,16 @@ public class AnnotationUtilsTests {
assertNull(getAnnotation(bridgeMethod, Order.class));
assertNotNull(findAnnotation(bridgeMethod, Order.class));
assertNotNull(bridgeMethod.getAnnotation(Transactional.class));
boolean runningInEclipse = Arrays.stream(new Exception().getStackTrace())
.anyMatch(element -> element.getClassName().startsWith("org.eclipse.jdt"));
// As of JDK 8, invoking getAnnotation() on a bridge method actually finds an
// annotation on its 'bridged' method; however, the Eclipse compiler still does
// not properly support this. Thus, we effectively ignore the following assertion
// if the test is currently executing within the Eclipse IDE.
if (!runningInEclipse) {
assertNotNull(bridgeMethod.getAnnotation(Transactional.class));
}
assertNotNull(getAnnotation(bridgeMethod, Transactional.class));
assertNotNull(findAnnotation(bridgeMethod, Transactional.class));
}