autofill names - dont parse when calling SetRawInfo(FULL_NAME)

components/autofill/core/browser/contact_info_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/contact_info.h"
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 51 matching lines @@
     EXPECT_EQ(ASCIIToUTF16(test_case.full_name_input),
               name.GetInfo(AutofillType(NAME_FULL), "en-US"));
   }
 }
 
 TEST(NameInfoTest, GetFullName) {
   NameInfo name;
   name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
   name.SetRawInfo(NAME_MIDDLE, base::string16());
   name.SetRawInfo(NAME_LAST, base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First"));
+  EXPECT_EQ(ASCIIToUTF16("First"), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("First"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, base::string16());
   name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
   name.SetRawInfo(NAME_LAST, base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(ASCIIToUTF16("Middle"), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("Middle"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, base::string16());
   name.SetRawInfo(NAME_MIDDLE, base::string16());
   name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Last"));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(ASCIIToUTF16("Last"), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("Last"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
   name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
   name.SetRawInfo(NAME_LAST, base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle"));
+  EXPECT_EQ(ASCIIToUTF16("First"), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(ASCIIToUTF16("Middle"), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("First Middle"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
   name.SetRawInfo(NAME_MIDDLE, base::string16());
   name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last"));
+  EXPECT_EQ(ASCIIToUTF16("First"), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(ASCIIToUTF16("Last"), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("First Last"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, base::string16());
   name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
   name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), base::string16());
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Middle Last"));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(ASCIIToUTF16("Middle"), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(ASCIIToUTF16("Last"), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("Middle Last"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
   name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
   name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
-  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
-  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
+  EXPECT_EQ(ASCIIToUTF16("First"), name.GetRawInfo(NAME_FIRST));
+  EXPECT_EQ(ASCIIToUTF16("Middle"), name.GetRawInfo(NAME_MIDDLE));
+  EXPECT_EQ(ASCIIToUTF16("Last"), name.GetRawInfo(NAME_LAST));
+  EXPECT_EQ(base::string16(), name.GetRawInfo(NAME_FULL));
+  EXPECT_EQ(ASCIIToUTF16("First Middle Last"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
   name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Middle Last, MD"));
   EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
   EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
   EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
   EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last, MD"));
+  EXPECT_EQ(ASCIIToUTF16("First Middle Last, MD"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
-  name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+  // Setting a name to the value it already has: no change.
+  name.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16("First"), "en-US");
   EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
   EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
   EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
   EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last, MD"));
+  EXPECT_EQ(ASCIIToUTF16("First Middle Last, MD"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 
-  // Changing something (e.g., the first name) clears the stored full name.
+  // Setting raw info: no change. (Even though this leads to a slightly
+  // inconsitent state.)
   name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Second"));
   EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Second"));
   EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
   EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
-  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Second Middle Last"));
+  EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last, MD"));
+  EXPECT_EQ(ASCIIToUTF16("First Middle Last, MD"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
+
+  // Changing something (e.g., the first name) clears the stored full name.
+  name.SetInfo(AutofillType(NAME_FIRST), ASCIIToUTF16("Third"), "en-US");
+  EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Third"));
+  EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+  EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
+  EXPECT_EQ(ASCIIToUTF16("Third Middle Last"),
+            name.GetInfo(AutofillType(NAME_FULL), "en-US"));
 }
 
-TEST(NameInfoTest, EqualsIgnoreCase) {
+TEST(NameInfoTest, ParsedNamesAreEqual) {
   struct TestCase {
     std::string starting_names[3];
     std::string additional_names[3];
     bool expected_result;
   };
 
   struct TestCase test_cases[] = {
       // Identical name comparison.
       {{"Marion", "Mitchell", "Morrison"},
        {"Marion", "Mitchell", "Morrison"},
@@ skipping 48 matching lines @@
     NameInfo additional_profile;
     additional_profile.SetRawInfo(
         NAME_FIRST, ASCIIToUTF16(test_cases[i].additional_names[0]));
     additional_profile.SetRawInfo(
         NAME_MIDDLE, ASCIIToUTF16(test_cases[i].additional_names[1]));
     additional_profile.SetRawInfo(
         NAME_LAST, ASCIIToUTF16(test_cases[i].additional_names[2]));
 
     // Verify the test expectations.
     EXPECT_EQ(test_cases[i].expected_result,
-              starting_profile.EqualsIgnoreCase(additional_profile));
+              starting_profile.ParsedNamesAreEqual(additional_profile));
   }
 }
 
 }  // namespace autofill