Update Settings search result unique ids

- SearchResult stableIds are now DocIds from the database
- DocIds are data reference key's hash, when the key is not
empty or null
- Otherwise, DocIds are a hashcode from a set of fields.

Change-Id: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Fixes: 37327194
Test: make RunSettingsRoboTest
This commit is contained in:
Matthew Fritze
2017-05-12 15:59:19 -07:00
parent 7f2d779e15
commit 6efea1e624
12 changed files with 347 additions and 499 deletions

View File

@@ -45,7 +45,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
@@ -64,16 +63,6 @@ public class DatabaseResultLoaderTest {
@Mock
private SiteMapManager mSiteMapManager;
private Context mContext;
private DatabaseResultLoader loader;
private ResultPayload mResultPayload;
private final String titleOne = "titleOne";
private final String titleTwo = "titleTwo";
private final String titleThree = "titleThree";
private final String titleFour = "titleFour";
private final String summaryOne = "summaryOne";
private final String summaryTwo = "summaryTwo";
private final String summaryThree = "summaryThree";
SQLiteDatabase mDb;
@@ -81,7 +70,6 @@ public class DatabaseResultLoaderTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mResultPayload = new ResultPayload(new Intent());
FakeFeatureFactory.setupForTest(mMockContext);
FakeFeatureFactory factory =
(FakeFeatureFactory) FakeFeatureFactory.getFactory(mMockContext);
@@ -98,285 +86,141 @@ public class DatabaseResultLoaderTest {
@Test
public void testMatchTitle() {
loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(2);
verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
}
@Test
public void testMatchSummary() {
loader = new DatabaseResultLoader(mContext, "summary", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "summary",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(2);
}
@Test
public void testMatchKeywords() {
loader = new DatabaseResultLoader(mContext, "keywords", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "keywords",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(2);
}
@Test
public void testMatchEntries() {
loader = new DatabaseResultLoader(mContext, "entries", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "entries",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(2);
}
@Test
public void testSpecialCaseWord_matchesNonPrefix() {
insertSpecialCase("Data usage");
loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseSpace_matches() {
insertSpecialCase("space");
loader = new DatabaseResultLoader(mContext, " space ", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, " space ",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseDash_matchesWordNoDash() {
insertSpecialCase("wi-fi calling");
loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseDash_matchesWordWithDash() {
insertSpecialCase("priorités seulment");
loader = new DatabaseResultLoader(mContext, "priorités", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorités",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseDash_matchesWordWithoutDash() {
insertSpecialCase("priorités seulment");
loader = new DatabaseResultLoader(mContext, "priorites", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "priorites",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseDash_matchesEntireQueryWithoutDash() {
insertSpecialCase("wi-fi calling");
loader = new DatabaseResultLoader(mContext, "wifi calling", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "wifi calling",
mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCasePrefix_matchesPrefixOfEntry() {
insertSpecialCase("Photos");
loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pho", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() {
insertSpecialCase("Photos");
loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "hot", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(0);
}
@Test
public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() {
insertSpecialCase("Apps Notifications");
loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Apps", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() {
insertSpecialCase("Apps Notifications");
loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "Not", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry() {
insertSpecialCase("Apps Notifications");
loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "pp", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(0);
}
@Test
public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry() {
insertSpecialCase("Apps Notifications");
loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "tion", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(0);
}
@Test
public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() {
insertSpecialCase("Apps & Notifications");
loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry() {
insertSpecialCase("Apps & Notifications");
loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "No", mSiteMapManager);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
public void testDeDupe_noDuplicates_originalListReturn() {
// Three elements with unique titles and summaries
List<SearchResult> results = new ArrayList();
public void testResultMatchedByMultipleQueries_duplicatesRemoved() {
String key = "durr";
insertSameValueAllFieldsCase(key);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, key, null);
SearchResult.Builder builder = new SearchResult.Builder();
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addPayload(mResultPayload);
SearchResult resultOne = builder.build();
results.add(resultOne);
builder.addTitle(titleTwo)
.addSummary(summaryTwo);
SearchResult resultTwo = builder.build();
results.add(resultTwo);
builder.addTitle(titleThree)
.addSummary(summaryThree);
SearchResult resultThree = builder.build();
results.add(resultThree);
loader = new DatabaseResultLoader(mContext, "", null);
loader.removeDuplicates(results);
assertThat(results.size()).isEqualTo(3);
assertThat(results.get(0)).isEqualTo(resultOne);
assertThat(results.get(1)).isEqualTo(resultTwo);
assertThat(results.get(2)).isEqualTo(resultThree);
}
@Test
public void testDeDupe_oneDuplicate_duplicateRemoved() {
List<SearchResult> results = new ArrayList();
SearchResult.Builder builder = new SearchResult.Builder();
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addRank(0)
.addPayload(mResultPayload);
SearchResult resultOne = builder.build();
results.add(resultOne);
// Duplicate of the first element
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addRank(1);
SearchResult resultTwo = builder.build();
results.add(resultTwo);
// Unique
builder.addTitle(titleThree)
.addSummary(summaryThree);
SearchResult resultThree = builder.build();
results.add(resultThree);
loader = new DatabaseResultLoader(mContext, "", null);
loader.removeDuplicates(results);
assertThat(results.size()).isEqualTo(2);
assertThat(results.get(0)).isEqualTo(resultOne);
assertThat(results.get(1)).isEqualTo(resultThree);
}
@Test
public void testDeDupe_firstDupeInline_secondDuplicateRemoved() {
List<SearchResult> results = new ArrayList();
InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0, null, null);
SearchResult.Builder builder = new SearchResult.Builder();
// Inline result
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addRank(0)
.addPayload(inlinePayload);
SearchResult resultOne = builder.build();
results.add(resultOne);
// Duplicate of first result, but Intent Result. Should be removed.
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addRank(1)
.addPayload(mResultPayload);
SearchResult resultTwo = builder.build();
results.add(resultTwo);
// Unique
builder.addTitle(titleThree)
.addSummary(summaryThree);
SearchResult resultThree = builder.build();
results.add(resultThree);
loader = new DatabaseResultLoader(mContext, "", null);
loader.removeDuplicates(results);
assertThat(results.size()).isEqualTo(2);
assertThat(results.get(0)).isEqualTo(resultOne);
assertThat(results.get(1)).isEqualTo(resultThree);
}
@Test
public void testDeDupe_secondDupeInline_firstDuplicateRemoved() {
/*
* Create a list as follows:
* (5) Intent Four
* (4) Inline Two
* (3) Intent Three
* (2) Intent Two
* (1) Intent One
*
* After removing duplicates:
* (4) Intent Four
* (3) Inline Two
* (2) Intent Three
* (1) Intent One
*/
List<SearchResult> results = new ArrayList();
InlineSwitchPayload inlinePayload = new InlineSwitchPayload("", 0, null, null);
SearchResult.Builder builder = new SearchResult.Builder();
// Intent One
builder.addTitle(titleOne)
.addSummary(summaryOne)
.addPayload(mResultPayload);
SearchResult resultOne = builder.build();
results.add(resultOne);
// Intent Two
builder.addTitle(titleTwo)
.addSummary(summaryTwo)
.addPayload(mResultPayload);
SearchResult resultTwo = builder.build();
results.add(resultTwo);
// Intent Three
builder.addTitle(titleThree)
.addSummary(summaryThree);
SearchResult resultThree = builder.build();
results.add(resultThree);
// Inline Two
builder.addTitle(titleTwo)
.addSummary(summaryTwo)
.addPayload(inlinePayload);
SearchResult resultFour = builder.build();
results.add(resultFour);
// Intent Four
builder.addTitle(titleFour)
.addSummary(summaryOne)
.addPayload(mResultPayload);
SearchResult resultFive = builder.build();
results.add(resultFive);
loader = new DatabaseResultLoader(mContext, "", null);
loader.removeDuplicates(results);
assertThat(results.size()).isEqualTo(4);
assertThat(results.get(0)).isEqualTo(resultOne);
assertThat(results.get(1)).isEqualTo(resultThree);
assertThat(results.get(2)).isEqualTo(resultFour);
assertThat(results.get(3)).isEqualTo(resultFive);
assertThat(loader.loadInBackground().size()).isEqualTo(1);
}
@Test
@@ -385,7 +229,7 @@ public class DatabaseResultLoaderTest {
final String caseTwo = "Banana apple";
insertSpecialCase(caseOne);
insertSpecialCase(caseTwo);
loader = new DatabaseResultLoader(mContext, "App", null);
DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "App", null);
List<? extends SearchResult> results = loader.loadInBackground();
assertThat(results.get(0).title).isEqualTo(caseOne);
@@ -418,7 +262,7 @@ public class DatabaseResultLoaderTest {
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
@@ -430,7 +274,7 @@ public class DatabaseResultLoaderTest {
final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
ContentValues values = new ContentValues();
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 0);
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
@@ -449,7 +293,7 @@ public class DatabaseResultLoaderTest {
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
@@ -457,7 +301,7 @@ public class DatabaseResultLoaderTest {
mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
values = new ContentValues();
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
@@ -476,14 +320,14 @@ public class DatabaseResultLoaderTest {
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
values = new ContentValues();
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
@@ -502,11 +346,41 @@ public class DatabaseResultLoaderTest {
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power");
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
}
private void insertSameValueAllFieldsCase(String key) {
final ResultPayload payload = new ResultPayload(new Intent());
ContentValues values = new ContentValues();
values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
}
}