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

Merge "Revert "Get rid of SearchIndexableResources entirely.""

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-14 00:42:22 +00:00
committed by Android (Google) Code Review
parent 63a97d9c50 6c0c789460
commit bbdc72c95a
7 changed files with 218 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertWithMessage;
import android.util.ArraySet;
import android.util.Log;
@@ -30,6 +28,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import static com.google.common.truth.Truth.assertWithMessage;
/**
* {@link CodeInspector} to ensure fragments implement search components correctly.
*/
@@ -47,7 +47,7 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
+ " these are not: \n";
private static final String NOT_IN_INDEXABLE_PROVIDER_REGISTRY =
"Class containing " + DatabaseIndexingManager.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
+ " must be added to " + SettingsSearchIndexablesProvider.class.getName()
+ " must be added to " + SearchIndexableResources.class.getName()
+ " but these are not: \n";
private final List<String> notImplementingIndexableGrandfatherList;
@@ -114,7 +114,7 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
continue;
}
// Must be in SearchProviderRegistry
if (!SettingsSearchIndexablesProvider.INDEXABLES.contains(clazz)) {
if (!SearchIndexableResources.providerValues().contains(clazz)) {
if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
notInSearchProviderRegistry.add(className);
}

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

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

20
tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
View File

@@ -2,6 +2,8 @@ package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.Manifest;
import android.content.Context;
import android.content.pm.ProviderInfo;
@@ -25,21 +27,21 @@ import java.util.HashSet;
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSearchIndexablesProviderTest {
private final String BASE_AUTHORITY = "com.android.settings";
private SettingsSearchIndexablesProvider mProvider;
private Set<Class> mProviderClasses;
private Context mContext;
Set<Class> sProviderClasses;
Context mContext;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mProvider = new SettingsSearchIndexablesProvider();
mProvider = spy(new SettingsSearchIndexablesProvider());
ProviderInfo info = new ProviderInfo();
info.exported = true;
info.grantUriPermissions = true;
@@ -47,15 +49,15 @@ public class SettingsSearchIndexablesProviderTest {
info.readPermission = Manifest.permission.READ_SEARCH_INDEXABLES;
mProvider.attachInfo(mContext, info);
mProviderClasses = new HashSet<>(SettingsSearchIndexablesProvider.INDEXABLES);
SettingsSearchIndexablesProvider.INDEXABLES.clear();
SettingsSearchIndexablesProvider.INDEXABLES.add(FakeSettingsFragment.class);
sProviderClasses = new HashSet<>(SearchIndexableResources.sProviders);
SearchIndexableResources.sProviders.clear();
SearchIndexableResources.sProviders.add(FakeSettingsFragment.class);
}
@After
public void cleanUp() {
SettingsSearchIndexablesProvider.INDEXABLES.clear();
SettingsSearchIndexablesProvider.INDEXABLES.addAll(mProviderClasses);
SearchIndexableResources.sProviders.clear();
SearchIndexableResources.sProviders.addAll(sProviderClasses);
}
@Test