Move testSortandGetCustomSearchEngine to a junit test.

BUG=841098

Change-Id: I09726ccc545f09da0913e78f0b4e842306cbdd8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894137
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711560}

chrome/android/chrome_junit_test_java_sources.gni

@@ -112,13 +112,13 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/metrics/VariationsSessionTest.java",
   "junit/src/org/chromium/chrome/browser/native_page/NativePageFactoryTest.java",
   "junit/src/org/chromium/chrome/browser/net/nqe/NetworkQualityProviderTest.java",
+  "junit/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateControllerTest.java",
+  "junit/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateProviderHolderTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationSystemStatusUtilUnitTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationTriggerBackgroundTaskTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationTriggerSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/channels/ChannelDefinitionsTest.java",
-  "junit/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateControllerTest.java",
-  "junit/src/org/chromium/chrome/browser/night_mode/GlobalNightModeStateProviderHolderTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/TitleUtilTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/ContentSuggestionsUnitTestUtils.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/InnerNodeTest.java",
@@ -148,16 +148,16 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/omnibox/SearchEngineLogoUtilsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/SpannableAutocompleteEditTextModelUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/UrlBarDataTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/UrlBarUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/UrlBarMediatorUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/omnibox/UrlBarUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/PlatformNetworksManagerTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/geo/VisibleNetworksTrackerTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerSuggestionProcessorUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinderUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/SimpleHorizontalLayoutViewTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorTest.java",
   "junit/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionTest.java",
@@ -170,6 +170,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",
   "junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java",
   "junit/src/org/chromium/chrome/browser/preferences/PrefServiceBridgeTest.java",
+  "junit/src/org/chromium/chrome/browser/preferences/SearchEngineAdapterTest.java",
   "junit/src/org/chromium/chrome/browser/preferences/password/DialogManagerTest.java",
   "junit/src/org/chromium/chrome/browser/preferences/password/EnsureAsyncPostingRule.java",
   "junit/src/org/chromium/chrome/browser/preferences/password/ExportWarningDialogFragmentTest.java",
@@ -209,8 +210,8 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDirectoryManagerTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDisclosureSnackbarControllerTest.java",
-  "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java",
+  "junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenDialogViewTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinderTest.java",

chrome/android/javatests/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceTest.java

@@ -13,7 +13,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
@@ -174,101 +173,6 @@ public class TemplateUrlServiceTest {
         Assert.assertEquals(searchEngines.get(1), defaultSearchEngine);
     }
 
