commit 91809e2d1bf3ac51f1cf98dec3aff071d1abc07b
author The Android Automerger <android-build@google.com> Sun Apr 17 00:02:59 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Apr 17 00:02:59 2016 -0700
tree f6973e1a137cbb451d155c7eb8e75d1f9a48b28a
parent ca0247d5a09ba733173e55a75fe26bd3d1a37327
parent 45daadd4931a794d376f16416ff2ebbb5c53b423

merge in nyc-release history after reset to nyc-dev

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