This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag OpenBSD in repository testng.
commit 32ff12043a05f5bdfef86731cdfd3825e6272c90 Author: Julien Herr <[email protected]> Date: Sun May 3 23:28:11 2015 +0200 Fix regression shown by tests --- .../annotations/JDK15AnnotationFinder.java | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java index 0130e1a..cc2df3d 100755 --- a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java +++ b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java @@ -101,7 +101,8 @@ public class JDK15AnnotationFinder implements IAnnotationFinder { if (a == null) { throw new IllegalArgumentException("Java @Annotation class for '" + annotationClass + "' not found."); } - return findAnnotation(m.getAnnotation(a), annotationClass, m.getDeclaringClass(), null, m); + Annotation annotation = m.getAnnotation(a); + return findAnnotation(annotation, annotationClass, m.getDeclaringClass(), null, m, new Pair<>(annotation, m)); } @Override @@ -121,7 +122,7 @@ public class JDK15AnnotationFinder implements IAnnotationFinder { if (annotation == null) { annotation = testClass.getAnnotation(a); } - return findAnnotation(annotation, annotationClass, testClass, null, m); + return findAnnotation(annotation, annotationClass, testClass, null, m, new Pair<>(annotation, m)); } private void transform(IAnnotation a, Class testClass, @@ -167,7 +168,8 @@ public class JDK15AnnotationFinder implements IAnnotationFinder { if (a == null) { throw new IllegalArgumentException("Java @Annotation class for '" + annotationClass + "' not found."); } - return findAnnotation(findAnnotationInSuperClasses(cls, a), annotationClass, cls, null, null); + Annotation annotation = findAnnotationInSuperClasses(cls, a); + return findAnnotation(annotation, annotationClass, cls, null, null, new Pair<>(annotation, annotationClass)); } @Override @@ -176,31 +178,24 @@ public class JDK15AnnotationFinder implements IAnnotationFinder { if (a == null) { throw new IllegalArgumentException("Java @Annotation class for '" + annotationClass + "' not found."); } - return findAnnotation(cons.getAnnotation(a), annotationClass, cons.getDeclaringClass(), cons, null); + Annotation annotation = cons.getAnnotation(a); + return findAnnotation(annotation, annotationClass, cons.getDeclaringClass(), cons, null, new Pair<>(annotation, cons)); } private Map<Pair<Annotation, ?>, IAnnotation> m_annotations = Maps.newHashMap(); private <A extends IAnnotation> A findAnnotation(Annotation a, Class<A> annotationClass, - Class testClass, Constructor testConstructor, Method testMethod) { - final Pair<Annotation, ?> p; - if (testClass != null) { - p = new Pair<Annotation, Class>(a, testClass); - } else if (testConstructor != null) { - p = new Pair<Annotation, Constructor>(a, testConstructor); - } else { - p = new Pair<Annotation, Method>(a, testMethod); - } - //noinspection unchecked - A result = (A) m_annotations.get(p); + Class testClass, Constructor testConstructor, Method testMethod, + Pair<Annotation, ?> p) { + IAnnotation result = m_annotations.get(p); if (result == null) { result = m_tagFactory.createTag(testClass, a, annotationClass, m_transformer); m_annotations.put(p, result); transform(result, testClass, testConstructor, testMethod); } //noinspection unchecked - return result; + return (A) result; } @Override -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
