Update interface based on new SuiteFilter
Test: unit tests
Bug: 188085706
Change-Id: I67c41304a2e1d4d9391e3fd10d58b217e3fe7246
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilitySuiteModuleLoader.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilitySuiteModuleLoader.java
index c8863d7..7796e12 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilitySuiteModuleLoader.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilitySuiteModuleLoader.java
@@ -22,6 +22,7 @@
import com.android.tradefed.testtype.suite.SuiteTestFilter;
import com.android.tradefed.util.AbiUtils;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -36,8 +37,8 @@
* @param moduleArgs the list of module arguments.
*/
public CompatibilitySuiteModuleLoader(
- Map<String, List<SuiteTestFilter>> includeFilters,
- Map<String, List<SuiteTestFilter>> excludeFilters,
+ Map<String, LinkedHashSet<SuiteTestFilter>> includeFilters,
+ Map<String, LinkedHashSet<SuiteTestFilter>> excludeFilters,
List<String> testArgs,
List<String> moduleArgs) {
super(includeFilters,excludeFilters,testArgs,moduleArgs);
@@ -51,8 +52,8 @@
IRemoteTest test,
IAbi abi,
String name,
- Map<String, List<SuiteTestFilter>> includeFilters,
- Map<String, List<SuiteTestFilter>> excludeFilters) {
+ Map<String, LinkedHashSet<SuiteTestFilter>> includeFilters,
+ Map<String, LinkedHashSet<SuiteTestFilter>> excludeFilters) {
String moduleId = AbiUtils.createId(abi.getName(), name);
// Override the default behavior. Compatibility Suites expect the filter receiver.
if (!(test instanceof ITestFilterReceiver)) {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
index 4737959..9c15d35 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
@@ -40,6 +40,7 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -89,8 +90,8 @@
@Override
public SuiteModuleLoader createModuleLoader(
- Map<String, List<SuiteTestFilter>> includeFiltersFormatted,
- Map<String, List<SuiteTestFilter>> excludeFiltersFormatted,
+ Map<String, LinkedHashSet<SuiteTestFilter>> includeFiltersFormatted,
+ Map<String, LinkedHashSet<SuiteTestFilter>> excludeFiltersFormatted,
List<String> testArgs,
List<String> moduleArgs) {
return new CompatibilitySuiteModuleLoader(includeFiltersFormatted,
