PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit test for PreferenceController

Browse Source 
As we migrate to using BasePreferenceController,
we need to change the checks for PreferenceControllerMixin.

Change-Id: I68cc065b9ac5a39eec21b7979cdb527b13c9778a
Fixes: 69917609
Test: atest
This commit is contained in:
Matthew Fritze
2017-11-29 11:05:46 -08:00
parent 80845be720
commit 09ec9ae852
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
View File

@@ -54,7 +54,7 @@ public class PreferenceControllerContractTest {
public void controllersInSearchShouldImplementPreferenceControllerMixin() {
final Set<String> 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");