summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--support/src/android/support/test/internal/runner/TestRequestBuilder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/support/src/android/support/test/internal/runner/TestRequestBuilder.java b/support/src/android/support/test/internal/runner/TestRequestBuilder.java
index e45017d..8d5f541 100644
--- a/support/src/android/support/test/internal/runner/TestRequestBuilder.java
+++ b/support/src/android/support/test/internal/runner/TestRequestBuilder.java
@@ -154,8 +154,9 @@ public class TestRequestBuilder {
*/
@Override
protected boolean evaluateTest(Description description) {
+ final Class<?> testClass = description.getTestClass();
return description.getAnnotation(mAnnotationClass) != null ||
- description.getTestClass().isAnnotationPresent(mAnnotationClass);
+ (testClass != null && testClass.isAnnotationPresent(mAnnotationClass));
}
protected Class<? extends Annotation> getAnnotationClass() {