OLD | NEW |
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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/time.h" | 8 #include "base/time.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/search_engines/search_terms_data.h" | 10 #include "chrome/browser/search_engines/search_terms_data.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 // Helper that creates some initial sync data. We cheat a little by specifying | 219 // Helper that creates some initial sync data. We cheat a little by specifying |
220 // GUIDs for easy identification later. We also make the last_modified times | 220 // GUIDs for easy identification later. We also make the last_modified times |
221 // slightly older than CreateTestTemplateURL's default, to test conflict | 221 // slightly older than CreateTestTemplateURL's default, to test conflict |
222 // resolution. | 222 // resolution. |
223 syncer::SyncDataList CreateInitialSyncData() const; | 223 syncer::SyncDataList CreateInitialSyncData() const; |
224 | 224 |
225 // Syntactic sugar. | 225 // Syntactic sugar. |
226 TemplateURL* Deserialize(const syncer::SyncData& sync_data); | 226 TemplateURL* Deserialize(const syncer::SyncData& sync_data); |
227 | 227 |
| 228 // Creates a new TemplateURL copying the fields of |turl| but replacing |
| 229 // the |url| and |guid| and initializing the date_created and last_modified |
| 230 // timestamps to a default value of 100. The caller owns the returned |
| 231 // TemplateURL*. |
| 232 TemplateURL* CopyTemplateURL(const TemplateURL* turl, |
| 233 const std::string& url, |
| 234 const std::string& guid); |
| 235 |
228 protected: | 236 protected: |
229 // We keep two TemplateURLServices to test syncing between them. | 237 // We keep two TemplateURLServices to test syncing between them. |
230 TemplateURLServiceTestUtil test_util_a_; | 238 TemplateURLServiceTestUtil test_util_a_; |
231 scoped_ptr<TestingProfile> profile_b_; | 239 scoped_ptr<TestingProfile> profile_b_; |
232 scoped_ptr<TemplateURLService> model_b_; | 240 scoped_ptr<TemplateURLService> model_b_; |
233 | 241 |
234 // Our dummy ChangeProcessor used to inspect changes pushed to Sync. | 242 // Our dummy ChangeProcessor used to inspect changes pushed to Sync. |
235 scoped_ptr<TestChangeProcessor> sync_processor_; | 243 scoped_ptr<TestChangeProcessor> sync_processor_; |
236 scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_; | 244 scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_; |
237 | 245 |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 return list; | 362 return list; |
355 } | 363 } |
356 | 364 |
357 TemplateURL* TemplateURLServiceSyncTest::Deserialize( | 365 TemplateURL* TemplateURLServiceSyncTest::Deserialize( |
358 const syncer::SyncData& sync_data) { | 366 const syncer::SyncData& sync_data) { |
359 syncer::SyncChangeList dummy; | 367 syncer::SyncChangeList dummy; |
360 return TemplateURLService::CreateTemplateURLFromTemplateURLAndSyncData(NULL, | 368 return TemplateURLService::CreateTemplateURLFromTemplateURLAndSyncData(NULL, |
361 NULL, sync_data, &dummy); | 369 NULL, sync_data, &dummy); |
362 } | 370 } |
363 | 371 |
| 372 TemplateURL* TemplateURLServiceSyncTest::CopyTemplateURL( |
| 373 const TemplateURL* turl, |
| 374 const std::string& url, |
| 375 const std::string& guid) { |
| 376 TemplateURLData data (turl->data()); |
| 377 data.SetURL(url); |
| 378 data.date_created = Time::FromTimeT(100); |
| 379 data.last_modified = Time::FromTimeT(100); |
| 380 data.sync_guid = guid; |
| 381 return new TemplateURL(NULL, data); |
| 382 } |
364 | 383 |
365 // Actual tests --------------------------------------------------------------- | 384 // Actual tests --------------------------------------------------------------- |
366 | 385 |
367 TEST_F(TemplateURLServiceSyncTest, SerializeDeserialize) { | 386 TEST_F(TemplateURLServiceSyncTest, SerializeDeserialize) { |
368 // Create a TemplateURL and convert it into a sync specific type. | 387 // Create a TemplateURL and convert it into a sync specific type. |
369 scoped_ptr<TemplateURL> turl( | 388 scoped_ptr<TemplateURL> turl( |
370 CreateTestTemplateURL( | 389 CreateTestTemplateURL( |
371 ASCIIToUTF16("unittest"), "http://www.unittest.com/")); | 390 ASCIIToUTF16("unittest"), "http://www.unittest.com/")); |
372 syncer::SyncData sync_data = | 391 syncer::SyncData sync_data = |
373 TemplateURLService::CreateSyncDataFromTemplateURL(*turl); | 392 TemplateURLService::CreateSyncDataFromTemplateURL(*turl); |
(...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1683 | 1702 |
1684 EXPECT_EQ(3U, model()->GetAllSyncData(syncer::SEARCH_ENGINES).size()); | 1703 EXPECT_EQ(3U, model()->GetAllSyncData(syncer::SEARCH_ENGINES).size()); |
1685 ASSERT_FALSE(model()->is_default_search_managed()); | 1704 ASSERT_FALSE(model()->is_default_search_managed()); |
1686 ASSERT_TRUE(model()->GetDefaultSearchProvider()); | 1705 ASSERT_TRUE(model()->GetDefaultSearchProvider()); |
1687 | 1706 |
1688 // Change the default search provider to a managed one. | 1707 // Change the default search provider to a managed one. |
1689 const char kName[] = "manageddefault"; | 1708 const char kName[] = "manageddefault"; |
1690 const char kSearchURL[] = "http://manageddefault.com/search?t={searchTerms}"; | 1709 const char kSearchURL[] = "http://manageddefault.com/search?t={searchTerms}"; |
1691 const char kIconURL[] = "http://manageddefault.com/icon.jpg"; | 1710 const char kIconURL[] = "http://manageddefault.com/icon.jpg"; |
1692 const char kEncodings[] = "UTF-16;UTF-32"; | 1711 const char kEncodings[] = "UTF-16;UTF-32"; |
| 1712 const char kAlternateURL[] = |
| 1713 "http://manageddefault.com/search#t={searchTerms}"; |
| 1714 const char kSearchTermsReplacementKey[] = "espv"; |
1693 test_util_a_.SetManagedDefaultSearchPreferences(true, kName, kName, | 1715 test_util_a_.SetManagedDefaultSearchPreferences(true, kName, kName, |
1694 kSearchURL, std::string(), kIconURL, kEncodings); | 1716 kSearchURL, std::string(), kIconURL, kEncodings, kAlternateURL, |
| 1717 kSearchTermsReplacementKey); |
1695 const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider(); | 1718 const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider(); |
1696 | 1719 |
1697 EXPECT_TRUE(model()->is_default_search_managed()); | 1720 EXPECT_TRUE(model()->is_default_search_managed()); |
1698 | 1721 |
1699 // Add a new entry from Sync. It should still sync in despite the default | 1722 // Add a new entry from Sync. It should still sync in despite the default |
1700 // being managed. | 1723 // being managed. |
1701 syncer::SyncChangeList changes; | 1724 syncer::SyncChangeList changes; |
1702 changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_ADD, | 1725 changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_ADD, |
1703 CreateTestTemplateURL(ASCIIToUTF16("newkeyword"), | 1726 CreateTestTemplateURL(ASCIIToUTF16("newkeyword"), |
1704 "http://new.com/{searchTerms}", | 1727 "http://new.com/{searchTerms}", |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2108 if (test_cases[i].present_in_model == SYNC || | 2131 if (test_cases[i].present_in_model == SYNC || |
2109 test_cases[i].present_in_model == BOTH) { | 2132 test_cases[i].present_in_model == BOTH) { |
2110 ASSERT_TRUE(model()->GetTemplateURLForGUID(sync_guid)); | 2133 ASSERT_TRUE(model()->GetTemplateURLForGUID(sync_guid)); |
2111 EXPECT_EQ(expected_sync_keyword, sync_turl->keyword()); | 2134 EXPECT_EQ(expected_sync_keyword, sync_turl->keyword()); |
2112 EXPECT_EQ(sync_url, sync_turl->url()); | 2135 EXPECT_EQ(sync_url, sync_turl->url()); |
2113 EXPECT_EQ(sync_last_modified, sync_turl->last_modified().ToTimeT()); | 2136 EXPECT_EQ(sync_last_modified, sync_turl->last_modified().ToTimeT()); |
2114 model()->Remove(model()->GetTemplateURLForGUID(sync_guid)); | 2137 model()->Remove(model()->GetTemplateURLForGUID(sync_guid)); |
2115 } | 2138 } |
2116 } // for | 2139 } // for |
2117 } | 2140 } |
| 2141 |
| 2142 TEST_F(TemplateURLServiceSyncTest, MergePrepopulatedEngine) { |
| 2143 scoped_ptr<TemplateURL> default_turl( |
| 2144 TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL)); |
| 2145 |
| 2146 // Merge with an initial list containing a prepopulated engine with a wrong |
| 2147 // URL. |
| 2148 syncer::SyncDataList list; |
| 2149 scoped_ptr<TemplateURL> sync_turl(CopyTemplateURL(default_turl.get(), |
| 2150 "http://wrong.url.com?q={searchTerms}", "default")); |
| 2151 list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl)); |
| 2152 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2153 syncer::SEARCH_ENGINES, list, PassProcessor(), |
| 2154 CreateAndPassSyncErrorFactory()); |
| 2155 |
| 2156 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2157 EXPECT_TRUE(result_turl); |
| 2158 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); |
| 2159 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); |
| 2160 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2161 } |
| 2162 |
| 2163 TEST_F(TemplateURLServiceSyncTest, AddPrepopulatedEngine) { |
| 2164 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2165 syncer::SEARCH_ENGINES, syncer::SyncDataList(), PassProcessor(), |
| 2166 CreateAndPassSyncErrorFactory()); |
| 2167 |
| 2168 scoped_ptr<TemplateURL> default_turl( |
| 2169 TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL)); |
| 2170 TemplateURL* sync_turl = CopyTemplateURL(default_turl.get(), |
| 2171 "http://wrong.url.com?q={searchTerms}", "default"); |
| 2172 |
| 2173 // Add a prepopulated engine with a wrong URL. |
| 2174 syncer::SyncChangeList changes; |
| 2175 changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_ADD, |
| 2176 sync_turl)); |
| 2177 model()->ProcessSyncChanges(FROM_HERE, changes); |
| 2178 |
| 2179 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2180 EXPECT_TRUE(result_turl); |
| 2181 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); |
| 2182 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); |
| 2183 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2184 } |
| 2185 |
| 2186 TEST_F(TemplateURLServiceSyncTest, UpdatePrepopulatedEngine) { |
| 2187 scoped_ptr<TemplateURL> default_turl( |
| 2188 TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL)); |
| 2189 |
| 2190 TemplateURLData data(default_turl->data()); |
| 2191 data.SetURL("http://old.wrong.url.com?q={searchTerms}"); |
| 2192 data.sync_guid = "default"; |
| 2193 model()->Add(new TemplateURL(NULL, data)); |
| 2194 |
| 2195 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2196 syncer::SEARCH_ENGINES, syncer::SyncDataList(), PassProcessor(), |
| 2197 CreateAndPassSyncErrorFactory()); |
| 2198 |
| 2199 TemplateURL* sync_turl = CopyTemplateURL(default_turl.get(), |
| 2200 "http://new.wrong.url.com?q={searchTerms}", "default"); |
| 2201 |
| 2202 // Update the engine in the model, which is prepopulated, with a new one. |
| 2203 // Both have wrong URLs, but it should still get corrected. |
| 2204 syncer::SyncChangeList changes; |
| 2205 changes.push_back(CreateTestSyncChange(syncer::SyncChange::ACTION_UPDATE, |
| 2206 sync_turl)); |
| 2207 model()->ProcessSyncChanges(FROM_HERE, changes); |
| 2208 |
| 2209 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2210 EXPECT_TRUE(result_turl); |
| 2211 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); |
| 2212 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); |
| 2213 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2214 } |
| 2215 |
| 2216 TEST_F(TemplateURLServiceSyncTest, MergeEditedPrepopulatedEngine) { |
| 2217 scoped_ptr<TemplateURL> default_turl( |
| 2218 TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL)); |
| 2219 |
| 2220 TemplateURLData data(default_turl->data()); |
| 2221 data.safe_for_autoreplace = false; |
| 2222 data.SetKeyword(ASCIIToUTF16("new_kw")); |
| 2223 data.short_name = ASCIIToUTF16("my name"); |
| 2224 data.SetURL("http://wrong.url.com?q={searchTerms}"); |
| 2225 data.date_created = Time::FromTimeT(50); |
| 2226 data.last_modified = Time::FromTimeT(50); |
| 2227 data.sync_guid = "default"; |
| 2228 model()->Add(new TemplateURL(NULL, data)); |
| 2229 |
| 2230 data.date_created = Time::FromTimeT(100); |
| 2231 data.last_modified = Time::FromTimeT(100); |
| 2232 scoped_ptr<TemplateURL> sync_turl(new TemplateURL(NULL, data)); |
| 2233 syncer::SyncDataList list; |
| 2234 list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl)); |
| 2235 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2236 syncer::SEARCH_ENGINES, list, PassProcessor(), |
| 2237 CreateAndPassSyncErrorFactory()); |
| 2238 |
| 2239 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2240 EXPECT_TRUE(result_turl); |
| 2241 EXPECT_EQ(ASCIIToUTF16("new_kw"), result_turl->keyword()); |
| 2242 EXPECT_EQ(ASCIIToUTF16("my name"), result_turl->short_name()); |
| 2243 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2244 } |
| 2245 |
| 2246 TEST_F(TemplateURLServiceSyncTest, MergeNonEditedPrepopulatedEngine) { |
| 2247 scoped_ptr<TemplateURL> default_turl( |
| 2248 TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(NULL)); |
| 2249 |
| 2250 TemplateURLData data(default_turl->data()); |
| 2251 data.safe_for_autoreplace = true; // Can be replaced with built-in values. |
| 2252 data.SetKeyword(ASCIIToUTF16("new_kw")); |
| 2253 data.short_name = ASCIIToUTF16("my name"); |
| 2254 data.SetURL("http://wrong.url.com?q={searchTerms}"); |
| 2255 data.date_created = Time::FromTimeT(50); |
| 2256 data.last_modified = Time::FromTimeT(50); |
| 2257 data.sync_guid = "default"; |
| 2258 model()->Add(new TemplateURL(NULL, data)); |
| 2259 |
| 2260 data.date_created = Time::FromTimeT(100); |
| 2261 data.last_modified = Time::FromTimeT(100); |
| 2262 scoped_ptr<TemplateURL> sync_turl(new TemplateURL(NULL, data)); |
| 2263 syncer::SyncDataList list; |
| 2264 list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*sync_turl)); |
| 2265 syncer::SyncMergeResult merge_result = model()->MergeDataAndStartSyncing( |
| 2266 syncer::SEARCH_ENGINES, list, PassProcessor(), |
| 2267 CreateAndPassSyncErrorFactory()); |
| 2268 |
| 2269 const TemplateURL* result_turl = model()->GetTemplateURLForGUID("default"); |
| 2270 EXPECT_TRUE(result_turl); |
| 2271 EXPECT_EQ(default_turl->keyword(), result_turl->keyword()); |
| 2272 EXPECT_EQ(default_turl->short_name(), result_turl->short_name()); |
| 2273 EXPECT_EQ(default_turl->url(), result_turl->url()); |
| 2274 } |
OLD | NEW |