diff options
author | Paul Duffin <paulduffin@google.com> | 2016-04-13 14:21:50 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2016-04-13 14:25:29 +0100 |
commit | ca0247d5a09ba733173e55a75fe26bd3d1a37327 (patch) | |
tree | f6973e1a137cbb451d155c7eb8e75d1f9a48b28a | |
parent | f1b8017ae175dbbee82d8e2d0f87a3c52af4e35c (diff) | |
download | vogar-nougat-mr1.7-release.tar.gz |
Fix Parameterized test supportandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releasenougat-dev
Needed to run test added as part of this. This cannot ever have
worked as it was checking for an Annotation that was assignable
to Parameterized (which can never happen) rather than that the
@RunWith annotation's value() was assignable to Parameterized.
Bug: 28009087
Change-Id: Ied6520cf35eb74c7efaabf6331fd753e84656956
-rw-r--r-- | src/vogar/target/junit/Junit4.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/vogar/target/junit/Junit4.java b/src/vogar/target/junit/Junit4.java index 6ee7bd6..65dad7c 100644 --- a/src/vogar/target/junit/Junit4.java +++ b/src/vogar/target/junit/Junit4.java @@ -135,11 +135,13 @@ public final class Junit4 { for (Annotation a : klass.getAnnotations()) { Class<?> annotationClass = a.annotationType(); - if (Parameterized.class.isAssignableFrom(annotationClass)) { - return true; - } else if (RunWith.class.isAssignableFrom(annotationClass) - && Suite.class.isAssignableFrom(((RunWith) a).value())) { - isTestSuite = true; + if (RunWith.class.isAssignableFrom(annotationClass)) { + Class<?> runnerClass = ((RunWith) a).value(); + if (Suite.class.isAssignableFrom(runnerClass)) { + isTestSuite = true; + } else if (Parameterized.class.isAssignableFrom(runnerClass)) { + return true; + } } else if (Suite.SuiteClasses.class.isAssignableFrom(annotationClass)) { hasSuiteClasses = true; } |