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

Merge "Fix logging spam in DashboardFragment."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-26 01:46:26 +00:00
committed by Android (Google) Code Review
parent 45a072ecac 242da31179
commit d847d424b4
32 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/core/PreferenceControllerTest.java
View File

@@ -102,7 +102,7 @@ public class PreferenceControllerTest {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return isAvailable;
}

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

@@ -158,6 +158,21 @@ public class DashboardFragmentTest {
assertThat(preference.getOrder()).isEqualTo(-tile.priority);
}
@Test
public void updateState_skipUnavailablePrefs() {
List<PreferenceController> preferenceControllers = mTestFragment.mControllers;
preferenceControllers.add(mock(PreferenceController.class));
preferenceControllers.add(mock(PreferenceController.class));
when(preferenceControllers.get(0).isAvailable()).thenReturn(false);
when(preferenceControllers.get(1).isAvailable()).thenReturn(true);
mTestFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
mTestFragment.onResume();
verify(mTestFragment.mControllers.get(0), never()).getPreferenceKey();
verify(mTestFragment.mControllers.get(1)).getPreferenceKey();
}
public static class TestPreferenceController extends PreferenceController {
public TestPreferenceController(Context context) {
@@ -170,7 +185,7 @@ public class DashboardFragmentTest {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return false;
}
@@ -189,10 +204,12 @@ public class DashboardFragmentTest {
private final Context mContext;
public PreferenceScreen mScreen;
private List<PreferenceController> mControllers;
public TestFragment(Context context) {
mContext = context;
mScreen = mock(PreferenceScreen.class);
mControllers = new ArrayList<>();
}
@Override
@@ -227,7 +244,7 @@ public class DashboardFragmentTest {
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
return null;
return mControllers;
}
}