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

Get rid of SearchIndexableResources entirely.

Browse Source 
Bug: 37741509
Test: robotests
Change-Id: I7e6dba5e13378beae632c838b7dd13acfdc50b10
This commit is contained in:
Fan Zhang
2017-11-10 12:04:57 -08:00
parent b21112bd3d
commit ba0077977f
7 changed files with 178 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
View File

@@ -18,9 +18,7 @@ package com.android.settings.search;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.fail;
import static org.mockito.Mockito.spy;
import android.database.Cursor;
@@ -40,45 +38,45 @@ import java.util.HashSet;
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class SearchIndexableResourcesTest {
Set<Class> sProviderClassCopy;
private Set<Class> mProviderClassCopy;
@Before
public void setUp() {
sProviderClassCopy = new HashSet<>(SearchIndexableResources.sProviders);
mProviderClassCopy = new HashSet<>(SettingsSearchIndexablesProvider.INDEXABLES);
}
@After
public void cleanUp() {
SearchIndexableResources.sProviders.clear();
SearchIndexableResources.sProviders.addAll(sProviderClassCopy);
SettingsSearchIndexablesProvider.INDEXABLES.clear();
SettingsSearchIndexablesProvider.INDEXABLES.addAll(mProviderClassCopy);
}
@Test
public void testAddIndex() {
final Class stringClass = java.lang.String.class;
// Confirms that String.class isn't contained in SearchIndexableResources.
assertThat(SearchIndexableResources.sProviders).doesNotContain(stringClass);
final int beforeCount = SearchIndexableResources.providerValues().size();
assertThat(SettingsSearchIndexablesProvider.INDEXABLES).doesNotContain(stringClass);
final int beforeCount = SettingsSearchIndexablesProvider.INDEXABLES.size();
SearchIndexableResources.addIndex(java.lang.String.class);
SettingsSearchIndexablesProvider.addIndex(java.lang.String.class);
assertThat(SearchIndexableResources.sProviders).contains(stringClass);
final int afterCount = SearchIndexableResources.providerValues().size();
assertThat(SettingsSearchIndexablesProvider.INDEXABLES).contains(stringClass);
final int afterCount = SettingsSearchIndexablesProvider.INDEXABLES.size();
assertThat(afterCount).isEqualTo(beforeCount + 1);
}
@Test
public void testIndexHasWifiSettings() {
assertThat(sProviderClassCopy).contains(WifiSettings.class);
assertThat(mProviderClassCopy).contains(WifiSettings.class);
}
@Test
public void testNonIndexableKeys_GetsKeyFromProvider() {
SearchIndexableResources.sProviders.clear();
SearchIndexableResources.addIndex(FakeIndexProvider.class);
SettingsSearchIndexablesProvider.INDEXABLES.clear();
SettingsSearchIndexablesProvider.addIndex(FakeIndexProvider.class);
SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
@@ -97,8 +95,8 @@ public class SearchIndexableResourcesTest {
@Test
public void testAllClassNamesHaveProviders() {
for (Class clazz: sProviderClassCopy) {
if(DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
for (Class clazz : mProviderClassCopy) {
if (DatabaseIndexingUtils.getSearchIndexProvider(clazz) == null) {
fail(clazz.getName() + "is not an index provider");
}
}