aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-03-22 22:04:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-22 22:04:25 +0000
commit6c3f4570e0c94fa43e1161eba44d141b24d456e5 (patch)
tree949e76c140c6b5415b519eaf577c12dc8d704b14
parent327d6aab06eed8deae1e0634c0a3e5d65f9a1d5b (diff)
parent99fe7c3891c8a9600d9b568ff50f3e25863d6108 (diff)
downloadplatform_external_junit-params-6c3f4570e0c94fa43e1161eba44d141b24d456e5.tar.gz
platform_external_junit-params-6c3f4570e0c94fa43e1161eba44d141b24d456e5.tar.bz2
platform_external_junit-params-6c3f4570e0c94fa43e1161eba44d141b24d456e5.zip
Make sure that filters affect the Description
am: 99fe7c3891 Change-Id: Ic1ec1cba072389efda4a4488f1a0bf9ce7d98fb0
-rw-r--r--README.google1
-rw-r--r--src/main/java/junitparams/JUnitParamsRunner.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/README.google b/README.google
index ac1b328..3f85ec8 100644
--- a/README.google
+++ b/README.google
@@ -13,3 +13,4 @@ Local Modifications:
java.beans.PropertyEditor and
java.beans.PropertyEditorManager classes by
removing the usages of them.
+ 36074730 - Make sure that filters affect the Description.
diff --git a/src/main/java/junitparams/JUnitParamsRunner.java b/src/main/java/junitparams/JUnitParamsRunner.java
index fa37257..970529e 100644
--- a/src/main/java/junitparams/JUnitParamsRunner.java
+++ b/src/main/java/junitparams/JUnitParamsRunner.java
@@ -397,6 +397,9 @@ public class JUnitParamsRunner extends BlockJUnit4ClassRunner {
@Override
public void filter(Filter filter) throws NoTestsRemainException {
super.filter(filter);
+ // Android-changed: Applying a filter could change the description so invalidate any cached
+ // description. See b/36074730
+ description = null;
this.parametrizedTestMethodsFilter = new ParametrizedTestMethodsFilter(this,filter);
}