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

Remove accessibility duplicates in settings search

Browse Source 
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Iae179b558065d728c14eb76f136d398081577779
This commit is contained in:
Matthew Fritze
2017-04-17 07:55:41 -07:00
parent ea63c97690
commit 49915a64c5
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
View File

@@ -93,10 +93,7 @@ public class DataIntegrityTest {
for (Integer xmlResId : xmlList) {
// Get all keys to be indexed
final List<String> prefKeys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlResId);
pageKeys.addAll(prefKeys);
// Remove grandfathered keys.
pageKeys.removeAll(grandfatheredKeys);
// Find all already-existing keys.
pageKeys.retainAll(masterKeys);
// Keep list of offending duplicate keys.
@@ -105,7 +102,7 @@ public class DataIntegrityTest {
masterKeys.addAll(prefKeys);
pageKeys.clear();
}
assertThat(duplicateKeys).isEmpty();
assertThat(duplicateKeys).containsExactlyElementsIn(grandfatheredKeys);
}
/**