Skip to content

GitLab

T
tangled
Commit 91b073dd authored by isherman@chromium.org's avatar isherman@chromium.org
Browse files
Options

[Autofill] Update unit tests to use country codes when setting raw address info. 

BUG=100845


Review URL: https://chromiumcodereview.appspot.com/11635039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175254 0039d316-1c4b-4281-b951-d872f2087c98
parent e039ea2a
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
chrome/browser/autofill/address_unittest.cc
View file @ 91b073dd
...@@ -45,15 +45,15 @@ TEST_F(AddressTest, GetCountry) { ...@@ -45,15 +45,15 @@ TEST_F(AddressTest, GetCountry) {
EXPECT_EQ(std::string(), address.country_code()); EXPECT_EQ(std::string(), address.country_code());
// Make sure that nothing breaks when the country code is missing. // Make sure that nothing breaks when the country code is missing.
string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); string16 country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ(string16(), country); EXPECT_EQ(string16(), country);
address.set_country_code("US"); address.set_country_code("US");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ(ASCIIToUTF16("United States"), country); EXPECT_EQ(ASCIIToUTF16("United States"), country);
address.set_country_code("CA"); address.set_country_code("CA");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ(ASCIIToUTF16("Canada"), country); EXPECT_EQ(ASCIIToUTF16("Canada"), country);
} }
...@@ -63,32 +63,32 @@ TEST_F(AddressTest, SetCountry) { ...@@ -63,32 +63,32 @@ TEST_F(AddressTest, SetCountry) {
EXPECT_EQ(std::string(), address.country_code()); EXPECT_EQ(std::string(), address.country_code());
// Test basic conversion. // Test basic conversion.
address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"), "en-US");
string16 country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); string16 country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ("US", address.country_code()); EXPECT_EQ("US", address.country_code());
EXPECT_EQ(ASCIIToUTF16("United States"), country); EXPECT_EQ(ASCIIToUTF16("United States"), country);
// Test basic synonym detection. // Test basic synonym detection.
address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA")); address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("USA"), "en-US");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ("US", address.country_code()); EXPECT_EQ("US", address.country_code());
EXPECT_EQ(ASCIIToUTF16("United States"), country); EXPECT_EQ(ASCIIToUTF16("United States"), country);
// Test case-insensitivity. // Test case-insensitivity.
address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA")); address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("canADA"), "en-US");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ("CA", address.country_code()); EXPECT_EQ("CA", address.country_code());
EXPECT_EQ(ASCIIToUTF16("Canada"), country); EXPECT_EQ(ASCIIToUTF16("Canada"), country);
// Test country code detection. // Test country code detection.
address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP")); address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("JP"), "en-US");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ("JP", address.country_code()); EXPECT_EQ("JP", address.country_code());
EXPECT_EQ(ASCIIToUTF16("Japan"), country); EXPECT_EQ(ASCIIToUTF16("Japan"), country);
// Test that we ignore unknown countries. // Test that we ignore unknown countries.
address.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown")); address.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Unknown"), "en-US");
country = address.GetRawInfo(ADDRESS_HOME_COUNTRY); country = address.GetInfo(ADDRESS_HOME_COUNTRY, "en-US");
EXPECT_EQ(std::string(), address.country_code()); EXPECT_EQ(std::string(), address.country_code());
EXPECT_EQ(string16(), country); EXPECT_EQ(string16(), country);
} }
......
chrome/browser/autofill/autofill_browsertest.cc
View file @ 91b073dd
...@@ -907,7 +907,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) { ...@@ -907,7 +907,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
L"\u898f\u7ba1\u5c0e\u904a")); L"\u898f\u7ba1\u5c0e\u904a"));
profile1.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676")); profile1.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676"));
profile1.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000")); profile1.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000"));
profile1.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India")); profile1.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India"), "en-US");
profiles.push_back(profile1); profiles.push_back(profile1);
AutofillProfile profile2; AutofillProfile profile2;
...@@ -974,7 +974,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) { ...@@ -974,7 +974,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
profile7.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA")); profile7.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
profile7.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086")); profile7.SetRawInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086"));
profile7.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565")); profile7.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565"));
profile7.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States")); profile7.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"),
"en-US");
profiles.push_back(profile7); profiles.push_back(profile7);
SetProfiles(&profiles); SetProfiles(&profiles);
...@@ -1045,8 +1046,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) { ...@@ -1045,8 +1046,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) {
without_invalid.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale")); without_invalid.SetRawInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale"));
without_invalid.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA")); without_invalid.SetRawInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
without_invalid.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip")); without_invalid.SetRawInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip"));
without_invalid.SetRawInfo(ADDRESS_HOME_COUNTRY, without_invalid.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"),
ASCIIToUTF16("United States")); "en-US");
AutofillProfile with_invalid = without_invalid; AutofillProfile with_invalid = without_invalid;
with_invalid.SetRawInfo(PHONE_HOME_WHOLE_NUMBER, with_invalid.SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
...@@ -1490,7 +1491,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) { ...@@ -1490,7 +1491,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) {
profile.SetRawInfo(ADDRESS_HOME_CITY, city); profile.SetRawInfo(ADDRESS_HOME_CITY, city);
profile.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA")); profile.SetRawInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
profile.SetRawInfo(ADDRESS_HOME_ZIP, zip); profile.SetRawInfo(ADDRESS_HOME_ZIP, zip);
profile.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States")); profile.SetRawInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"US"));
profiles.push_back(profile); profiles.push_back(profile);
} }
SetProfiles(&profiles); SetProfiles(&profiles);
......
chrome/browser/autofill/autofill_manager_unittest.cc
View file @ 91b073dd
...@@ -160,7 +160,7 @@ class TestPersonalDataManager : public PersonalDataManager { ...@@ -160,7 +160,7 @@ class TestPersonalDataManager : public PersonalDataManager {
autofill_test::SetProfileInfo(profile, "Elvis", "Aaron", autofill_test::SetProfileInfo(profile, "Elvis", "Aaron",
"Presley", "theking@gmail.com", "RCA", "Presley", "theking@gmail.com", "RCA",
"3734 Elvis Presley Blvd.", "Apt. 10", "3734 Elvis Presley Blvd.", "Apt. 10",
"Memphis", "Tennessee", "38116", "USA", "Memphis", "Tennessee", "38116", "US",
"12345678901"); "12345678901");
profile->set_guid("00000000-0000-0000-0000-000000000001"); profile->set_guid("00000000-0000-0000-0000-000000000001");
profiles->push_back(profile); profiles->push_back(profile);
...@@ -168,7 +168,7 @@ class TestPersonalDataManager : public PersonalDataManager { ...@@ -168,7 +168,7 @@ class TestPersonalDataManager : public PersonalDataManager {
autofill_test::SetProfileInfo(profile, "Charles", "Hardin", autofill_test::SetProfileInfo(profile, "Charles", "Hardin",
"Holley", "buddy@gmail.com", "Decca", "Holley", "buddy@gmail.com", "Decca",
"123 Apple St.", "unit 6", "Lubbock", "123 Apple St.", "unit 6", "Lubbock",
"Texas", "79401", "USA", "23456789012"); "Texas", "79401", "US", "23456789012");
profile->set_guid("00000000-0000-0000-0000-000000000002"); profile->set_guid("00000000-0000-0000-0000-000000000002");
profiles->push_back(profile); profiles->push_back(profile);
profile = new AutofillProfile; profile = new AutofillProfile;
...@@ -2421,8 +2421,7 @@ TEST_F(AutofillManagerTest, FillPhoneNumber) { ...@@ -2421,8 +2421,7 @@ TEST_F(AutofillManagerTest, FillPhoneNumber) {
// We should not be able to fill prefix and suffix fields for international // We should not be able to fill prefix and suffix fields for international
// numbers. // numbers.
work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("GB"));
ASCIIToUTF16("United Kingdom"));
work_profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER, work_profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER,
ASCIIToUTF16("447700954321")); ASCIIToUTF16("447700954321"));
page_id = 3; page_id = 3;
...@@ -2461,7 +2460,7 @@ TEST_F(AutofillManagerTest, FillPhoneNumber) { ...@@ -2461,7 +2460,7 @@ TEST_F(AutofillManagerTest, FillPhoneNumber) {
std::vector<string16> phone_variants; std::vector<string16> phone_variants;
phone_variants.push_back(ASCIIToUTF16("16505554567")); phone_variants.push_back(ASCIIToUTF16("16505554567"));
phone_variants.push_back(ASCIIToUTF16("18887771234")); phone_variants.push_back(ASCIIToUTF16("18887771234"));
work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); work_profile->SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
work_profile->SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, phone_variants); work_profile->SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, phone_variants);
page_id = 5; page_id = 5;
......
chrome/browser/autofill/autofill_metrics_unittest.cc
View file @ 91b073dd
...@@ -125,7 +125,7 @@ class TestPersonalDataManager : public PersonalDataManager { ...@@ -125,7 +125,7 @@ class TestPersonalDataManager : public PersonalDataManager {
autofill_test::SetProfileInfo(profile, "Elvis", "Aaron", autofill_test::SetProfileInfo(profile, "Elvis", "Aaron",
"Presley", "theking@gmail.com", "RCA", "Presley", "theking@gmail.com", "RCA",
"3734 Elvis Presley Blvd.", "Apt. 10", "3734 Elvis Presley Blvd.", "Apt. 10",
"Memphis", "Tennessee", "38116", "USA", "Memphis", "Tennessee", "38116", "US",
"12345678901"); "12345678901");
profile->set_guid("00000000-0000-0000-0000-000000000001"); profile->set_guid("00000000-0000-0000-0000-000000000001");
profiles->push_back(profile); profiles->push_back(profile);
...@@ -133,7 +133,7 @@ class TestPersonalDataManager : public PersonalDataManager { ...@@ -133,7 +133,7 @@ class TestPersonalDataManager : public PersonalDataManager {
autofill_test::SetProfileInfo(profile, "Charles", "Hardin", autofill_test::SetProfileInfo(profile, "Charles", "Hardin",
"Holley", "buddy@gmail.com", "Decca", "Holley", "buddy@gmail.com", "Decca",
"123 Apple St.", "unit 6", "Lubbock", "123 Apple St.", "unit 6", "Lubbock",
"Texas", "79401", "USA", "2345678901"); "Texas", "79401", "US", "2345678901");
profile->set_guid("00000000-0000-0000-0000-000000000002"); profile->set_guid("00000000-0000-0000-0000-000000000002");
profiles->push_back(profile); profiles->push_back(profile);
} }
......
chrome/browser/autofill/autofill_profile_unittest.cc
View file @ 91b073dd
...@@ -758,7 +758,7 @@ TEST(AutofillProfileTest, AddressCountryAbbrev) { ...@@ -758,7 +758,7 @@ TEST(AutofillProfileTest, AddressCountryAbbrev) {
field.option_contents = options; field.option_contents = options;
AutofillProfile profile; AutofillProfile profile;
profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Canada")); profile.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Canada"), "en-US");
profile.FillSelectControl(ADDRESS_HOME_COUNTRY, &field); profile.FillSelectControl(ADDRESS_HOME_COUNTRY, &field);
EXPECT_EQ(ASCIIToUTF16("CA"), field.value); EXPECT_EQ(ASCIIToUTF16("CA"), field.value);
} }
......
chrome/browser/autofill/personal_data_manager_unittest.cc
View file @ 91b073dd
...@@ -111,7 +111,7 @@ TEST_F(PersonalDataManagerTest, AddProfile) { ...@@ -111,7 +111,7 @@ TEST_F(PersonalDataManagerTest, AddProfile) {
autofill_test::SetProfileInfo(&profile0, autofill_test::SetProfileInfo(&profile0,
"John", "Mitchell", "Smith", "John", "Mitchell", "Smith",
"j@s.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco", "CA", "j@s.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco", "CA",
"94102", "USA", "4158889999"); "94102", "US", "4158889999");
// Add profile0 to the database. // Add profile0 to the database.
personal_data_->AddProfile(profile0); personal_data_->AddProfile(profile0);
...@@ -981,7 +981,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) { ...@@ -981,7 +981,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameProfileWithConflict) {
expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
values.push_back(ASCIIToUTF16("(650) 223-1234")); values.push_back(ASCIIToUTF16("(650) 223-1234"));
expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values); expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States")); expected.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
ASSERT_EQ(1U, results2.size()); ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected.Compare(*results2[0])); EXPECT_EQ(0, expected.Compare(*results2[0]));
} }
...@@ -1208,7 +1208,7 @@ TEST_F(PersonalDataManagerTest, AggregateExistingAuxiliaryProfile) { ...@@ -1208,7 +1208,7 @@ TEST_F(PersonalDataManagerTest, AggregateExistingAuxiliaryProfile) {
autofill_test::SetProfileInfo(auxiliary_profile, autofill_test::SetProfileInfo(auxiliary_profile,
"Tester", "Frederick", "McAddressBookTesterson", "Tester", "Frederick", "McAddressBookTesterson",
"tester@example.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco", "tester@example.com", "Acme Inc.", "1 Main", "Apt A", "San Francisco",
"CA", "94102", "USA", "1.415.888.9999"); "CA", "94102", "US", "1.415.888.9999");
ScopedVector<AutofillProfile>& auxiliary_profiles = ScopedVector<AutofillProfile>& auxiliary_profiles =
personal_data_->auxiliary_profiles_; personal_data_->auxiliary_profiles_;
auxiliary_profiles.push_back(auxiliary_profile); auxiliary_profiles.push_back(auxiliary_profile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment