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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/browser/personal_data_manager_unittest.cc

Issue 14564003: Make PersonalDataManager use GetCreditCards() (rather than using credit_cards_ directly) so Autofill (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« components/autofill/browser/personal_data_manager.cc ('K') | « components/autofill/browser/personal_data_manager.cc ('k') | components/autofill/browser/test_personal_data_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/browser/personal_data_manager_unittest.cc
diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc
index 9a513afa57f003bcaa2ff30e2f89f81bb9d70e00..2082e72c24d097820061495443a10d03ea9030cd 100644
--- a/components/autofill/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/browser/personal_data_manager_unittest.cc
@@ -251,7 +251,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<CreditCard*>& results1 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results1 = personal_data_->GetCreditCards();
ASSERT_EQ(2U, results1.size());
EXPECT_EQ(0, credit_card0.Compare(*results1[0]));
EXPECT_EQ(0, credit_card1.Compare(*results1[1]));
@@ -267,7 +267,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(2U, results2.size());
EXPECT_EQ(credit_card0, *results2[0]);
EXPECT_EQ(credit_card2, *results2[1]);
@@ -278,7 +278,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {
ResetPersonalDataManager();
// Verify that we've loaded the credit cards from the web database.
- const std::vector<CreditCard*>& results3 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results3 = personal_data_->GetCreditCards();
ASSERT_EQ(2U, results3.size());
EXPECT_EQ(credit_card0, *results3[0]);
EXPECT_EQ(credit_card2, *results3[1]);
@@ -328,7 +328,7 @@ TEST_F(PersonalDataManagerTest, AddProfilesAndCreditCards) {
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(2U, results2.size());
EXPECT_EQ(credit_card0, *results2[0]);
EXPECT_EQ(credit_card1, *results2[1]);
@@ -417,7 +417,7 @@ TEST_F(PersonalDataManagerTest, SetEmptyCreditCard) {
ResetPersonalDataManager();
// Verify that we've loaded the credit cards from the web database.
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(0U, results2.size());
}
@@ -661,8 +661,8 @@ TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) {
const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
ASSERT_EQ(0U, profiles.size());
- const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
- ASSERT_EQ(0U, credit_cards.size());
+ const std::vector<CreditCard*>& cards = personal_data_->GetCreditCards();
+ ASSERT_EQ(0U, cards.size());
}
TEST_F(PersonalDataManagerTest, ImportFormMinimumAddressUSA) {
@@ -819,7 +819,7 @@ TEST_F(PersonalDataManagerTest, SetUniqueCreditCardLabels) {
// database.
ResetPersonalDataManager();
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(6U, results.size());
EXPECT_EQ(credit_card0.guid(), results[0]->guid());
EXPECT_EQ(credit_card1.guid(), results[1]->guid());
@@ -1301,8 +1301,8 @@ TEST_F(PersonalDataManagerTest, AggregateProfileWithInsufficientAddress) {
const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
ASSERT_EQ(0U, profiles.size());
- const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
- ASSERT_EQ(0U, credit_cards.size());
+ const std::vector<CreditCard*>& cards = personal_data_->GetCreditCards();
+ ASSERT_EQ(0U, cards.size());
}
TEST_F(PersonalDataManagerTest, AggregateExistingAuxiliaryProfile) {
@@ -1391,7 +1391,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentCreditCards) {
CreditCard expected;
test::SetCreditCardInfo(&expected,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -1423,7 +1423,7 @@ TEST_F(PersonalDataManagerTest, AggregateTwoDifferentCreditCards) {
CreditCard expected2;
test::SetCreditCardInfo(&expected2,"", "5500000000000004", "02", "2012");
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(2U, results2.size());
EXPECT_EQ(0, expected.Compare(*results2[0]));
EXPECT_EQ(0, expected2.Compare(*results2[1]));
@@ -1462,7 +1462,7 @@ TEST_F(PersonalDataManagerTest, AggregateInvalidCreditCard) {
CreditCard expected;
test::SetCreditCardInfo(&expected,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -1487,7 +1487,7 @@ TEST_F(PersonalDataManagerTest, AggregateInvalidCreditCard) {
// Note: no refresh here.
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected.Compare(*results2[0]));
}
@@ -1525,7 +1525,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithConflict) {
CreditCard expected;
test::SetCreditCardInfo(&expected,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -1559,7 +1559,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithConflict) {
CreditCard expected2;
test::SetCreditCardInfo(&expected2,
"Biggie Smalls", "4111111111111111", "01", "2012");
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
}
@@ -1597,7 +1597,7 @@ TEST_F(PersonalDataManagerTest, AggregateEmptyCreditCardWithConflict) {
CreditCard expected;
test::SetCreditCardInfo(&expected,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -1623,7 +1623,7 @@ TEST_F(PersonalDataManagerTest, AggregateEmptyCreditCardWithConflict) {
CreditCard expected2;
test::SetCreditCardInfo(&expected2,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
}
@@ -1661,7 +1661,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInNew) {
CreditCard expected;
test::SetCreditCardInfo(&expected,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -1692,7 +1692,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInNew) {
CreditCard expected2;
test::SetCreditCardInfo(&expected2,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -1718,7 +1718,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInNew) {
CreditCard expected3;
test::SetCreditCardInfo(&expected3,
"Biggie Smalls", "4111111111111111", "01", "2011");
- const std::vector<CreditCard*>& results3 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results3 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results3.size());
EXPECT_EQ(0, expected3.Compare(*results2[0]));
}
@@ -1736,7 +1736,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInOld) {
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<CreditCard*>& results1 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results1 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(saved_credit_card, *results1[0]);
@@ -1773,7 +1773,7 @@ TEST_F(PersonalDataManagerTest, AggregateCreditCardWithMissingInfoInOld) {
CreditCard expected2;
test::SetCreditCardInfo(&expected2,
"Biggie Smalls", "4111111111111111", "01", "2012");
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
}
@@ -1793,7 +1793,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithSeparators) {
OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
MessageLoop::current()->Run();
- const std::vector<CreditCard*>& results1 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results1 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results1.size());
EXPECT_EQ(0, saved_credit_card.Compare(*results1[0]));
@@ -1824,7 +1824,7 @@ TEST_F(PersonalDataManagerTest, AggregateSameCreditCardWithSeparators) {
MessageLoop::current()->Run();
// Expect that no new card is saved.
- const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
+ const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, saved_credit_card.Compare(*results2[0]));
}
@@ -2045,7 +2045,7 @@ TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) {
TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
ASSERT_TRUE(personal_data_->GetProfiles().empty());
- ASSERT_TRUE(personal_data_->credit_cards().empty());
+ ASSERT_TRUE(personal_data_->GetCreditCards().empty());
AutofillProfile steve_jobs;
test::SetProfileInfo(&steve_jobs, "Steven", "Paul", "Jobs", "sjobs@apple.com",
@@ -2060,7 +2060,7 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
ResetPersonalDataManager();
ASSERT_EQ(1U, personal_data_->GetProfiles().size());
- ASSERT_EQ(1U, personal_data_->credit_cards().size());
+ ASSERT_EQ(1U, personal_data_->GetCreditCards().size());
// After this point no adds, saves, or updates should take effect.
MakeProfileIncognito();
@@ -2076,7 +2076,7 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
ResetPersonalDataManager();
EXPECT_EQ(1U, personal_data_->GetProfiles().size());
- EXPECT_EQ(1U, personal_data_->credit_cards().size());
+ EXPECT_EQ(1U, personal_data_->GetCreditCards().size());
// Saving or creating profiles from imported profiles shouldn't work.
steve_jobs.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Steve"));
@@ -2089,7 +2089,7 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
EXPECT_EQ(ASCIIToUTF16("Steven"),
personal_data_->GetProfiles()[0]->GetRawInfo(NAME_FIRST));
EXPECT_EQ(ASCIIToUTF16("William H. Gates"),
- personal_data_->credit_cards()[0]->GetRawInfo(CREDIT_CARD_NAME));
+ personal_data_->GetCreditCards()[0]->GetRawInfo(CREDIT_CARD_NAME));
// Updating existing profiles shouldn't work.
steve_jobs.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Steve"));
@@ -2102,7 +2102,7 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
EXPECT_EQ(ASCIIToUTF16("Steven"),
personal_data_->GetProfiles()[0]->GetRawInfo(NAME_FIRST));
EXPECT_EQ(ASCIIToUTF16("William H. Gates"),
- personal_data_->credit_cards()[0]->GetRawInfo(CREDIT_CARD_NAME));
+ personal_data_->GetCreditCards()[0]->GetRawInfo(CREDIT_CARD_NAME));
// Removing shouldn't work.
personal_data_->RemoveByGUID(steve_jobs.guid());
@@ -2110,7 +2110,7 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
ResetPersonalDataManager();
EXPECT_EQ(1U, personal_data_->GetProfiles().size());
- EXPECT_EQ(1U, personal_data_->credit_cards().size());
+ EXPECT_EQ(1U, personal_data_->GetCreditCards().size());
}
} // namespace autofill
« components/autofill/browser/personal_data_manager.cc ('K') | « components/autofill/browser/personal_data_manager.cc ('k') | components/autofill/browser/test_personal_data_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698