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

Make PreferenceController a mixin

Browse Source 
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
This commit is contained in:
Tony Mantler
2017-06-13 13:09:25 -07:00
parent 4bac421538
commit 1d583e125f
203 changed files with 1027 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -32,10 +32,11 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
@@ -126,7 +127,7 @@ public class DashboardFragmentTest {
@Test
public void onAttach_shouldCreatePlaceholderPreferenceController() {
final PreferenceController controller = mTestFragment.getPreferenceController(
final AbstractPreferenceController controller = mTestFragment.getPreferenceController(
DashboardTilePlaceholderPreferenceController.class);
assertThat(controller).isNotNull();
@@ -134,9 +135,11 @@ public class DashboardFragmentTest {
@Test
public void updateState_skipUnavailablePrefs() {
final List<PreferenceController> preferenceControllers = mTestFragment.mControllers;
final PreferenceController mockController1 = mock(PreferenceController.class);
final PreferenceController mockController2 = mock(PreferenceController.class);
final List<AbstractPreferenceController> preferenceControllers = mTestFragment.mControllers;
final AbstractPreferenceController mockController1 =
mock(AbstractPreferenceController.class);
final AbstractPreferenceController mockController2 =
mock(AbstractPreferenceController.class);
preferenceControllers.add(mockController1);
preferenceControllers.add(mockController2);
when(mockController1.isAvailable()).thenReturn(false);
@@ -149,7 +152,8 @@ public class DashboardFragmentTest {
verify(mockController2).getPreferenceKey();
}
public static class TestPreferenceController extends PreferenceController {
public static class TestPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public TestPreferenceController(Context context) {
super(context);
@@ -180,7 +184,7 @@ public class DashboardFragmentTest {
private final PreferenceManager mPreferenceManager;
private final Context mContext;
private final List<PreferenceController> mControllers;
private final List<AbstractPreferenceController> mControllers;
public final PreferenceScreen mScreen;
@@ -221,7 +225,7 @@ public class DashboardFragmentTest {
}
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
return mControllers;
}