commit ca0247d5a09ba733173e55a75fe26bd3d1a37327
author Paul Duffin <paulduffin@google.com> Wed Apr 13 14:21:50 2016 +0100
committer Paul Duffin <paulduffin@google.com> Wed Apr 13 14:25:29 2016 +0100
tree f6973e1a137cbb451d155c7eb8e75d1f9a48b28a
parent f1b8017ae175dbbee82d8e2d0f87a3c52af4e35c

Fix Parameterized test support

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

src/vogar/target/junit/Junit4.java

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 @@
         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;
             }