-    @Test
-    @SmallTest
-    @Feature({"SearchEngines"})
-    @DisabledTest(message = "crbug.com/841098")
-    public void testSortandGetCustomSearchEngine() {
-        final TemplateUrlService templateUrlService = waitForTemplateUrlServiceToLoad();
-
-        // Get the number of prepopulated search engine.
-        final int prepopulatedEngineNum = getSearchEngineCount(templateUrlService);
-
-        TemplateUrl defaultSearchEngine =
-                TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<TemplateUrl>() {
-                    @Override
-                    public TemplateUrl call() {
-                        return templateUrlService.getDefaultSearchEngineTemplateUrl();
-                    }
-                });
-
-        // Add custom search engines and verified only engines visited within 2 days are added.
-        // Also verified custom engines are sorted correctly.
-        List<TemplateUrl> customSearchEngines =
-                TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<List<TemplateUrl>>() {
-                    @Override
-                    public List<TemplateUrl> call() {
-                        templateUrlService.addSearchEngineForTesting("keyword1", 0);
-                        templateUrlService.addSearchEngineForTesting("keyword2", 0);
-                        templateUrlService.addSearchEngineForTesting("keyword3", 3);
-                        List<TemplateUrl> searchEngines = templateUrlService.getTemplateUrls();
-                        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(
-                                searchEngines, defaultSearchEngine);
-                        return searchEngines.subList(prepopulatedEngineNum, searchEngines.size());
-                    }
-                });
-        Assert.assertEquals(2, customSearchEngines.size());
-        Assert.assertEquals("keyword2", customSearchEngines.get(0).getKeyword());
-        Assert.assertEquals("keyword1", customSearchEngines.get(1).getKeyword());
-
-        // Add more custom search engines and verified at most 3 custom engines are returned.
-        // Also verified custom engines are sorted correctly.
-        customSearchEngines =
-                TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<List<TemplateUrl>>() {
-                    @Override
-                    public List<TemplateUrl> call() {
-                        templateUrlService.addSearchEngineForTesting("keyword4", 0);
-                        templateUrlService.addSearchEngineForTesting("keyword5", 0);
-                        List<TemplateUrl> searchEngines = templateUrlService.getTemplateUrls();
-                        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(
-                                searchEngines, defaultSearchEngine);
-                        return searchEngines.subList(prepopulatedEngineNum, searchEngines.size());
-                    }
-                });
-        Assert.assertEquals(3, customSearchEngines.size());
-        Assert.assertEquals("keyword5", customSearchEngines.get(0).getKeyword());
-        Assert.assertEquals("keyword4", customSearchEngines.get(1).getKeyword());
-        Assert.assertEquals("keyword2", customSearchEngines.get(2).getKeyword());
-
-        // Verified last_visited is updated correctly and sorting in descending order correctly.
-        customSearchEngines =
-                TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<List<TemplateUrl>>() {
-                    @Override
-                    public List<TemplateUrl> call() {
-                        templateUrlService.updateLastVisitedForTesting("keyword3");
-                        List<TemplateUrl> searchEngines = templateUrlService.getTemplateUrls();
-                        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(
-                                searchEngines, defaultSearchEngine);
-                        return searchEngines.subList(prepopulatedEngineNum, searchEngines.size());
-                    }
-                });
-        Assert.assertEquals(3, customSearchEngines.size());
-        Assert.assertEquals("keyword3", customSearchEngines.get(0).getKeyword());
-        Assert.assertEquals("keyword5", customSearchEngines.get(1).getKeyword());
-        Assert.assertEquals("keyword4", customSearchEngines.get(2).getKeyword());
-
-        // Set a custom engine as default provider and verified still 3 custom engines are returned.
-        // Also verified custom engines are sorted correctly.
-        customSearchEngines =
-                TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<List<TemplateUrl>>() {
-                    @Override
-                    public List<TemplateUrl> call() {
-                        templateUrlService.setSearchEngine("keyword4");
-                        List<TemplateUrl> searchEngines = templateUrlService.getTemplateUrls();
-                        TemplateUrl newDefaultSearchEngine =
-                                templateUrlService.getDefaultSearchEngineTemplateUrl();
-                        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(
-                                searchEngines, newDefaultSearchEngine);
-                        return searchEngines.subList(prepopulatedEngineNum, searchEngines.size());
-                    }
-                });
-        Assert.assertEquals(4, customSearchEngines.size());
-        Assert.assertEquals("keyword4", customSearchEngines.get(0).getKeyword());
-        Assert.assertEquals("keyword3", customSearchEngines.get(1).getKeyword());
-        Assert.assertEquals("keyword5", customSearchEngines.get(2).getKeyword());
-        Assert.assertEquals("keyword2", customSearchEngines.get(3).getKeyword());
-    }
-
     @Test
     @SmallTest
     @Feature({"SearchEngines"})

