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

Rename Indexable::getAllPreferenceControllers.

Browse Source 
To getPreferenceControllers. "all" is redundant. Then internally, the
old getPreferenceControllers() is renamed to
createPreferenceControllers() to emphasize the controllers are created
from code (versus the ones created from xml).

Bug: 73668763
Test: robotest
Change-Id: Ifec46aefdc2a418031c8e152028b30bdcd396fc7
This commit is contained in:
Fan Zhang
2018-02-22 13:32:32 -08:00
parent 8e6d5ad27e
commit aed8994f6f
47 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
View File

@@ -50,7 +50,7 @@ public class DashboardFragmentSearchIndexProviderInspector {
final List<AbstractPreferenceController> controllersFromSearchIndexProvider;
final List<AbstractPreferenceController> controllersFromFragment;
try {
controllersFromSearchIndexProvider = provider.getAllPreferenceControllers(context);
controllersFromSearchIndexProvider = provider.getPreferenceControllers(context);
} catch (Throwable e) {
// Can't do much with exception, assume the test passed.
return true;

2
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
View File

@@ -98,7 +98,7 @@ public final class EnterprisePrivacySettingsTest {
@Test
public void getSearchIndexProviderPreferenceControllers() throws Exception {
final List<AbstractPreferenceController> controllers
= EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getAllPreferenceControllers(
= EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext());
verifyPreferenceControllers(controllers);
}

8
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -85,7 +85,7 @@ public class BaseSearchIndexProviderTest {
public void getNonIndexableKeys_preferenceIsAvailable_shouldReturnEmptyList() {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AvailablePreferenceController(mContext));
doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
doReturn(controllers).when(mIndexProvider).createPreferenceControllers(mContext);
assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST);
}
@@ -104,7 +104,7 @@ public class BaseSearchIndexProviderTest {
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllersFromCode = new ArrayList<>();
controllersFromCode.add(new BasePreferenceController(mContext, "TEST_KEY") {
@Override
@@ -117,7 +117,7 @@ public class BaseSearchIndexProviderTest {
};
final List<AbstractPreferenceController> controllers =
provider.getAllPreferenceControllers(mContext);
provider.getPreferenceControllers(mContext);
assertThat(controllers).hasSize(3);
}
@@ -143,7 +143,7 @@ public class BaseSearchIndexProviderTest {
public void getNonIndexableKeys_preferenceIsNotAvailable_shouldReturnKey() {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new NotAvailablePreferenceController(mContext));
doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext);
doReturn(controllers).when(mIndexProvider).createPreferenceControllers(mContext);
assertThat(mIndexProvider.getNonIndexableKeys(mContext)).contains(TEST_PREF_KEY);
}

6
tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java
View File

@@ -116,11 +116,5 @@ public class FakeSettingsFragment extends DashboardFragment {
keys.add("pref_key_3");
return keys;
}
@Override
public List<AbstractPreferenceController>
getPreferenceControllers(Context context) {
return null;
}
};
}