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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/core/browser/contact_info_unittest.cc

Issue 347183005: autofill names - dont parse when calling SetRawInfo(FULL_NAME) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android test expectation Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/autofill/core/browser/contact_info.cc ('k') | components/autofill/core/browser/personal_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/core/browser/contact_info_unittest.cc
diff --git a/components/autofill/core/browser/contact_info_unittest.cc b/components/autofill/core/browser/contact_info_unittest.cc
index 66e424c93271944dbe6ab49862df7c15b77ae5df..937d748c35737084576a20ef68aa7b897a34bed1 100644
--- a/components/autofill/core/browser/contact_info_unittest.cc
+++ b/components/autofill/core/browser/contact_info_unittest.cc
@@ -69,80 +69,110 @@ TEST(NameInfoTest, GetFullName) {
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];
@@ -211,7 +241,7 @@ TEST(NameInfoTest, EqualsIgnoreCase) {
// Verify the test expectations.
EXPECT_EQ(test_cases[i].expected_result,
- starting_profile.EqualsIgnoreCase(additional_profile));
+ starting_profile.ParsedNamesAreEqual(additional_profile));
}
}
« no previous file with comments | « components/autofill/core/browser/contact_info.cc ('k') | components/autofill/core/browser/personal_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698