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

Merge "Fix unit test for PreferenceController"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-30 01:38:33 +00:00
committed by Android (Google) Code Review
parent 7ec34c1781 09ec9ae852
commit ef48f65134
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() { public void controllersInSearchShouldImplementPreferenceControllerMixin() {
final Set<String> errorClasses = new ArraySet<>(); final Set<String> errorClasses = new ArraySet<>();
for (Class clazz: SearchIndexableResources.providerValues()) { for (Class clazz : SearchIndexableResources.providerValues()) {
final Indexable.SearchIndexProvider provider = final Indexable.SearchIndexProvider provider =
DatabaseIndexingUtils.getSearchIndexProvider(clazz); DatabaseIndexingUtils.getSearchIndexProvider(clazz);
@@ -68,7 +68,8 @@ public class PreferenceControllerContractTest {
continue; continue;
} }
for (AbstractPreferenceController controller : controllers) { for (AbstractPreferenceController controller : controllers) {
if (!(controller instanceof PreferenceControllerMixin)) { if (!(controller instanceof PreferenceControllerMixin)
&& !(controller instanceof BasePreferenceController)) {
errorClasses.add(controller.getClass().getName()); errorClasses.add(controller.getClass().getName());
} }
} }
@@ -76,7 +77,8 @@ public class PreferenceControllerContractTest {
if (!errorClasses.isEmpty()) { if (!errorClasses.isEmpty()) {
final StringBuilder errorMessage = new StringBuilder() 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"); .append("the following classes don't:\n");
for (String c : errorClasses) { for (String c : errorClasses) {
errorMessage.append(c).append("\n"); errorMessage.append(c).append("\n");