Add four new sync integration tests for custom search engines.

chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc

 // Copyright (c) 2011 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 36 matching lines @@
 
   // Add a few entries.
   for (int i = 0; i < 3; ++i) {
     AddSearchEngine(0, i);
   }
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 }
 
+// TCM ID - 9011135.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, Duplicates) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  // Add two entries with the same Name and URL (but different keywords).
+  // Note that we have to change the GUID of the duplicate.
+  AddSearchEngine(0, 0);
+
+  TemplateURL* dupe = CreateTestTemplateURL(0);
+  dupe->set_keyword(ASCIIToUTF16("somethingelse"));
+  dupe->set_sync_guid("newguid");
+  GetServiceForProfile(0)->Add(dupe);
+
+  TemplateURL* verifier_dupe = CreateTestTemplateURL(0);
+  verifier_dupe->set_keyword(ASCIIToUTF16("somethingelse"));
+  verifier_dupe->set_sync_guid("newguid");
+  GetVerifierService()->Add(verifier_dupe);
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+}
+
 // TCM ID - 9004201.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, UpdateKeyword) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllServicesMatch());
 
   AddSearchEngine(0, 0);
 
   // Change the keyword.
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
-  EditSearchEngine(0, "test0", "newkeyword", "test0", "http://www.test0.com/");
+  EditSearchEngine(0, "test0", "test0", "newkeyword", "http://www.test0.com/");
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 }
 
 // TCM ID - 8894859.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, UpdateUrl) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllServicesMatch());
 
   AddSearchEngine(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
   // Change the URL.
   EditSearchEngine(0, "test0", "test0", "test0",
                    "http://www.wikipedia.org/q=%s");
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 }
 
+// TCM ID - 8910490.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, UpdateName) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  AddSearchEngine(0, 0);
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+
+  // Change the short name.
+  EditSearchEngine(0, "test0", "New Name", "test0", "http://www.test0.com/");
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+}
+
 // TCM ID - 8898660.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, Delete) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(AllServicesMatch());
 
   AddSearchEngine(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
   DeleteSearchEngineBySeed(0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 }
 
+// TCM ID - 9004196.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, ConflictKeyword) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  // Add a different search engine to each client, but make their keywords
+  // conflict.
+  AddSearchEngine(0, 0);
+  AddSearchEngine(1, 1);
+  const TemplateURL* turl = GetServiceForProfile(1)->
+      GetTemplateURLForKeyword(ASCIIToUTF16("test1"));
+  EXPECT_TRUE(turl);
+  GetServiceForProfile(1)->ResetTemplateURL(turl,
+                                            turl->short_name(),
+                                            ASCIIToUTF16("test0"),
+                                            turl->url()->url());
+
+  // And we expect both to change the search engine created first to the new,
+  // uniquified keyword.
+  EditSearchEngine(-1, "test0", "test0", "test0.com", "http://www.test0.com/");

[Raghu Simha, 2011/11/16 01:14:41]

In general, for tests that involve intentional commit races, conflicts and
merges, we avoid using the verifier because we cannot predict which client's
updates win (and therefore get applied across all clients). The simple thing to
do in such tests is to call DisableVerifier() at the start, and then not worry
about the verifier while making conflicting changes.

[SteveT, 2011/11/16 15:43:32]

That makes way more sense. Thanks for pointing this out. Using DisableVerifier
instead and removing all these calls to the verifier.

+  EditSearchEngine(-1, "test1", "test1", "test0", "http://www.test1.com/");
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+}
+
+// TCM ID - 9004187.
+IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, MergeMultiple) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+  ASSERT_TRUE(AllServicesMatch());
+
+  // Set up some different search engines on each client, with some interesting
+  // conflicts.
+  // client0: { SE0, SE1, SE2 }
+  for (int i = 0; i < 3; ++i) {
+    AddSearchEngine(0, i);
+  }
+
+  // client1: { SE0, SE2, SE3, SE0 + different URL }
+  // Note that we do not use AddSearchEngine here as we don't want to set up the
+  // verifier just yet.
+  GetServiceForProfile(1)->Add(CreateTestTemplateURL(0));
+  GetServiceForProfile(1)->Add(CreateTestTemplateURL(2));
+  GetServiceForProfile(1)->Add(CreateTestTemplateURL(3));
+  TemplateURL* turl = CreateTestTemplateURL(0);
+  turl->SetURL("http://www.somethingelse.com/", 0, 0);
+  turl->set_keyword(ASCIIToUTF16("somethingelse.com"));
+  turl->set_sync_guid("somethingelse");
+  GetServiceForProfile(1)->Add(turl);
+
+  // verifier: { SE0, SE1, SE2, SE3, SE0 + different URL }
+  // We just have to add 3 and the new 0 since we've added 0-2 above.
+  GetVerifierService()->Add(CreateTestTemplateURL(3));

[Raghu Simha, 2011/11/16 01:14:41]

Same comment as above -- no need to update the verifier in tests that have
intentional races, conflicts or merges.

[SteveT, 2011/11/16 15:43:32]

Done.

+  turl = CreateTestTemplateURL(0);
+  turl->SetURL("http://www.somethingelse.com/", 0, 0);
+  turl->set_keyword(ASCIIToUTF16("somethingelse.com"));
+  turl->set_sync_guid("somethingelse");
+  GetVerifierService()->Add(turl);
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(AllServicesMatch());
+}
+
 // TCM ID - 8906436.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllServicesMatch());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
   AddSearchEngine(0, 0);
   ASSERT_TRUE(
       GetClient(0)->AwaitFullSyncCompletion("Added a search engine."));
   ASSERT_TRUE(ServiceMatchesVerifier(0));
@@ skipping 35 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
   // Change the default on the first client and delete the old default.
   ChangeDefaultSearchProvider(0, 1);
   DeleteSearchEngineBySeed(0, 0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(AllServicesMatch());
 }