summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2014-09-17 16:20:53 -0700
committerBrett Chabot <brettchabot@google.com>2014-09-17 16:20:53 -0700
commit3b6fbaf5a27f250e9074aa840bad6bac6f1ebb7e (patch)
treedff46a89837842c97689b0b935bd3299c08cf967
parent6e21547c5409e17afa90f5ca175f911c766df063 (diff)
downloadtesting-3b6fbaf5a27f250e9074aa840bad6bac6f1ebb7e.tar.gz
Add null check in Annotation filter.
Change-Id: I64177bb04558a653cd20cf5645db7178161eb6f7
-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() {