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

Merge "Add logging to search fragment."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-13 00:51:18 +00:00
committed by Android (Google) Code Review
parent 489cbb2ad8 39f4f6ee60
commit 9b5cd25a34
7 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.search;
import android.app.Fragment;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
@@ -28,7 +27,7 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.search2.InlineSwitchPayload;
import com.android.settings.search2.InlineSwitchViewHolder;
import com.android.settings.search2.IntentPayload;
import com.android.settings.search2.SearchFragment;
import com.android.settings.search2.SearchResult;
import org.junit.Before;
@@ -53,7 +52,7 @@ public class InlineSwitchViewHolderTest {
private static final String SUMMARY = "summary";
@Mock
private Fragment mFragment;
private SearchFragment mFragment;
@Mock
private InlineSwitchPayload mPayload;
@@ -97,7 +96,7 @@ public class InlineSwitchViewHolderTest {
.addSummary(SUMMARY)
.addRank(1)
.addPayload(new InlineSwitchPayload("", 0, null))
.addBreadcrumbs(new ArrayList<String>())
.addBreadcrumbs(new ArrayList<>())
.addIcon(mIcon)
.addPayload(mPayload);

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

@@ -17,7 +17,6 @@
package com.android.settings.search;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
@@ -29,6 +28,7 @@ import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.search2.IntentPayload;
import com.android.settings.search2.IntentSearchViewHolder;
import com.android.settings.search2.SearchFragment;
import com.android.settings.search2.SearchResult;
import com.android.settings.search2.SearchResult.Builder;
@@ -54,7 +54,7 @@ public class IntentSearchViewHolderTest {
private static final String SUMMARY = "summary";
@Mock
private Fragment mFragment;
private SearchFragment mFragment;
private IntentSearchViewHolder mHolder;
private Drawable mIcon;
@@ -84,6 +84,8 @@ public class IntentSearchViewHolderTest {
assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
verify(mFragment).onSearchResultClicked();
verify(mFragment).startActivity(any(Intent.class));
}
@@ -93,7 +95,7 @@ public class IntentSearchViewHolderTest {
.addSummary(SUMMARY)
.addRank(1)
.addPayload(new IntentPayload(null))
.addBreadcrumbs(new ArrayList<String>())
.addBreadcrumbs(new ArrayList<>())
.addIcon(mIcon);
return builder.build();

10
tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.search2;
import android.content.Context;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -36,6 +37,8 @@ import org.robolectric.util.ActivityController;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -97,7 +100,14 @@ public class SearchFragmentTest {
.findFragmentById(R.id.main_content);
fragment.onQueryTextChange(testQuery);
activityController.get().onBackPressed();
activityController.pause().stop().destroy();
verify(mFeatureFactory.metricsFeatureProvider, never()).action(
any(Context.class),
eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
verify(mFeatureFactory.metricsFeatureProvider).histogram(
any(Context.class), eq(SearchFragment.RESULT_CLICK_COUNT), eq(0));
verify(mFeatureFactory.searchFeatureProvider)
.getDatabaseSearchLoader(any(Context.class), anyString());
verify(mFeatureFactory.searchFeatureProvider)