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

Remove more things from search v1

Browse Source 
Test: robotests
Change-Id: Ide54d1cec69ae3a6782a979d3eeb7f3fc44f09b3
This commit is contained in:
Fan Zhang
2018-01-18 13:07:49 -08:00
parent b0e89cd1c3
commit 74706b6ed1
9 changed files with 39 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java
View File

@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
import com.android.settings.DisplaySettings;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.search.ResultPayload.Availability;
import com.android.settings.search.ResultPayload.PayloadType;
@@ -40,8 +39,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@@ -69,8 +66,6 @@ public class CursorToSearchResultConverterTest {
sIntent = new Intent("com.android.settings");
}
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private SiteMapManager mSiteMapManager;
private Drawable mDrawable;
private CursorToSearchResultConverter mConverter;
@@ -82,53 +77,12 @@ public class CursorToSearchResultConverterTest {
mConverter = new CursorToSearchResultConverter(context);
}
@Test
public void testParseNullResults_ReturnsNull() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, null, BASE_RANK);
assertThat(results).isNull();
}
@Test
public void testParseCursor_NotNull() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
assertThat(results).isNotNull();
}
@Test
public void testParseCursor_MatchesRank() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(BASE_RANK);
}
}
@Test
public void testParseCursor_MatchesTitle() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
for (SearchResult result : results) {
assertThat(TITLES).contains(result.title);
}
}
@Test
public void testParseCursor_MatchesSummary() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
for (SearchResult result : results) {
assertThat(result.summary).isEqualTo(SUMMARY);
}
}
@Test
public void testParseCursor_MatchesIcon() {
final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
final String BLANK = "";
cursor.addRow(new Object[]{
cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
"Longer than 20 characters", // Title
SUMMARY, // Summary on
@@ -144,8 +98,7 @@ public class CursorToSearchResultConverterTest {
payload // Payload
});
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, cursor, BASE_RANK);
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
Drawable resultDrawable = result.icon;
@@ -157,7 +110,7 @@ public class CursorToSearchResultConverterTest {
@Test
public void testParseCursor_NoIcon() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
getDummyCursor("noIcon" /* key */, "" /* className */), BASE_RANK);
for (SearchResult result : results) {
assertThat(result.icon).isNull();
}
@@ -165,8 +118,7 @@ public class CursorToSearchResultConverterTest {
@Test
public void testParseCursor_MatchesPayloadType() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
final Set<SearchResult> results = mConverter.convertCursor(getDummyCursor(), BASE_RANK);
ResultPayload payload;
for (SearchResult result : results) {
payload = result.payload;
@@ -179,7 +131,7 @@ public class CursorToSearchResultConverterTest {
final MatrixCursor cursor = new MatrixCursor(DatabaseResultLoader.SELECT_COLUMNS);
final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(sIntent));
final String BLANK = "";
cursor.addRow(new Object[]{
cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
"Longer than 20 characters", // Title
SUMMARY, // Summary on
@@ -194,8 +146,7 @@ public class CursorToSearchResultConverterTest {
PayloadType.INTENT, // Payload Type
payload // Payload
});
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(BASE_RANK + 1);
}
@@ -203,8 +154,7 @@ public class CursorToSearchResultConverterTest {
@Test
public void testParseCursor_MatchesResultPayload() {
final Set<SearchResult> results = mConverter.convertCursor(
mSiteMapManager, getDummyCursor(), BASE_RANK);
final Set<SearchResult> results = mConverter.convertCursor(getDummyCursor(), BASE_RANK);
ResultPayload payload;
for (SearchResult result : results) {
payload = result.payload;
@@ -228,7 +178,7 @@ public class CursorToSearchResultConverterTest {
final InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1 /* onValue */,
intent, true /* isDeviceSupported */, 0 /* defautValue */);
cursor.addRow(new Object[]{
cursor.addRow(new Object[] {
KEY.hashCode(), // Doc ID
TITLES.get(0), // Title
SUMMARY, // Summary on
@@ -243,8 +193,7 @@ public class CursorToSearchResultConverterTest {
type, // Payload Type
ResultPayloadUtils.marshall(payload) // Payload
});
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
final InlineSwitchPayload newPayload = (InlineSwitchPayload) result.payload;
@@ -264,9 +213,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testWifiKey_PrioritizedResult() {
final String key = "main_toggle_wifi";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -276,9 +224,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testBluetoothKey_PrioritizedResult() {
final String key = "main_toggle_bluetooth";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -288,8 +235,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testAirplaneKey_PrioritizedResult() {
final String key = "toggle_airplane";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor, BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
}
@@ -298,9 +245,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testHotspotKey_PrioritizedResult() {
final String key = "tether_settings";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -310,9 +256,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testBatterySaverKey_PrioritizedResult() {
final String key = "battery_saver";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -322,9 +267,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testNFCKey_PrioritizedResult() {
final String key = "toggle_nfc";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -334,9 +278,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testDataSaverKey_PrioritizedResult() {
final String key = "restrict_background";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
@@ -346,9 +289,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testDataUsageKey_PrioritizedResult() {
final String key = "data_usage_enable";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);
}
@@ -357,9 +299,8 @@ public class CursorToSearchResultConverterTest {
@Test
public void testRoamingKey_PrioritizedResult() {
final String key = "button_roaming_key";
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(mSiteMapManager, cursor,
BASE_RANK);
final Cursor cursor = getDummyCursor(key, WifiSettings.class.getName());
final Set<SearchResult> results = mConverter.convertCursor(cursor, BASE_RANK);
for (SearchResult result : results) {
assertThat(result.rank).isEqualTo(SearchResult.TOP_RANK);

55
tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
View File

@@ -23,9 +23,7 @@ import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -55,7 +53,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -166,33 +163,6 @@ public class DatabaseIndexingManagerTest {
assertThat(columnNames).containsAllIn(expColumnNames);
}
// Tests for the flow: IndexOneRaw -> UpdateOneRowWithFilteredData -> UpdateOneRow
@Test
public void testAddResource_withChildFragment_shouldUpdateSiteMapDb() {
// FIXME: This test was failing. (count = 6 at the end)
// SearchIndexableResource resource = getFakeResource(R.xml.network_and_internet);
// mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
// new HashMap<>());
// Cursor query = mDb.query(IndexDatabaseHelper.Tables.TABLE_SITE_MAP, SITE_MAP_COLUMNS,
// null, null, null, null, null);
// query.moveToPosition(-1);
// int count = 0;
// while (query.moveToNext()) {
// count++;
// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_CLASS)))
// .isEqualTo(className);
// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.PARENT_TITLE)))
// .isEqualTo(mContext.getString(R.string.network_dashboard_title));
// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_CLASS)))
// .isNotEmpty();
// assertThat(query.getString(query.getColumnIndex(SiteMapColumns.CHILD_TITLE)))
// .isNotEmpty();
// }
// assertThat(count).isEqualTo(5);
}
// Test new public indexing flow
@Test
@@ -363,31 +333,6 @@ public class DatabaseIndexingManagerTest {
assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
}
@Test
public void testUpdateAsyncTask_onPostExecute_performsCallback() {
IndexingCallback callback = mock(IndexingCallback.class);
DatabaseIndexingManager.IndexingTask task = mManager.new IndexingTask(callback);
task.execute();
Robolectric.flushForegroundThreadScheduler();
verify(callback).onIndexingFinished();
}
@Test
public void testUpdateAsyncTask_onPostExecute_setsIndexingComplete() {
SearchFeatureProviderImpl provider = new SearchFeatureProviderImpl();
DatabaseIndexingManager manager = spy(provider.getIndexingManager(mContext));
DatabaseIndexingManager.IndexingTask task = manager.new IndexingTask(null);
doNothing().when(manager).performIndexing();
task.execute();
Robolectric.flushForegroundThreadScheduler();
assertThat(provider.isIndexingComplete(mContext)).isTrue();
}
// Util functions
private SearchIndexableRaw getFakeRaw() {

9
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -27,7 +27,6 @@ import android.content.Intent;
import android.widget.Toolbar;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -60,14 +59,6 @@ public class SearchFeatureProviderImplTest {
SettingsShadowSystemProperties.clear();
}
@Test
public void getSiteMapManager_shouldCacheInstance() {
final SiteMapManager manager1 = mProvider.getSiteMapManager();
final SiteMapManager manager2 = mProvider.getSiteMapManager();
assertThat(manager1).isSameAs(manager2);
}
@Test
public void initSearchToolbar_shouldInitWithOnClickListener() {
mProvider.initSearchToolbar(mActivity, null);