Use AutofillProfileComparator in place of ad-hoc merge logic.

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 1725 matching lines @@
   form_structure2.DetermineHeuristicTypes();
   EXPECT_TRUE(ImportAddressProfiles(form_structure2));
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
-  // Phone formatting is updated.  Also, country gets added.
-  expected.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("650-555-6666"));
+  // Full name, phone formatting and country are updated.
+  expected.SetRawInfo(NAME_FULL, ASCIIToUTF16("George Washington"));
+  expected.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("+1 650-555-6666"));
   expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }
 
 TEST_F(PersonalDataManagerTest, ImportAddressProfiles_MissingInfoInOld) {
   FormData form1;
   FormFieldData field;
   test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
@@ skipping 57 matching lines @@
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
   AutofillProfile expected2(base::GenerateGUID(), "https://www.example.com");
   test::SetProfileInfo(&expected2, "George", NULL,
       "Washington", "theprez@gmail.com", NULL, "190 High Street", NULL,
       "Philadelphia", "Pennsylvania", "19106", NULL, NULL);
+  expected2.SetRawInfo(NAME_FULL, ASCIIToUTF16("George Washington"));
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected2.Compare(*results2[0]));
 }
 
 TEST_F(PersonalDataManagerTest, ImportAddressProfiles_MissingInfoInNew) {
   FormData form1;
   FormFieldData field;
   test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
   form1.fields.push_back(field);
@@ skipping 59 matching lines @@
   form_structure2.DetermineHeuristicTypes();
   EXPECT_TRUE(ImportAddressProfiles(form_structure2));
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
-  // Expect no change.
+  // The merge operation will populate the full name if it's empty.
+  expected.SetRawInfo(NAME_FULL, ASCIIToUTF16("George Washington"));
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }
 
 TEST_F(PersonalDataManagerTest, ImportAddressProfiles_InsufficientAddress) {
   FormData form1;
   FormFieldData field;
   test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
   form1.fields.push_back(field);
@@ skipping 819 matching lines @@
   personal_data_->SaveImportedProfile(new_verified_profile);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::RunLoop().Run();
 
   // The new profile should be merged into the existing one.
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results.size());
-  EXPECT_EQ(0, new_verified_profile.Compare(*results[0]));
+  AutofillProfile expected(new_verified_profile);
+  expected.SetRawInfo(NAME_FULL, ASCIIToUTF16("Marion Mitchell Morrison"));
+  expected.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("+1 234-567-8910"));
+  EXPECT_EQ(0, expected.Compare(*results[0]))
+      << "result = {" << *results[0] << "} | expected = {" << expected << "}";
 }
 
 // Ensure that verified credit cards can be saved via SaveImportedCreditCard.
 TEST_F(PersonalDataManagerTest, SaveImportedCreditCardWithVerifiedData) {
   // Start with a verified credit card.
   CreditCard credit_card(base::GenerateGUID(), kSettingsOrigin);
   test::SetCreditCardInfo(&credit_card,
       "Biggie Smalls", "4111 1111 1111 1111" /* Visa */, "01", "2999");
   EXPECT_TRUE(credit_card.IsVerified());
 
@@ skipping 1242 matching lines @@
   } TestCase;
 
   TestCase test_cases[] = {
       // Test that saving an identical profile except for the name results in
       // two profiles being saved.
       {ProfileFields(), {{NAME_FIRST, "Marionette"}}},
 
       // Test that saving an identical profile except with the middle name
       // initial instead of the full middle name results in the profiles
       // getting merged and the full middle name being kept.
-      {ProfileFields(), {{NAME_MIDDLE, "M"}}, {{NAME_MIDDLE, "Mitchell"}}},
+      {ProfileFields(),
+       {{NAME_MIDDLE, "M"}},
+       {{NAME_MIDDLE, "Mitchell"}, {NAME_FULL, "Marion Mitchell Morrison"}}},
 
       // Test that saving an identical profile except with the full middle name
       // instead of the middle name initial results in the profiles getting
       // merged and the full middle name replacing the initial.
       {{{NAME_MIDDLE, "M"}},
        {{NAME_MIDDLE, "Mitchell"}},
        {{NAME_MIDDLE, "Mitchell"}}},
 
       // Test that saving an identical profile except with no middle name
       // results in the profiles getting merged and the full middle name being
@@ skipping 142 matching lines @@
 
       // Tests that saving an identical except with more punctuation in the fist
       // address line, while the second is empty, results in a merge and that
       // the original address gets overwritten.
       {{{ADDRESS_HOME_LINE2, ""}},
        {{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
        {{ADDRESS_HOME_LINE1, "123, Zoo St."}}},
 
       // Tests that saving an identical profile except with less punctuation in
       // the fist address line, while the second is empty, results in a merge
-      // and that the original address gets overwritten.
+      // and that the longer address is retained..

[tmartino, 2016/06/29 18:21:30]

nit: two periods

       {{{ADDRESS_HOME_LINE2, ""}, {ADDRESS_HOME_LINE1, "123, Zoo St."}},
        {{ADDRESS_HOME_LINE2, ""}},
        {{ADDRESS_HOME_LINE1, "123 Zoo St"}}},
 
       // Tests that saving an identical profile except additional punctuation in
-      // the two address lines results in a merge and that the original address
-      // gets overwritten.
+      // the two address lines results in a merge and that the newer address
+      // is retained.
       {ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}},
        {{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}}},
 
       // Tests that saving an identical profile except less punctuation in the
-      // two address lines results in a merge and that the original address gets
-      // overwritten.
+      // two address lines results in a merge and that the newer address is
+      // retained.
       {{{ADDRESS_HOME_LINE1, "123, Zoo St."}, {ADDRESS_HOME_LINE2, "unit. 5"}},
        ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
 
       // Tests that saving an identical profile with accented characters in
-      // the two address lines results in a merge and that the original address
-      // gets overwritten.
+      // the two address lines results in a merge and that the newer address
+      // is retained.
       {ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}},
        {{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}}},
 
       // Tests that saving an identical profile without accented characters in