chrome/android/junit/src/org/chromium/chrome/browser/preferences/SearchEngineAdapterTest.java

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.preferences;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
+import android.text.format.DateUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import org.chromium.base.CollectionUtil;
+import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.components.search_engines.TemplateUrl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Unit tests for {@link SearchEngineAdapter}. */
+@RunWith(BaseRobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class SearchEngineAdapterTest {
+    @Test
+    public void testSortandGetCustomSearchEngine() {
+        long currentTime = System.currentTimeMillis();
+        TemplateUrl dse = new MockTemplateUrl(0, "default", currentTime);
+
+        MockTemplateUrl prepopulated1 = new MockTemplateUrl(11, "prepopulated1", currentTime);
+        prepopulated1.isPrepopulated = true;
+        prepopulated1.prepopulatedId = 0;
+
+        MockTemplateUrl prepopulated2 = new MockTemplateUrl(12, "prepopulated2", currentTime - 1);
+        prepopulated2.isPrepopulated = true;
+        prepopulated2.prepopulatedId = 1;
+
+        MockTemplateUrl prepopulated3 = new MockTemplateUrl(13, "prepopulated3", currentTime - 2);
+        prepopulated3.isPrepopulated = true;
+        prepopulated3.prepopulatedId = 2;
+
+        MockTemplateUrl custom1 = new MockTemplateUrl(101, "custom_keyword1", currentTime);
+        MockTemplateUrl custom2 = new MockTemplateUrl(102, "custom_keyword2", currentTime - 1);
+        MockTemplateUrl custom3 = new MockTemplateUrl(103, "custom_keyword3", currentTime - 2);
+        MockTemplateUrl custom4 = new MockTemplateUrl(104, "custom_keyword4", currentTime - 3);
+        MockTemplateUrl custom5 = new MockTemplateUrl(105, "custom_keyword5", currentTime - 4);
+
+        List<TemplateUrl> templateUrls = CollectionUtil.newArrayList(
+                dse, prepopulated1, prepopulated2, prepopulated3, custom1, custom2, custom3);
+
+        List<TemplateUrl> output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, dse);
+        assertThat(output,
+                contains(prepopulated1, prepopulated2, prepopulated3, dse, custom1, custom2,
+                        custom3));
+
+        // Mark one of the custom engines as older than the visible threshold.
+        custom2.updateAgeInDays(3);
+        output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, dse);
+        assertThat(output,
+                contains(prepopulated1, prepopulated2, prepopulated3, dse, custom1, custom3));
+
+        // Mark one of the custom engines as older than the other.
+        custom1.updateAgeInDays(1);
+        output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, dse);
+        assertThat(output,
+                contains(prepopulated1, prepopulated2, prepopulated3, dse, custom3, custom1));
+
+        // Include more than 3 custom serach engines and ensure they're filtered accordingly.
+        templateUrls.add(custom4);
+        templateUrls.add(custom5);
+        output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, dse);
+        assertThat(output,
+                contains(prepopulated1, prepopulated2, prepopulated3, dse, custom3, custom4,
+                        custom5));
+
+        // Specify an older custom search engine as default, and ensure it is included as well as
+        // the 3 most recent custom search engines.
+        output = CollectionUtil.newArrayList(
+                prepopulated1, prepopulated2, custom1, custom2, custom3, custom4, custom5);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, custom2);
+        assertThat(
+                output, contains(prepopulated1, prepopulated2, custom2, custom3, custom4, custom5));
+    }
+
+    @Test
+    public void testSortandGetCustomSearchEngine_PrepopulateIdOrdering() {
+        long currentTime = System.currentTimeMillis();
+        MockTemplateUrl prepopulated1 = new MockTemplateUrl(11, "prepopulated1", currentTime);
+        prepopulated1.isPrepopulated = true;
+        prepopulated1.prepopulatedId = 3;
+
+        MockTemplateUrl prepopulated2 = new MockTemplateUrl(12, "prepopulated2", currentTime - 1);
+        prepopulated2.isPrepopulated = true;
+        prepopulated2.prepopulatedId = 1;
+
+        MockTemplateUrl prepopulated3 = new MockTemplateUrl(13, "prepopulated3", currentTime - 2);
+        prepopulated3.isPrepopulated = true;
+        prepopulated3.prepopulatedId = 4;
+
+        List<TemplateUrl> templateUrls =
+                CollectionUtil.newArrayList(prepopulated1, prepopulated2, prepopulated3);
+
+        List<TemplateUrl> output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, prepopulated1);
+        assertThat(output, contains(prepopulated2, prepopulated1, prepopulated3));
+
+        prepopulated1.prepopulatedId = 0;
+        output = new ArrayList<>(templateUrls);
+        SearchEngineAdapter.sortAndFilterUnnecessaryTemplateUrl(output, prepopulated1);
+        assertThat(output, contains(prepopulated1, prepopulated2, prepopulated3));
+    }
+
+    private static class MockTemplateUrl extends TemplateUrl {
+        public String shortName = "";
+        public int prepopulatedId;
+        public boolean isPrepopulated;
+        public String keyword = "";
+        public long lastVisitedTime;
+        public String url = "https://testurl.com/?searchstuff={searchTerms}";
+
+        public MockTemplateUrl(long fakeNativePtr, String keyword, long lastVisitedTime) {
+            super(fakeNativePtr);
+            this.keyword = keyword;
+            this.shortName = keyword;
+            this.lastVisitedTime = lastVisitedTime;
+        }
+
+        @Override
+        public String getShortName() {
+            return shortName;
+        }
+
+        @Override
+        public int getPrepopulatedId() {
+            return prepopulatedId;
+        }
+
+        @Override
+        public boolean getIsPrepopulated() {
+            return isPrepopulated;
+        }
+
+        @Override
+        public String getKeyword() {
+            return keyword;
+        }
+
+        @Override
+        public long getLastVisitedTime() {
+            return lastVisitedTime;
+        }
+
+        @Override
+        public String getURL() {
+            return url;
+        }
+
+        void updateAgeInDays(int days) {
+            lastVisitedTime = System.currentTimeMillis() - DateUtils.DAY_IN_MILLIS * days;
+        }
+    }
+}

