Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/search_engines/template_url_service_unittest.cc

Issue 2659353002: Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland) (Closed)
Patch Set: Fixed deps Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/google/core/browser/google_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/search_engines/template_url_service.h" 5 #include "components/search_engines/template_url_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 10 matching lines...) Expand all
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/task/cancelable_task_tracker.h" 22 #include "base/task/cancelable_task_tracker.h"
23 #include "base/test/simple_test_clock.h" 23 #include "base/test/simple_test_clock.h"
24 #include "base/threading/thread.h" 24 #include "base/threading/thread.h"
25 #include "base/time/time.h" 25 #include "base/time/time.h"
26 #include "chrome/browser/history/history_service_factory.h" 26 #include "chrome/browser/history/history_service_factory.h"
27 #include "chrome/browser/search_engines/template_url_service_test_util.h" 27 #include "chrome/browser/search_engines/template_url_service_test_util.h"
28 #include "chrome/test/base/testing_profile.h" 28 #include "chrome/test/base/testing_profile.h"
29 #include "components/history/core/browser/history_service.h" 29 #include "components/history/core/browser/history_service.h"
30 #include "components/search_engines/keyword_web_data_service.h" 30 #include "components/search_engines/keyword_web_data_service.h"
31 #include "components/search_engines/search_engines_pref_names.h"
32 #include "components/search_engines/search_engines_test_util.h"
31 #include "components/search_engines/search_host_to_urls_map.h" 33 #include "components/search_engines/search_host_to_urls_map.h"
32 #include "components/search_engines/search_terms_data.h" 34 #include "components/search_engines/search_terms_data.h"
33 #include "components/search_engines/template_url.h" 35 #include "components/search_engines/template_url.h"
34 #include "components/search_engines/template_url_prepopulate_data.h" 36 #include "components/search_engines/template_url_prepopulate_data.h"
37 #include "components/sync_preferences/testing_pref_service_syncable.h"
35 #include "content/public/test/test_browser_thread_bundle.h" 38 #include "content/public/test/test_browser_thread_bundle.h"
36 #include "testing/gtest/include/gtest/gtest.h" 39 #include "testing/gtest/include/gtest/gtest.h"
37 40
38 using base::ASCIIToUTF16; 41 using base::ASCIIToUTF16;
39 using base::Time; 42 using base::Time;
40 using base::TimeDelta; 43 using base::TimeDelta;
41 44
42 namespace { 45 namespace {
43 46
44 // A prepopulated ID to set for engines we want to show in the default list. 47 // A prepopulated ID to set for engines we want to show in the default list.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // Verifies the two timestamps are equal, within the expected degree of 182 // Verifies the two timestamps are equal, within the expected degree of
180 // precision. 183 // precision.
181 void AssertTimesEqual(const base::Time& expected, const base::Time& actual); 184 void AssertTimesEqual(const base::Time& expected, const base::Time& actual);
182 185
183 // Create an URL that appears to have been prepopulated, but won't be in the 186 // Create an URL that appears to have been prepopulated, but won't be in the
184 // current data. 187 // current data.
185 std::unique_ptr<TemplateURL> CreatePreloadedTemplateURL( 188 std::unique_ptr<TemplateURL> CreatePreloadedTemplateURL(
186 bool safe_for_autoreplace, 189 bool safe_for_autoreplace,
187 int prepopulate_id); 190 int prepopulate_id);
188 191
192 // Set custom search engine as default fallback through overrides pref.
193 void SetOverriddenEngines();
194
189 // Helper methods to make calling TemplateURLServiceTestUtil methods less 195 // Helper methods to make calling TemplateURLServiceTestUtil methods less
190 // visually noisy in the test code. 196 // visually noisy in the test code.
191 void VerifyObserverCount(int expected_changed_count); 197 void VerifyObserverCount(int expected_changed_count);
192 void VerifyObserverFired(); 198 void VerifyObserverFired();
193 TemplateURLServiceTestUtil* test_util() { return test_util_.get(); } 199 TemplateURLServiceTestUtil* test_util() { return test_util_.get(); }
194 TemplateURLService* model() { return test_util_->model(); } 200 TemplateURLService* model() { return test_util_->model(); }
195 const SearchTermsData& search_terms_data() { 201 const SearchTermsData& search_terms_data() {
196 return model()->search_terms_data(); 202 return model()->search_terms_data();
197 } 203 }
198 204
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 data.favicon_url = GURL("http://favicon.url"); 291 data.favicon_url = GURL("http://favicon.url");
286 data.safe_for_autoreplace = safe_for_autoreplace; 292 data.safe_for_autoreplace = safe_for_autoreplace;
287 data.input_encodings.push_back("UTF-8"); 293 data.input_encodings.push_back("UTF-8");
288 data.date_created = Time::FromTimeT(100); 294 data.date_created = Time::FromTimeT(100);
289 data.last_modified = Time::FromTimeT(100); 295 data.last_modified = Time::FromTimeT(100);
290 data.last_visited = Time::FromTimeT(100); 296 data.last_visited = Time::FromTimeT(100);
291 data.prepopulate_id = prepopulate_id; 297 data.prepopulate_id = prepopulate_id;
292 return base::MakeUnique<TemplateURL>(data); 298 return base::MakeUnique<TemplateURL>(data);
293 } 299 }
294 300
301 void TemplateURLServiceTest::SetOverriddenEngines() {
302 // Set custom search engine as default fallback through overrides.
303 auto entry = base::MakeUnique<base::DictionaryValue>();
304 entry->SetString("name", "override_name");
305 entry->SetString("keyword", "override_keyword");
306 entry->SetString("search_url", "http://override.com/s?q={searchTerms}");
307 entry->SetString("favicon_url", "http://override.com/favicon.ico");
308 entry->SetString("encoding", "UTF-8");
309 entry->SetInteger("id", 1001);
310 entry->SetString("suggest_url",
311 "http://override.com/suggest?q={searchTerms}");
312 entry->SetString("instant_url",
313 "http://override.com/instant?q={searchTerms}");
314
315 auto overrides_list = base::MakeUnique<base::ListValue>();
316 overrides_list->Append(std::move(entry));
317
318 auto prefs = test_util()->profile()->GetTestingPrefService();
319 prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
320 new base::FundamentalValue(1));
321 prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides_list.release());
322 }
323
295 void TemplateURLServiceTest::VerifyObserverCount(int expected_changed_count) { 324 void TemplateURLServiceTest::VerifyObserverCount(int expected_changed_count) {
296 EXPECT_EQ(expected_changed_count, test_util_->GetObserverCount()); 325 EXPECT_EQ(expected_changed_count, test_util_->GetObserverCount());
297 test_util_->ResetObserverCount(); 326 test_util_->ResetObserverCount();
298 } 327 }
299 328
300 void TemplateURLServiceTest::VerifyObserverFired() { 329 void TemplateURLServiceTest::VerifyObserverFired() {
301 EXPECT_LE(1, test_util_->GetObserverCount()); 330 EXPECT_LE(1, test_util_->GetObserverCount());
302 test_util_->ResetObserverCount(); 331 test_util_->ResetObserverCount();
303 } 332 }
304 333
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 ExpectSimilar(expected_managed_default.get(), actual_managed_default); 915 ExpectSimilar(expected_managed_default.get(), actual_managed_default);
887 916
888 // The following call has no effect on the managed search engine. 917 // The following call has no effect on the managed search engine.
889 model()->RepairPrepopulatedSearchEngines(); 918 model()->RepairPrepopulatedSearchEngines();
890 919
891 EXPECT_TRUE(model()->is_default_search_managed()); 920 EXPECT_TRUE(model()->is_default_search_managed());
892 actual_managed_default = model()->GetDefaultSearchProvider(); 921 actual_managed_default = model()->GetDefaultSearchProvider();
893 ExpectSimilar(expected_managed_default.get(), actual_managed_default); 922 ExpectSimilar(expected_managed_default.get(), actual_managed_default);
894 } 923 }
895 924
925 // Checks that RepairPrepopulatedEngines correctly updates sync guid for default
926 // search. Repair is considered a user action and new DSE must be synced to
927 // other devices as well. Otherwise previous user selected engine will arrive on
928 // next sync attempt.
929 TEST_F(TemplateURLServiceTest, RepairPrepopulatedEnginesUpdatesSyncGuid) {
930 test_util()->VerifyLoad();
931
932 // The synced DSE GUID should be empty until the user selects something or
933 // there is sync activity.
934 EXPECT_TRUE(test_util()
935 ->profile()
936 ->GetTestingPrefService()
937 ->GetString(prefs::kSyncedDefaultSearchProviderGUID)
938 .empty());
939
940 TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
941 ASSERT_TRUE(initial_dse);
942
943 // Add user provided default search engine.
944 TemplateURL* user_dse = AddKeywordWithDate(
945 "user_dse", "user_dse.com", "http://www.user_dse.com/s?q={searchTerms}",
946 std::string(), std::string(), std::string(), true, "UTF-8", Time(),
947 Time(), Time());
948 model()->SetUserSelectedDefaultSearchProvider(user_dse);
949 EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider());
950 // Check that user dse is different from initial.
951 EXPECT_NE(initial_dse, user_dse);
952
953 // Check that user DSE guid is stored in kSyncedDefaultSearchProviderGUID.
954 EXPECT_EQ(user_dse->sync_guid(),
955 test_util()->profile()->GetTestingPrefService()->GetString(
956 prefs::kSyncedDefaultSearchProviderGUID));
957
958 model()->RepairPrepopulatedSearchEngines();
959
960 // Check that initial search engine is returned as default after repair.
961 ASSERT_EQ(initial_dse, model()->GetDefaultSearchProvider());
962 // Check that initial_dse guid is stored in kSyncedDefaultSearchProviderGUID.
963 const std::string dse_guid =
964 test_util()->profile()->GetTestingPrefService()->GetString(
965 prefs::kSyncedDefaultSearchProviderGUID);
966 EXPECT_EQ(initial_dse->sync_guid(), dse_guid);
967 EXPECT_EQ(initial_dse->keyword(),
968 model()->GetTemplateURLForGUID(dse_guid)->keyword());
969 }
970
971 // Checks that RepairPrepopulatedEngines correctly updates sync guid for default
972 // search when search engines are overridden using pref.
973 TEST_F(TemplateURLServiceTest,
974 RepairPrepopulatedEnginesWithOverridesUpdatesSyncGuid) {
975 SetOverriddenEngines();
976 test_util()->VerifyLoad();
977
978 // The synced DSE GUID should be empty until the user selects something or
979 // there is sync activity.
980 EXPECT_TRUE(test_util()
981 ->profile()
982 ->GetTestingPrefService()
983 ->GetString(prefs::kSyncedDefaultSearchProviderGUID)
984 .empty());
985
986 TemplateURL* overridden_engine =
987 model()->GetTemplateURLForKeyword(ASCIIToUTF16("override_keyword"));
988 ASSERT_TRUE(overridden_engine);
989
990 EXPECT_EQ(overridden_engine, model()->GetDefaultSearchProvider());
991
992 // Add user provided default search engine.
993 TemplateURL* user_dse = AddKeywordWithDate(
994 "user_dse", "user_dse.com", "http://www.user_dse.com/s?q={searchTerms}",
995 std::string(), std::string(), std::string(), true, "UTF-8", Time(),
996 Time(), Time());
997 model()->SetUserSelectedDefaultSearchProvider(user_dse);
998 EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider());
999
1000 // Check that user DSE guid is stored in kSyncedDefaultSearchProviderGUID.
1001 EXPECT_EQ(user_dse->sync_guid(),
1002 test_util()->profile()->GetTestingPrefService()->GetString(
1003 prefs::kSyncedDefaultSearchProviderGUID));
1004
1005 model()->RepairPrepopulatedSearchEngines();
1006
1007 // Check that overridden engine is returned as default after repair.
1008 ASSERT_EQ(overridden_engine, model()->GetDefaultSearchProvider());
1009 // Check that overridden_engine guid is stored in
1010 // kSyncedDefaultSearchProviderGUID.
1011 const std::string dse_guid =
1012 test_util()->profile()->GetTestingPrefService()->GetString(
1013 prefs::kSyncedDefaultSearchProviderGUID);
1014 EXPECT_EQ(overridden_engine->sync_guid(), dse_guid);
1015 EXPECT_EQ(overridden_engine->keyword(),
1016 model()->GetTemplateURLForGUID(dse_guid)->keyword());
1017 }
1018
1019 // Checks that RepairPrepopulatedEngines correctly updates sync guid for default
1020 // search when search engines is overridden by extension.
1021 TEST_F(TemplateURLServiceTest,
1022 RepairPrepopulatedEnginesWithExtensionUpdatesSyncGuid) {
1023 test_util()->VerifyLoad();
1024
1025 // The synced DSE GUID should be empty until the user selects something or
1026 // there is sync activity.
1027 EXPECT_TRUE(test_util()
1028 ->profile()
1029 ->GetTestingPrefService()
1030 ->GetString(prefs::kSyncedDefaultSearchProviderGUID)
1031 .empty());
1032
1033 // Get initial DSE to check its guid later.
1034 TemplateURL* initial_dse = model()->GetDefaultSearchProvider();
1035 ASSERT_TRUE(initial_dse);
1036
1037 // Add user provided default search engine.
1038 TemplateURL* user_dse = model()->Add(
1039 base::MakeUnique<TemplateURL>(*GenerateDummyTemplateURLData("user_dse")));
1040 model()->SetUserSelectedDefaultSearchProvider(user_dse);
1041 EXPECT_EQ(user_dse, model()->GetDefaultSearchProvider());
1042
1043 // Check that user DSE guid is stored in kSyncedDefaultSearchProviderGUID.
1044 EXPECT_EQ(user_dse->sync_guid(),
1045 test_util()->profile()->GetTestingPrefService()->GetString(
1046 prefs::kSyncedDefaultSearchProviderGUID));
1047
1048 // Add extension controlled default search engine.
1049 std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info(
1050 new TemplateURL::AssociatedExtensionInfo("extension"));
1051 extension_info->wants_to_be_default_engine = true;
1052 TemplateURL* extension_dse = model()->AddExtensionControlledTURL(
1053 base::MakeUnique<TemplateURL>(
1054 *GenerateDummyTemplateURLData("extension_dse"),
1055 TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION),
1056 std::move(extension_info));
1057 EXPECT_EQ(extension_dse, model()->GetDefaultSearchProvider());
1058 // Check that user DSE guid is still stored in
1059 // kSyncedDefaultSearchProviderGUID.
1060 EXPECT_EQ(user_dse->sync_guid(),
1061 test_util()->profile()->GetTestingPrefService()->GetString(
1062 prefs::kSyncedDefaultSearchProviderGUID));
1063
1064 model()->RepairPrepopulatedSearchEngines();
1065 // Check that extension engine is still default but sync guid is updated to
1066 // initial dse guid.
1067 EXPECT_EQ(extension_dse, model()->GetDefaultSearchProvider());
1068 EXPECT_EQ(initial_dse->sync_guid(),
1069 test_util()->profile()->GetTestingPrefService()->GetString(
1070 prefs::kSyncedDefaultSearchProviderGUID));
1071 }
1072
896 TEST_F(TemplateURLServiceTest, UpdateKeywordSearchTermsForURL) { 1073 TEST_F(TemplateURLServiceTest, UpdateKeywordSearchTermsForURL) {
897 struct TestData { 1074 struct TestData {
898 const std::string url; 1075 const std::string url;
899 const base::string16 term; 1076 const base::string16 term;
900 } data[] = { 1077 } data[] = {
901 { "http://foo/", base::string16() }, 1078 { "http://foo/", base::string16() },
902 { "http://foo/foo?q=xx", base::string16() }, 1079 { "http://foo/foo?q=xx", base::string16() },
903 { "http://x/bar?q=xx", base::string16() }, 1080 { "http://x/bar?q=xx", base::string16() },
904 { "http://x/foo?y=xx", base::string16() }, 1081 { "http://x/foo?y=xx", base::string16() },
905 { "http://x/foo?q=xx", ASCIIToUTF16("xx") }, 1082 { "http://x/foo?q=xx", ASCIIToUTF16("xx") },
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 TemplateURL* update_url = 1719 TemplateURL* update_url =
1543 model()->GetTemplateURLForKeyword(ASCIIToUTF16("engine_keyword")); 1720 model()->GetTemplateURLForKeyword(ASCIIToUTF16("engine_keyword"));
1544 const base::Time update_last_modified = update_url->last_modified(); 1721 const base::Time update_last_modified = update_url->last_modified();
1545 model()->SetUserSelectedDefaultSearchProvider(update_url); 1722 model()->SetUserSelectedDefaultSearchProvider(update_url);
1546 TemplateURL* reloaded_url = 1723 TemplateURL* reloaded_url =
1547 model()->GetTemplateURLForKeyword(ASCIIToUTF16("engine_keyword")); 1724 model()->GetTemplateURLForKeyword(ASCIIToUTF16("engine_keyword"));
1548 const base::Time reloaded_last_modified = reloaded_url->last_modified(); 1725 const base::Time reloaded_last_modified = reloaded_url->last_modified();
1549 EXPECT_NE(original_last_modified, reloaded_last_modified); 1726 EXPECT_NE(original_last_modified, reloaded_last_modified);
1550 EXPECT_EQ(update_last_modified, reloaded_last_modified); 1727 EXPECT_EQ(update_last_modified, reloaded_last_modified);
1551 } 1728 }
OLDNEW
« no previous file with comments | « no previous file | components/google/core/browser/google_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698