Merge "Misc search fix"

tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java

@@ -17,6 +17,8 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -26,14 +28,14 @@ import android.graphics.drawable.Drawable;
 
 import com.android.settings.DisplaySettings;
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 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;
-
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wifi.WifiSettings;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,8 +50,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class CursorToSearchResultConverterTest {
@@ -60,7 +60,7 @@ public class CursorToSearchResultConverterTest {
     private static final String TARGET_CLASS = "a.b.c.class";
     private static final String KEY = "key";
     private static final Intent INTENT = new Intent("com.android.settings");
-    private static final int ICON = R.drawable.ic_search_history;
+    private static final int ICON = R.drawable.ic_search_24dp;
     private static final int BASE_RANK = 1;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java

@@ -17,14 +17,18 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,10 +42,6 @@ import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class InlineSwitchViewHolderTest {
@@ -65,7 +65,7 @@ public class InlineSwitchViewHolderTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = RuntimeEnvironment.application;
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
 

tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java

@@ -85,7 +85,7 @@ public class IntentSearchViewHolderTest {
         View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
         mHolder = new IntentSearchViewHolder(view);
 
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
         mBadgedIcon = context.getDrawable(R.drawable.ic_add);
         when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
     }

tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java

@@ -18,11 +18,13 @@
 package com.android.settings.search;
 
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.DatabaseTestUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -33,8 +35,6 @@ import org.robolectric.annotation.Config;
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SavedQueryRecorderAndRemoverTest {
@@ -57,7 +57,7 @@ public class SavedQueryRecorderAndRemoverTest {
     public void canSaveAndRemoveQuery() {
         final String query = "test";
         mRecorder = new SavedQueryRecorder(mContext, query);
-        mRemover = new SavedQueryRemover(mContext, query);
+        mRemover = new SavedQueryRemover(mContext);
 
         // Record a new query and load all queries from DB
         mRecorder.loadInBackground();
@@ -75,4 +75,22 @@ public class SavedQueryRecorderAndRemoverTest {
         // Saved query list should be empty because it's removed.
         assertThat(results).isEmpty();
     }
+
+    @Test
+    public void canRemoveAllQueriesAtOnce() {
+        mRemover = new SavedQueryRemover(mContext);;
+
+        // Record a new query and load all queries from DB
+        new SavedQueryRecorder(mContext, "Test1").loadInBackground();
+        new SavedQueryRecorder(mContext, "Test2").loadInBackground();
+        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
+        List<? extends SearchResult> results = loader.loadInBackground();
+        assertThat(results.size()).isEqualTo(2);
+
+        mRemover.loadInBackground();
+        results = loader.loadInBackground();
+
+        // Saved query list should be empty because it's removed.
+        assertThat(results).isEmpty();
+    }
 }

tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java

@@ -26,8 +26,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +47,6 @@ public class SavedQueryViewHolderTest {
     private SavedQueryViewHolder mHolder;
     private View mView;
     private View mTitleView;
-    private View mRemoveButton;
 
     @Before
     public void setUp() {
@@ -56,7 +55,6 @@ public class SavedQueryViewHolderTest {
         mView = LayoutInflater.from(mContext)
                 .inflate(R.layout.search_saved_query_item, null);
         mTitleView = mView.findViewById(android.R.id.title);
-        mRemoveButton = mView.findViewById(android.R.id.icon);
         mHolder = new SavedQueryViewHolder(mView);
     }
 
@@ -65,10 +63,8 @@ public class SavedQueryViewHolderTest {
         final SearchResult result = mock(SearchResult.class);
         mHolder.onBind(mSearchFragment, result);
 
-        mTitleView.performClick();
-        mRemoveButton.performClick();
+        mHolder.itemView.performClick();
 
         verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
-        verify(mSearchFragment).onRemoveSavedQueryClicked(nullable(CharSequence.class));
     }
 }

tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java

@@ -17,14 +17,16 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchResult.Builder;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,8 +36,6 @@ import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultBuilderTest {
@@ -57,7 +57,7 @@ public class SearchResultBuilderTest {
         mResultPayload = new ResultPayload(new Intent());
 
         final Context context = ShadowApplication.getInstance().getApplicationContext();
-        mIcon = context.getDrawable(R.drawable.ic_search_history);
+        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
     }
 
     @Test

tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java

@@ -17,6 +17,14 @@
 
 package com.android.settings.search;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -26,10 +34,10 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.SearchResult.Builder;
 import com.android.settings.search.ranking.SearchResultsRankerCallback;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,14 +57,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SearchResultsAdapterTest {
@@ -553,7 +553,7 @@ public class SearchResultsAdapterTest {
     private Set<SearchResult> getIntentSampleResults() {
         Set<SearchResult> sampleResults = new HashSet<>();
         ArrayList<String> breadcrumbs = new ArrayList<>();
-        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_history);
+        final Drawable icon = mContext.getDrawable(R.drawable.ic_search_24dp);
         final ResultPayload payload = new ResultPayload(null);
         final SearchResult.Builder builder = new Builder();
         builder.setTitle("title")