-      // the two address lines results in a merge and that the original address
-      // gets overwritten.
+      // the two address lines results in a merge and that the newer address
+      // is retained.
       {{{ADDRESS_HOME_LINE1, "123 Zôö St"}, {ADDRESS_HOME_LINE2, "üñìt 5"}},
        ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
 
       // Tests that saving an identical profile except that the address line 1
-      // is in the address line 2 results in a merge and that the original
-      // address lines do not get overwritten.
+      // is in the address line 2 results in a merge and that the multi-lne
+      // address is retained.
       {ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"}, {ADDRESS_HOME_LINE2, ""}},
        {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
 
       // Tests that saving an identical profile except that the address line 2
       // contains part of the old address line 1 results in a merge and that the
       // original address lines of the reference profile get overwritten.
       {{{ADDRESS_HOME_LINE1, "123 Zoo St, unit 5"}, {ADDRESS_HOME_LINE2, ""}},
        ProfileFields(),
        {{ADDRESS_HOME_LINE1, "123 Zoo St"}, {ADDRESS_HOME_LINE2, "unit 5"}}},
 
       // Tests that saving an identical profile except that the state is the
       // abbreviation instead of the full form results in a merge and that the
       // original state gets overwritten.
       {{{ADDRESS_HOME_STATE, "California"}},
        ProfileFields(),
        {{ADDRESS_HOME_STATE, "CA"}}},
 
       // Tests that saving an identical profile except that the state is the
       // full form instead of the abbreviation results in a merge and that the
-      // original state gets overwritten.
+      // abbreviated state is retained.
       {ProfileFields(),
        {{ADDRESS_HOME_STATE, "California"}},
-       {{ADDRESS_HOME_STATE, "California"}}},
+       {{ADDRESS_HOME_STATE, "CA"}}},
 
       // Tests that saving and identical profile except that the company name
       // has different punctuation and case results in a merge and that the
       // syntax of the new profile replaces the old one.
       {{{COMPANY_NAME, "Stark inc"}},
        {{COMPANY_NAME, "Stark Inc."}},
        {{COMPANY_NAME, "Stark Inc."}}},
   };
 
   for (TestCase test_case : test_cases) {
     SetupReferenceProfile();
-
     const std::vector<AutofillProfile*>& initial_profiles =
         personal_data_->GetProfiles();
 
     // Apply changes to the original profile (if applicable).
     for (ProfileField change : test_case.changes_to_original) {
       initial_profiles.front()->SetRawInfo(
           change.field_type, base::UTF8ToUTF16(change.field_value));
     }
 
     AutofillProfile profile2(base::GenerateGUID(), "https://www.example.com");
@@ skipping 855 matching lines @@
   EnableAutofillProfileCleanup();
 
   // The deduping routine should not be run.
   EXPECT_FALSE(personal_data_->ApplyDedupingRoutine());
 
   // The two duplicate profiles should still be present.
   EXPECT_EQ(2U, personal_data_->GetProfiles().size());
 }
 
 }  // namespace autofill