Merge "Update CTS runner after TF interface update"
diff --git a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
index 324df40..9f545dd 100644
--- a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
+++ b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
@@ -55,6 +55,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -142,11 +143,11 @@
@Option(name = "include-filter",
description = "The include filters of the test name to run.")
- private List<String> mIncludeFilters = new ArrayList<>();
+ private Set<String> mIncludeFilters = new LinkedHashSet<>();
@Option(name = "exclude-filter",
description = "The exclude filters of the test name to run.")
- private List<String> mExcludeFilters = new ArrayList<>();
+ private Set<String> mExcludeFilters = new LinkedHashSet<>();
@Option(name = "test-file-include-filter",
description="A file containing a list of line separated test classes and optionally"
@@ -266,6 +267,38 @@
* {@inheritDoc}
*/
@Override
+ public Set<String> getIncludeFilters() {
+ return mIncludeFilters;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Set<String> getExcludeFilters() {
+ return mExcludeFilters;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void clearIncludeFilters() {
+ mIncludeFilters.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void clearExcludeFilters() {
+ mExcludeFilters.clear();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void setIncludeTestFile(File testFile) {
mIncludeTestFile = testFile;
}