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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autofill/contact_info_unittest.cc

Issue 11360055: [Autofill] Rename GetInfo and SetInfo to GetRawInfo and SetRawInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase harder Created 8 years, 1 month 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 | « chrome/browser/autofill/contact_info.cc ('k') | chrome/browser/autofill/credit_card.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autofill/contact_info_unittest.cc
diff --git a/chrome/browser/autofill/contact_info_unittest.cc b/chrome/browser/autofill/contact_info_unittest.cc
index 532262a210c4e995b0c6ba24c357dff23352109c..6589bc369a09dec4e44649ebd237e89c35946326 100644
--- a/chrome/browser/autofill/contact_info_unittest.cc
+++ b/chrome/browser/autofill/contact_info_unittest.cc
@@ -13,90 +13,89 @@
TEST(NameInfoTest, SetFullName) {
NameInfo name;
- name.SetInfo(NAME_FULL, ASCIIToUTF16("Virgil"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Virgil"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Virgil"));
+ name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Virgil"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Virgil"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Virgil"));
- name.SetInfo(NAME_FULL, ASCIIToUTF16("Murray Gell-Mann"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Murray"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Gell-Mann"));
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Murray Gell-Mann"));
+ name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Murray Gell-Mann"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Murray"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Gell-Mann"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Murray Gell-Mann"));
- name.SetInfo(NAME_FULL,
+ name.SetRawInfo(NAME_FULL,
ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Mikhail"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Yevgrafovich"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Saltykov-Shchedrin"));
- EXPECT_EQ(name.GetInfo(NAME_FULL),
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Mikhail"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Yevgrafovich"));
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Saltykov-Shchedrin"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL),
ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
- name.SetInfo(NAME_FULL, ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("Arthur"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Ignatius Conan"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Doyle"));
- EXPECT_EQ(name.GetInfo(NAME_FULL),
+ name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Arthur"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Ignatius Conan"));
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Doyle"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL),
ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
}
TEST(NameInfoTest, GetFullName) {
NameInfo name;
- name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetInfo(NAME_MIDDLE, string16());
- name.SetInfo(NAME_LAST, string16());
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First"));
+ name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+ name.SetRawInfo(NAME_MIDDLE, string16());
+ name.SetRawInfo(NAME_LAST, string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First"));
- name.SetInfo(NAME_FIRST, string16());
- name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetInfo(NAME_LAST, string16());
- EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Middle"));
+ name.SetRawInfo(NAME_FIRST, string16());
+ name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+ name.SetRawInfo(NAME_LAST, string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Middle"));
- name.SetInfo(NAME_FIRST, string16());
- name.SetInfo(NAME_MIDDLE, string16());
- name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Last"));
+ name.SetRawInfo(NAME_FIRST, string16());
+ name.SetRawInfo(NAME_MIDDLE, string16());
+ name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("Last"));
- name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetInfo(NAME_LAST, string16());
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), string16());
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Middle"));
+ name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+ name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+ name.SetRawInfo(NAME_LAST, string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle"));
- name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetInfo(NAME_MIDDLE, string16());
- name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), string16());
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Last"));
+ name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
+ name.SetRawInfo(NAME_MIDDLE, string16());
+ name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
+ EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), string16());
+ EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last"));
- name.SetInfo(NAME_FIRST, string16());
- name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), string16());
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("Middle Last"));
+ name.SetRawInfo(NAME_FIRST, string16());
+ name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
+ name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
+ EXPECT_EQ(name.GetRawInfo(NAME_FIRST), 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"));
- name.SetInfo(NAME_FIRST, ASCIIToUTF16("First"));
- name.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
- name.SetInfo(NAME_LAST, ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FIRST), ASCIIToUTF16("First"));
- EXPECT_EQ(name.GetInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
- EXPECT_EQ(name.GetInfo(NAME_LAST), ASCIIToUTF16("Last"));
- EXPECT_EQ(name.GetInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
+ 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"));
}
-
« no previous file with comments | « chrome/browser/autofill/contact_info.cc ('k') | chrome/browser/autofill/credit_card.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698