components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java

@@ -86,7 +86,7 @@ public class TemplateUrl {
     }
 
     @NativeMethods
-    interface Natives {
+    public interface Natives {
         String getShortName(long templateUrlPtr);
         String getKeyword(long templateUrlPtr);
         boolean isPrepopulatedOrCreatedByPolicy(long templateUrlPtr);

components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrlService.java

@@ -330,12 +330,6 @@ public class TemplateUrlService {
                 mNativeTemplateUrlServiceAndroid, TemplateUrlService.this, keyword, ageInDays);
     }
 
-    @VisibleForTesting
-    public String updateLastVisitedForTesting(String keyword) {
-        return TemplateUrlServiceJni.get().updateLastVisitedForTesting(
-                mNativeTemplateUrlServiceAndroid, TemplateUrlService.this, keyword);
-    }
-
     @NativeMethods
     interface Natives {
         void load(long nativeTemplateUrlServiceAndroid, TemplateUrlService caller);
@@ -366,8 +360,6 @@ public class TemplateUrlService {
         boolean setPlayAPISearchEngine(long nativeTemplateUrlServiceAndroid,
                 TemplateUrlService caller, String name, String keyword, String searchUrl,
                 String suggestUrl, String faviconUrl);
-        String updateLastVisitedForTesting(
-                long nativeTemplateUrlServiceAndroid, TemplateUrlService caller, String keyword);
         void getTemplateUrls(long nativeTemplateUrlServiceAndroid, TemplateUrlService caller,
                 List<TemplateUrl> templateUrls);
         TemplateUrl getDefaultSearchEngine(

components/search_engines/android/template_url_service_android.cc

@@ -305,18 +305,6 @@ TemplateUrlServiceAndroid::AddSearchEngineForTesting(
   return base::android::ConvertUTF16ToJavaString(env, t_url->data().keyword());
 }
 
-base::android::ScopedJavaLocalRef<jstring>
-TemplateUrlServiceAndroid::UpdateLastVisitedForTesting(
-    JNIEnv* env,
-    const base::android::JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jstring>& jkeyword) {
-  base::string16 keyword =
-      base::android::ConvertJavaStringToUTF16(env, jkeyword);
-  TemplateURL* t_url = template_url_service_->GetTemplateURLForKeyword(keyword);
-  template_url_service_->UpdateTemplateURLVisitTime(t_url);
-  return base::android::ConvertUTF16ToJavaString(env, t_url->data().keyword());
-}
-
 void TemplateUrlServiceAndroid::GetTemplateUrls(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,