Merge "Fix unit test for PreferenceController" (ef48f651) · Commits · e / os / android_packages_apps_Settings

tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -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");