From 09ec9ae85283e65a12fd12deb98c08f2851aa6c0 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Wed, 29 Nov 2017 11:05:46 -0800 Subject: [PATCH] Fix unit test for PreferenceController As we migrate to using BasePreferenceController, we need to change the checks for PreferenceControllerMixin. Change-Id: I68cc065b9ac5a39eec21b7979cdb527b13c9778a Fixes: 69917609 Test: atest --- .../android/settings/core/PreferenceControllerContractTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java index bc82125955..86e8dc16ee 100644 --- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java +++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java @@ -54,7 +54,7 @@ public class PreferenceControllerContractTest { public void controllersInSearchShouldImplementPreferenceControllerMixin() { final Set errorClasses = new ArraySet<>(); - for (Class clazz: SearchIndexableResources.providerValues()) { + for (Class clazz : SearchIndexableResources.providerValues()) { final Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(clazz); @@ -68,7 +68,8 @@ public class PreferenceControllerContractTest { continue; } for (AbstractPreferenceController controller : controllers) { - if (!(controller instanceof PreferenceControllerMixin)) { + if (!(controller instanceof PreferenceControllerMixin) + && !(controller instanceof BasePreferenceController)) { errorClasses.add(controller.getClass().getName()); } } @@ -76,7 +77,8 @@ public class PreferenceControllerContractTest { if (!errorClasses.isEmpty()) { final StringBuilder errorMessage = new StringBuilder() - .append("Each preference must implement PreferenceControllerMixin, ") + .append("Each preference must implement PreferenceControllerMixin ") + .append("or extend BasePreferenceController, ") .append("the following classes don't:\n"); for (String c : errorClasses) { errorMessage.append(c).append("\n"); -- 2.11.0