Skip to content

GitLab

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

[Autofill] Style cleanup: Use ASCIIToUTF16 rather than UTF8ToUTF16 in test code. 

BUG=none
TEST=none
R=estade@chromium.org

Review URL: https://codereview.chromium.org/129753002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244110 0039d316-1c4b-4281-b951-d872f2087c98
parent 9a0bbe38
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 74 deletions
chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
View file @ 91ddd08c
...@@ -23,7 +23,6 @@ using ::testing::Eq; ...@@ -23,7 +23,6 @@ using ::testing::Eq;
using ::testing::Return; using ::testing::Return;
using ::testing::Property; using ::testing::Property;
using base::ASCIIToUTF16; using base::ASCIIToUTF16;
using base::UTF8ToUTF16;
using content::BrowserThread; using content::BrowserThread;
namespace { namespace {
...@@ -275,25 +274,25 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataAndStartSyncing) { ...@@ -275,25 +274,25 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataAndStartSyncing) {
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present1, origin_present1)); new AutofillProfile(guid_present1, origin_present1));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("1 1st st")); ASCIIToUTF16("1 1st st"));
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present2, origin_present2)); new AutofillProfile(guid_present2, origin_present2));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("2 2nd st")); ASCIIToUTF16("2 2nd st"));
syncer::SyncDataList data_list; syncer::SyncDataList data_list;
AutofillProfile profile1(guid_synced1, origin_synced1); AutofillProfile profile1(guid_synced1, origin_synced1);
profile1.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Jane")); profile1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
data_list.push_back(autofill_syncable_service_.CreateData(profile1)); data_list.push_back(autofill_syncable_service_.CreateData(profile1));
AutofillProfile profile2(guid_synced2, origin_synced2); AutofillProfile profile2(guid_synced2, origin_synced2);
profile2.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Harry")); profile2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Harry"));
data_list.push_back(autofill_syncable_service_.CreateData(profile2)); data_list.push_back(autofill_syncable_service_.CreateData(profile2));
// This one will have the name and origin updated. // This one will have the name and origin updated.
AutofillProfile profile3(guid_present2, origin_synced2); AutofillProfile profile3(guid_present2, origin_synced2);
profile3.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom Doe")); profile3.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom Doe"));
data_list.push_back(autofill_syncable_service_.CreateData(profile3)); data_list.push_back(autofill_syncable_service_.CreateData(profile3));
syncer::SyncChangeList expected_change_list; syncer::SyncChangeList expected_change_list;
...@@ -326,25 +325,25 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeIdenticalProfiles) { ...@@ -326,25 +325,25 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeIdenticalProfiles) {
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present1, origin_present1)); new AutofillProfile(guid_present1, origin_present1));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("1 1st st")); ASCIIToUTF16("1 1st st"));
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present2, origin_present2)); new AutofillProfile(guid_present2, origin_present2));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("2 2nd st")); ASCIIToUTF16("2 2nd st"));
// The synced profiles are identical to the local ones, except that the guids // The synced profiles are identical to the local ones, except that the guids
// are different. // are different.
syncer::SyncDataList data_list; syncer::SyncDataList data_list;
AutofillProfile profile1(guid_synced1, origin_synced1); AutofillProfile profile1(guid_synced1, origin_synced1);
profile1.SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profile1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profile1.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("1 1st st")); profile1.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1 1st st"));
data_list.push_back(autofill_syncable_service_.CreateData(profile1)); data_list.push_back(autofill_syncable_service_.CreateData(profile1));
AutofillProfile profile2(guid_synced2, origin_synced2); AutofillProfile profile2(guid_synced2, origin_synced2);
profile2.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom")); profile2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
profile2.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("2 2nd st")); profile2.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("2 2nd st"));
data_list.push_back(autofill_syncable_service_.CreateData(profile2)); data_list.push_back(autofill_syncable_service_.CreateData(profile2));
AutofillProfile expected_profile(profile2); AutofillProfile expected_profile(profile2);
...@@ -380,27 +379,27 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeSimilarProfiles) { ...@@ -380,27 +379,27 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeSimilarProfiles) {
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present1, origin_present1)); new AutofillProfile(guid_present1, origin_present1));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("1 1st st")); ASCIIToUTF16("1 1st st"));
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present2, origin_present2)); new AutofillProfile(guid_present2, origin_present2));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1, profiles_from_web_db.back()->SetRawInfo(ADDRESS_HOME_LINE1,
UTF8ToUTF16("2 2nd st")); ASCIIToUTF16("2 2nd st"));
// The synced profiles are identical to the local ones, except that the guids // The synced profiles are identical to the local ones, except that the guids
// are different. // are different.
syncer::SyncDataList data_list; syncer::SyncDataList data_list;
AutofillProfile profile1(guid_synced1, origin_synced1); AutofillProfile profile1(guid_synced1, origin_synced1);
profile1.SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profile1.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profile1.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("1 1st st")); profile1.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1 1st st"));
profile1.SetRawInfo(COMPANY_NAME, UTF8ToUTF16("Frobbers, Inc.")); profile1.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Frobbers, Inc."));
data_list.push_back(autofill_syncable_service_.CreateData(profile1)); data_list.push_back(autofill_syncable_service_.CreateData(profile1));
AutofillProfile profile2(guid_synced2, origin_synced2); AutofillProfile profile2(guid_synced2, origin_synced2);
profile2.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Tom")); profile2.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Tom"));
profile2.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("2 2nd st")); profile2.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("2 2nd st"));
profile2.SetRawInfo(COMPANY_NAME, UTF8ToUTF16("Fizzbang, LLC.")); profile2.SetRawInfo(COMPANY_NAME, ASCIIToUTF16("Fizzbang, LLC."));
data_list.push_back(autofill_syncable_service_.CreateData(profile2)); data_list.push_back(autofill_syncable_service_.CreateData(profile2));
// The first profile should have its origin updated. // The first profile should have its origin updated.
...@@ -438,8 +437,8 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataEmptyOrigins) { ...@@ -438,8 +437,8 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeDataEmptyOrigins) {
// Create a profile with an empty origin. // Create a profile with an empty origin.
AutofillProfile profile(kGuid1, std::string()); AutofillProfile profile(kGuid1, std::string());
profile.SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profile.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("1 1st st")); profile.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1 1st st"));
profiles_from_web_db.push_back(new AutofillProfile(profile)); profiles_from_web_db.push_back(new AutofillProfile(profile));
...@@ -475,10 +474,10 @@ TEST_F(AutofillProfileSyncableServiceTest, GetAllSyncData) { ...@@ -475,10 +474,10 @@ TEST_F(AutofillProfileSyncableServiceTest, GetAllSyncData) {
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present1, kHttpOrigin)); new AutofillProfile(guid_present1, kHttpOrigin));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("John")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("John"));
profiles_from_web_db.push_back( profiles_from_web_db.push_back(
new AutofillProfile(guid_present2, kHttpsOrigin)); new AutofillProfile(guid_present2, kHttpsOrigin));
profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, UTF8ToUTF16("Jane")); profiles_from_web_db.back()->SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
syncer::SyncChangeList expected_change_list; syncer::SyncChangeList expected_change_list;
expected_change_list.push_back( expected_change_list.push_back(
...@@ -516,7 +515,7 @@ TEST_F(AutofillProfileSyncableServiceTest, ProcessSyncChanges) { ...@@ -516,7 +515,7 @@ TEST_F(AutofillProfileSyncableServiceTest, ProcessSyncChanges) {
syncer::SyncChangeList change_list; syncer::SyncChangeList change_list;
AutofillProfile profile(guid_synced, kHttpOrigin); AutofillProfile profile(guid_synced, kHttpOrigin);
profile.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Jane")); profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
change_list.push_back( change_list.push_back(
syncer::SyncChange( syncer::SyncChange(
FROM_HERE, FROM_HERE,
...@@ -552,7 +551,7 @@ TEST_F(AutofillProfileSyncableServiceTest, AutofillProfileAdded) { ...@@ -552,7 +551,7 @@ TEST_F(AutofillProfileSyncableServiceTest, AutofillProfileAdded) {
autofill_syncable_service_.set_sync_processor(sync_change_processor); autofill_syncable_service_.set_sync_processor(sync_change_processor);
AutofillProfile profile(kGuid1, kHttpsOrigin); AutofillProfile profile(kGuid1, kHttpsOrigin);
profile.SetRawInfo(NAME_FIRST, UTF8ToUTF16("Jane")); profile.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Jane"));
AutofillProfileChange change(AutofillProfileChange::ADD, kGuid1, &profile); AutofillProfileChange change(AutofillProfileChange::ADD, kGuid1, &profile);
autofill_syncable_service_.AutofillProfileChanged(change); autofill_syncable_service_.AutofillProfileChanged(change);
...@@ -588,24 +587,24 @@ TEST_F(AutofillProfileSyncableServiceTest, UpdateField) { ...@@ -588,24 +587,24 @@ TEST_F(AutofillProfileSyncableServiceTest, UpdateField) {
AutofillProfile profile(kGuid1, kSettingsOrigin); AutofillProfile profile(kGuid1, kSettingsOrigin);
std::string company1 = "A Company"; std::string company1 = "A Company";
std::string company2 = "Another Company"; std::string company2 = "Another Company";
profile.SetRawInfo(COMPANY_NAME, UTF8ToUTF16(company1)); profile.SetRawInfo(COMPANY_NAME, ASCIIToUTF16(company1));
EXPECT_FALSE(AutofillProfileSyncableService::UpdateField( EXPECT_FALSE(AutofillProfileSyncableService::UpdateField(
COMPANY_NAME, company1, &profile)); COMPANY_NAME, company1, &profile));
EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), UTF8ToUTF16(company1)); EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), ASCIIToUTF16(company1));
EXPECT_TRUE(AutofillProfileSyncableService::UpdateField( EXPECT_TRUE(AutofillProfileSyncableService::UpdateField(
COMPANY_NAME, company2, &profile)); COMPANY_NAME, company2, &profile));
EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), UTF8ToUTF16(company2)); EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), ASCIIToUTF16(company2));
EXPECT_FALSE(AutofillProfileSyncableService::UpdateField( EXPECT_FALSE(AutofillProfileSyncableService::UpdateField(
COMPANY_NAME, company2, &profile)); COMPANY_NAME, company2, &profile));
EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), UTF8ToUTF16(company2)); EXPECT_EQ(profile.GetRawInfo(COMPANY_NAME), ASCIIToUTF16(company2));
} }
TEST_F(AutofillProfileSyncableServiceTest, UpdateMultivaluedField) { TEST_F(AutofillProfileSyncableServiceTest, UpdateMultivaluedField) {
AutofillProfile profile(kGuid1, kHttpsOrigin); AutofillProfile profile(kGuid1, kHttpsOrigin);
std::vector<base::string16> values; std::vector<base::string16> values;
values.push_back(UTF8ToUTF16("1@1.com")); values.push_back(ASCIIToUTF16("1@1.com"));
values.push_back(UTF8ToUTF16("2@1.com")); values.push_back(ASCIIToUTF16("2@1.com"));
profile.SetRawMultiInfo(EMAIL_ADDRESS, values); profile.SetRawMultiInfo(EMAIL_ADDRESS, values);
::google::protobuf::RepeatedPtrField<std::string> specifics_fields; ::google::protobuf::RepeatedPtrField<std::string> specifics_fields;
...@@ -616,53 +615,53 @@ TEST_F(AutofillProfileSyncableServiceTest, UpdateMultivaluedField) { ...@@ -616,53 +615,53 @@ TEST_F(AutofillProfileSyncableServiceTest, UpdateMultivaluedField) {
EMAIL_ADDRESS, specifics_fields, &profile)); EMAIL_ADDRESS, specifics_fields, &profile));
profile.GetRawMultiInfo(EMAIL_ADDRESS, &values); profile.GetRawMultiInfo(EMAIL_ADDRESS, &values);
ASSERT_TRUE(values.size() == 2); ASSERT_TRUE(values.size() == 2);
EXPECT_EQ(values[0], UTF8ToUTF16("2@1.com")); EXPECT_EQ(values[0], ASCIIToUTF16("2@1.com"));
EXPECT_EQ(values[1], UTF8ToUTF16("3@1.com")); EXPECT_EQ(values[1], ASCIIToUTF16("3@1.com"));
EXPECT_FALSE(AutofillProfileSyncableService::UpdateMultivaluedField( EXPECT_FALSE(AutofillProfileSyncableService::UpdateMultivaluedField(
EMAIL_ADDRESS, specifics_fields, &profile)); EMAIL_ADDRESS, specifics_fields, &profile));
profile.GetRawMultiInfo(EMAIL_ADDRESS, &values); profile.GetRawMultiInfo(EMAIL_ADDRESS, &values);
ASSERT_EQ(values.size(), 2U); ASSERT_EQ(values.size(), 2U);
EXPECT_EQ(values[0], UTF8ToUTF16("2@1.com")); EXPECT_EQ(values[0], ASCIIToUTF16("2@1.com"));
EXPECT_EQ(values[1], UTF8ToUTF16("3@1.com")); EXPECT_EQ(values[1], ASCIIToUTF16("3@1.com"));
EXPECT_TRUE(AutofillProfileSyncableService::UpdateMultivaluedField( EXPECT_TRUE(AutofillProfileSyncableService::UpdateMultivaluedField(
EMAIL_ADDRESS, ::google::protobuf::RepeatedPtrField<std::string>(), EMAIL_ADDRESS, ::google::protobuf::RepeatedPtrField<std::string>(),
&profile)); &profile));
profile.GetRawMultiInfo(EMAIL_ADDRESS, &values); profile.GetRawMultiInfo(EMAIL_ADDRESS, &values);
ASSERT_EQ(values.size(), 1U); // Always have at least an empty string. ASSERT_EQ(values.size(), 1U); // Always have at least an empty string.
EXPECT_EQ(values[0], UTF8ToUTF16("")); EXPECT_EQ(values[0], ASCIIToUTF16(""));
} }
TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) { TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) {
AutofillProfile profile1(kGuid1, kHttpOrigin); AutofillProfile profile1(kGuid1, kHttpOrigin);
profile1.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("111 First St.")); profile1.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("111 First St."));
std::vector<base::string16> values; std::vector<base::string16> values;
values.push_back(UTF8ToUTF16("1@1.com")); values.push_back(ASCIIToUTF16("1@1.com"));
values.push_back(UTF8ToUTF16("2@1.com")); values.push_back(ASCIIToUTF16("2@1.com"));
profile1.SetRawMultiInfo(EMAIL_ADDRESS, values); profile1.SetRawMultiInfo(EMAIL_ADDRESS, values);
AutofillProfile profile2(kGuid2, kHttpsOrigin); AutofillProfile profile2(kGuid2, kHttpsOrigin);
profile2.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("111 First St.")); profile2.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("111 First St."));
// |values| now is [ "1@1.com", "2@1.com", "3@1.com" ]. // |values| now is [ "1@1.com", "2@1.com", "3@1.com" ].
values.push_back(UTF8ToUTF16("3@1.com")); values.push_back(ASCIIToUTF16("3@1.com"));
profile2.SetRawMultiInfo(EMAIL_ADDRESS, values); profile2.SetRawMultiInfo(EMAIL_ADDRESS, values);
values.clear(); values.clear();
values.push_back(UTF8ToUTF16("John")); values.push_back(ASCIIToUTF16("John"));
profile1.SetRawMultiInfo(NAME_FIRST, values); profile1.SetRawMultiInfo(NAME_FIRST, values);
values.push_back(UTF8ToUTF16("Jane")); values.push_back(ASCIIToUTF16("Jane"));
profile2.SetRawMultiInfo(NAME_FIRST, values); profile2.SetRawMultiInfo(NAME_FIRST, values);
values.clear(); values.clear();
values.push_back(UTF8ToUTF16("Doe")); values.push_back(ASCIIToUTF16("Doe"));
profile1.SetRawMultiInfo(NAME_LAST, values); profile1.SetRawMultiInfo(NAME_LAST, values);
values.push_back(UTF8ToUTF16("Other")); values.push_back(ASCIIToUTF16("Other"));
profile2.SetRawMultiInfo(NAME_LAST, values); profile2.SetRawMultiInfo(NAME_LAST, values);
values.clear(); values.clear();
values.push_back(UTF8ToUTF16("650234567")); values.push_back(ASCIIToUTF16("650234567"));
profile2.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values); profile2.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
EXPECT_FALSE(AutofillProfileSyncableService::MergeProfile(profile2, EXPECT_FALSE(AutofillProfileSyncableService::MergeProfile(profile2,
...@@ -671,35 +670,35 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) { ...@@ -671,35 +670,35 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) {
profile1.GetRawMultiInfo(NAME_FIRST, &values); profile1.GetRawMultiInfo(NAME_FIRST, &values);
ASSERT_EQ(values.size(), 2U); ASSERT_EQ(values.size(), 2U);
EXPECT_EQ(values[0], UTF8ToUTF16("John")); EXPECT_EQ(values[0], ASCIIToUTF16("John"));
EXPECT_EQ(values[1], UTF8ToUTF16("Jane")); EXPECT_EQ(values[1], ASCIIToUTF16("Jane"));
profile1.GetRawMultiInfo(NAME_LAST, &values); profile1.GetRawMultiInfo(NAME_LAST, &values);
ASSERT_EQ(values.size(), 2U); ASSERT_EQ(values.size(), 2U);
EXPECT_EQ(values[0], UTF8ToUTF16("Doe")); EXPECT_EQ(values[0], ASCIIToUTF16("Doe"));
EXPECT_EQ(values[1], UTF8ToUTF16("Other")); EXPECT_EQ(values[1], ASCIIToUTF16("Other"));
profile1.GetRawMultiInfo(EMAIL_ADDRESS, &values); profile1.GetRawMultiInfo(EMAIL_ADDRESS, &values);
ASSERT_EQ(values.size(), 3U); ASSERT_EQ(values.size(), 3U);
EXPECT_EQ(values[0], UTF8ToUTF16("1@1.com")); EXPECT_EQ(values[0], ASCIIToUTF16("1@1.com"));
EXPECT_EQ(values[1], UTF8ToUTF16("2@1.com")); EXPECT_EQ(values[1], ASCIIToUTF16("2@1.com"));
EXPECT_EQ(values[2], UTF8ToUTF16("3@1.com")); EXPECT_EQ(values[2], ASCIIToUTF16("3@1.com"));
profile1.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); profile1.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
ASSERT_EQ(values.size(), 1U); ASSERT_EQ(values.size(), 1U);
EXPECT_EQ(values[0], UTF8ToUTF16("650234567")); EXPECT_EQ(values[0], ASCIIToUTF16("650234567"));
EXPECT_EQ(profile2.origin(), profile1.origin()); EXPECT_EQ(profile2.origin(), profile1.origin());
AutofillProfile profile3(kGuid3, kHttpOrigin); AutofillProfile profile3(kGuid3, kHttpOrigin);
profile3.SetRawInfo(ADDRESS_HOME_LINE1, UTF8ToUTF16("111 First St.")); profile3.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("111 First St."));
values.clear(); values.clear();
values.push_back(UTF8ToUTF16("Jane")); values.push_back(ASCIIToUTF16("Jane"));
profile3.SetRawMultiInfo(NAME_FIRST, values); profile3.SetRawMultiInfo(NAME_FIRST, values);
values.clear(); values.clear();
values.push_back(UTF8ToUTF16("Doe")); values.push_back(ASCIIToUTF16("Doe"));
profile3.SetRawMultiInfo(NAME_LAST, values); profile3.SetRawMultiInfo(NAME_LAST, values);
EXPECT_TRUE(AutofillProfileSyncableService::MergeProfile(profile3, EXPECT_TRUE(AutofillProfileSyncableService::MergeProfile(profile3,
...@@ -708,15 +707,15 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) { ...@@ -708,15 +707,15 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) {
profile1.GetRawMultiInfo(NAME_FIRST, &values); profile1.GetRawMultiInfo(NAME_FIRST, &values);
ASSERT_EQ(values.size(), 3U); ASSERT_EQ(values.size(), 3U);
EXPECT_EQ(values[0], UTF8ToUTF16("John")); EXPECT_EQ(values[0], ASCIIToUTF16("John"));
EXPECT_EQ(values[1], UTF8ToUTF16("Jane")); EXPECT_EQ(values[1], ASCIIToUTF16("Jane"));
EXPECT_EQ(values[2], UTF8ToUTF16("Jane")); EXPECT_EQ(values[2], ASCIIToUTF16("Jane"));
profile1.GetRawMultiInfo(NAME_LAST, &values); profile1.GetRawMultiInfo(NAME_LAST, &values);
ASSERT_EQ(values.size(), 3U); ASSERT_EQ(values.size(), 3U);
EXPECT_EQ(values[0], UTF8ToUTF16("Doe")); EXPECT_EQ(values[0], ASCIIToUTF16("Doe"));
EXPECT_EQ(values[1], UTF8ToUTF16("Other")); EXPECT_EQ(values[1], ASCIIToUTF16("Other"));
EXPECT_EQ(values[2], UTF8ToUTF16("Doe")); EXPECT_EQ(values[2], ASCIIToUTF16("Doe"));
// Middle name should have three entries as well. // Middle name should have three entries as well.
profile1.GetRawMultiInfo(NAME_MIDDLE, &values); profile1.GetRawMultiInfo(NAME_MIDDLE, &values);
...@@ -727,13 +726,13 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) { ...@@ -727,13 +726,13 @@ TEST_F(AutofillProfileSyncableServiceTest, MergeProfile) {
profile1.GetRawMultiInfo(EMAIL_ADDRESS, &values); profile1.GetRawMultiInfo(EMAIL_ADDRESS, &values);
ASSERT_EQ(values.size(), 3U); ASSERT_EQ(values.size(), 3U);
EXPECT_EQ(values[0], UTF8ToUTF16("1@1.com")); EXPECT_EQ(values[0], ASCIIToUTF16("1@1.com"));
EXPECT_EQ(values[1], UTF8ToUTF16("2@1.com")); EXPECT_EQ(values[1], ASCIIToUTF16("2@1.com"));
EXPECT_EQ(values[2], UTF8ToUTF16("3@1.com")); EXPECT_EQ(values[2], ASCIIToUTF16("3@1.com"));
profile1.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); profile1.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
ASSERT_EQ(values.size(), 1U); ASSERT_EQ(values.size(), 1U);
EXPECT_EQ(values[0], UTF8ToUTF16("650234567")); EXPECT_EQ(values[0], ASCIIToUTF16("650234567"));
} }
// Ensure that all profile fields are able to be synced up from the client to // Ensure that all profile fields are able to be synced up from the client to
......
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