summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 23:04:55 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 23:04:55 +0000
commit3b3a0ca7214f89a01cea18b98b3de289165a7166 (patch)
tree6a84be99eda9211c123dc384b08deceba83e22db /chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
parent45e616f2c317128ed25714a8cdc35d7d8ff9f43a (diff)
downloadchromium_src-3b3a0ca7214f89a01cea18b98b3de289165a7166.zip
chromium_src-3b3a0ca7214f89a01cea18b98b3de289165a7166.tar.gz
chromium_src-3b3a0ca7214f89a01cea18b98b3de289165a7166.tar.bz2
Autofill rename GetFieldText to GetInfo
Renames AutofillProfile::GetFieldText to AutofillProfile::GetInfo. To match SetInfo. BUG=none TEST=none Review URL: http://codereview.chromium.org/6713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc')
-rw-r--r--chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc48
1 files changed, 22 insertions, 26 deletions
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
index 5e9a4d0..46f02a3 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -163,35 +163,31 @@ TEST_F(AutofillIeToolbarImportTest, TestAutoFillImport) {
EXPECT_TRUE(ImportCurrentUserProfiles(&profiles, &credit_cards));
ASSERT_EQ(profiles.size(), 2);
// The profiles are read in reverse order.
- EXPECT_EQ(profiles[1].GetFieldText(NAME_FIRST), profile1[0].value);
- EXPECT_EQ(profiles[1].GetFieldText(NAME_MIDDLE), profile1[1].value);
- EXPECT_EQ(profiles[1].GetFieldText(NAME_LAST), profile1[2].value);
- EXPECT_EQ(profiles[1].GetFieldText(EMAIL_ADDRESS), profile1[3].value);
- EXPECT_EQ(profiles[1].GetFieldText(COMPANY_NAME), profile1[4].value);
- EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_COUNTRY_CODE),
- profile1[7].value);
- EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_CITY_CODE), profile1[6].value);
- EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_NUMBER), L"5555555");
- EXPECT_EQ(profiles[1].GetFieldText(PHONE_HOME_WHOLE_NUMBER), L"14445555555");
-
- EXPECT_EQ(profiles[0].GetFieldText(NAME_FIRST), profile2[0].value);
- EXPECT_EQ(profiles[0].GetFieldText(NAME_LAST), profile2[1].value);
- EXPECT_EQ(profiles[0].GetFieldText(EMAIL_ADDRESS), profile2[2].value);
- EXPECT_EQ(profiles[0].GetFieldText(COMPANY_NAME), profile2[3].value);
- EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_COUNTRY_CODE),
- profile2[6].value);
- EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_CITY_CODE), profile2[5].value);
- EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_NUMBER), L"5556666");
- EXPECT_EQ(profiles[0].GetFieldText(PHONE_FAX_WHOLE_NUMBER), L"27775556666");
+ EXPECT_EQ(profiles[1].GetInfo(NAME_FIRST), profile1[0].value);
+ EXPECT_EQ(profiles[1].GetInfo(NAME_MIDDLE), profile1[1].value);
+ EXPECT_EQ(profiles[1].GetInfo(NAME_LAST), profile1[2].value);
+ EXPECT_EQ(profiles[1].GetInfo(EMAIL_ADDRESS), profile1[3].value);
+ EXPECT_EQ(profiles[1].GetInfo(COMPANY_NAME), profile1[4].value);
+ EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_COUNTRY_CODE), profile1[7].value);
+ EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_CITY_CODE), profile1[6].value);
+ EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_NUMBER), L"5555555");
+ EXPECT_EQ(profiles[1].GetInfo(PHONE_HOME_WHOLE_NUMBER), L"14445555555");
+
+ EXPECT_EQ(profiles[0].GetInfo(NAME_FIRST), profile2[0].value);
+ EXPECT_EQ(profiles[0].GetInfo(NAME_LAST), profile2[1].value);
+ EXPECT_EQ(profiles[0].GetInfo(EMAIL_ADDRESS), profile2[2].value);
+ EXPECT_EQ(profiles[0].GetInfo(COMPANY_NAME), profile2[3].value);
+ EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_COUNTRY_CODE), profile2[6].value);
+ EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_CITY_CODE), profile2[5].value);
+ EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_NUMBER), L"5556666");
+ EXPECT_EQ(profiles[0].GetInfo(PHONE_FAX_WHOLE_NUMBER), L"27775556666");
ASSERT_EQ(credit_cards.size(), 1);
- EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_NAME),
- credit_card[0].value);
- EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_NUMBER),
- L"4111111111111111");
- EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_EXP_MONTH),
+ EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_NAME), credit_card[0].value);
+ EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_NUMBER), L"4111111111111111");
+ EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_EXP_MONTH),
credit_card[2].value);
- EXPECT_EQ(credit_cards[0].GetFieldText(CREDIT_CARD_EXP_4_DIGIT_YEAR),
+ EXPECT_EQ(credit_cards[0].GetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR),
credit_card[3].value);
// Mock password encrypted cc.