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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2849523003: Add billing address as a mandatory field of Payments credit cards. (Closed)
Patch Set: Components Unittests fix Created 3 years, 7 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/core/browser/address_combobox_model.cc ('K') | « components/autofill/core/browser/payments/full_card_request_unittest.cc ('k') | components/autofill/core/browser/validation.h » ('j') | components/payments/core/autofill_payment_instrument_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/core/browser/personal_data_manager_unittest.cc
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index cb68a582e862000f7f95075575edf028baa5fc86..52e396e259df325a130337f11c485cfa13ce6389 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -210,8 +210,8 @@ class PersonalDataManagerTestBase {
CreditCard credit_card0("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&credit_card0, "Clyde Barrow",
- "347666888555" /* American Express */, "04",
- "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
credit_card0.set_use_count(3);
credit_card0.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
@@ -223,7 +223,7 @@ class PersonalDataManagerTestBase {
credit_card1.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(10));
test::SetCreditCardInfo(&credit_card1, "John Dillinger",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
personal_data_->AddCreditCard(credit_card1);
CreditCard credit_card2("002149C1-EE28-4213-A3B9-DA243FFF021B",
@@ -232,7 +232,7 @@ class PersonalDataManagerTestBase {
credit_card2.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
test::SetCreditCardInfo(&credit_card2, "Bonnie Parker",
- "518765432109" /* Mastercard */, "12", "2999");
+ "518765432109" /* Mastercard */, "12", "2999", "1");
personal_data_->AddCreditCard(credit_card2);
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -281,7 +281,7 @@ class PersonalDataManagerTestBase {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, exp_name, exp_cc_num, exp_cc_month,
- exp_cc_year);
+ exp_cc_year, "");
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -503,16 +503,17 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveProfiles) {
TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {
EnableWalletCardImport();
CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&credit_card0,
- "John Dillinger", "423456789012" /* Visa */, "01", "2999");
+ test::SetCreditCardInfo(&credit_card0, "John Dillinger",
+ "423456789012" /* Visa */, "01", "2999", "1");
CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card1, "Bonnie Parker",
- "518765432109" /* Mastercard */, "12", "2999");
+ "518765432109" /* Mastercard */, "12", "2999", "1");
CreditCard credit_card2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card2, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
// Add two test credit cards to the database.
personal_data_->AddCreditCard(credit_card0);
@@ -558,7 +559,7 @@ TEST_F(PersonalDataManagerTest, AddUpdateRemoveCreditCards) {
// Add a full server card.
CreditCard credit_card3(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card3, "Jane Doe",
- "4111111111111111" /* Visa */, "04", "2999");
+ "4111111111111111" /* Visa */, "04", "2999", "1");
credit_card3.set_record_type(CreditCard::FULL_SERVER_CARD);
credit_card3.set_server_id("server_id");
@@ -598,7 +599,7 @@ TEST_F(PersonalDataManagerTest, AddCreditCard_BasicInformation) {
// Add a credit card to the database.
CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card, "John Dillinger",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
personal_data_->AddCreditCard(credit_card);
// Reload the database.
@@ -625,8 +626,8 @@ TEST_F(PersonalDataManagerTest, UpdateUnverifiedProfilesAndCreditCards) {
EXPECT_FALSE(profile.IsVerified());
CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
- test::SetCreditCardInfo(&credit_card,
- "John Dillinger", "423456789012" /* Visa */, "01", "2999");
+ test::SetCreditCardInfo(&credit_card, "John Dillinger",
+ "423456789012" /* Visa */, "01", "2999", "1");
EXPECT_FALSE(credit_card.IsVerified());
// Add the data to the database.
@@ -708,7 +709,8 @@ TEST_F(PersonalDataManagerTest, RefuseToStoreFullCard) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -736,7 +738,8 @@ TEST_F(PersonalDataManagerTest, AddFullCardAsMaskedCard) {
CreditCard server_card(CreditCard::FULL_SERVER_CARD, "c789");
test::SetCreditCardInfo(&server_card, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
.WillOnce(QuitMainMessageLoop());
@@ -767,17 +770,18 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCards) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "9012" /* Visa */, "01", "2999");
+ "9012" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
- "2109" /* Mastercard */, "12", "2999");
+ "2109" /* Mastercard */, "12", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kMasterCard);
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -844,12 +848,12 @@ TEST_F(PersonalDataManagerTest, AddProfilesAndCreditCards) {
"US", "19482937549");
CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&credit_card0,
- "John Dillinger", "423456789012" /* Visa */, "01", "2999");
+ test::SetCreditCardInfo(&credit_card0, "John Dillinger",
+ "423456789012" /* Visa */, "01", "2999", "1");
CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card1, "Bonnie Parker",
- "518765432109" /* Mastercard */, "12", "2999");
+ "518765432109" /* Mastercard */, "12", "2999", "1");
// Add two test profiles to the database.
personal_data_->AddProfile(profile0);
@@ -987,7 +991,7 @@ TEST_F(PersonalDataManagerTest, SetEmptyProfile) {
TEST_F(PersonalDataManagerTest, SetEmptyCreditCard) {
CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&credit_card0, "", "", "", "");
+ test::SetCreditCardInfo(&credit_card0, "", "", "", "", "");
// Add the empty credit card to the database.
personal_data_->AddCreditCard(credit_card0);
@@ -2225,7 +2229,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_Valid) {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
- "2999");
+ "2999", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2293,7 +2297,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MonthSelectInvalidText) {
// See that the invalid option text was converted to the right value.
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "02",
- "2999");
+ "2999", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2323,7 +2327,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_TwoValidCards) {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
- "2999");
+ "2999", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2348,7 +2352,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_TwoValidCards) {
base::RunLoop().Run();
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&expected2, "", "5500000000000004", "02", "2999");
+ test::SetCreditCardInfo(&expected2, "", "5500000000000004", "02", "2999",
+ ""); // Imported cards have not billing info.
std::vector<CreditCard*> cards;
cards.push_back(&expected);
cards.push_back(&expected2);
@@ -2439,7 +2444,7 @@ TEST_F(PersonalDataManagerTest,
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1111" /* Visa */, "01", "2999");
+ "1111" /* Visa */, "01", "2999", "");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -2475,7 +2480,8 @@ TEST_F(PersonalDataManagerTest,
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ ""); // Imported cards have not billing info.
test::SetServerCreditCards(autofill_table_, server_cards);
// Type the same data as the unmasked card into a form.
@@ -2518,7 +2524,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCreditCardWithConflict) {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
- "2998");
+ "2998", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2546,7 +2552,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCreditCardWithConflict) {
// updated to "2999".
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",
- "2999");
+ "2999", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -2576,7 +2582,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_ShouldReturnLocalCard) {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
- "2998");
+ "2998", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2607,7 +2613,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_ShouldReturnLocalCard) {
// updated to "2999".
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",
- "2999");
+ "2999", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -2637,7 +2643,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_EmptyCardWithConflict) {
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
- "2998");
+ "2998", ""); // Imported cards have not billing info.
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2662,7 +2668,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_EmptyCardWithConflict) {
// No change is expected.
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",
- "2998");
+ "2998", "");
const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -2691,8 +2697,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {
base::RunLoop().Run();
CreditCard expected(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&expected,
- "Biggie Smalls", "4111111111111111", "01", "2999");
+ test::SetCreditCardInfo(&expected, "Biggie Smalls", "4111111111111111", "01",
+ "2999", "");
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected.Compare(*results[0]));
@@ -2717,8 +2723,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {
// No change is expected.
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&expected2,
- "Biggie Smalls", "4111111111111111", "01", "2999");
+ test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",
+ "2999", "");
const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -2743,8 +2749,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInNew) {
// No change is expected.
CreditCard expected3(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&expected3,
- "Biggie Smalls", "4111111111111111", "01", "2999");
+ test::SetCreditCardInfo(&expected3, "Biggie Smalls", "4111111111111111", "01",
+ "2999", "");
const std::vector<CreditCard*>& results3 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results3.size());
EXPECT_EQ(0, expected3.Compare(*results3[0]));
@@ -2755,7 +2761,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInOld) {
// Note the empty name.
CreditCard saved_credit_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&saved_credit_card, "", "4111111111111111" /* Visa */,
- "01", "2998");
+ "01", "2998", "1");
personal_data_->AddCreditCard(saved_credit_card);
// Verify that the web database has been updated and the notification sent.
@@ -2791,7 +2797,7 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_MissingInfoInOld) {
// added to the existing credit card.
CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected2, "Biggie Smalls", "4111111111111111", "01",
- "2999");
+ "2999", "1");
const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results2.size());
EXPECT_EQ(0, expected2.Compare(*results2[0]));
@@ -2803,8 +2809,8 @@ TEST_F(PersonalDataManagerTest, ImportCreditCard_SameCardWithSeparators) {
// Start with a single valid credit card stored via the preferences.
// Note the separators in the credit card number.
CreditCard saved_credit_card(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&saved_credit_card,
- "Biggie Smalls", "4111 1111 1111 1111" /* Visa */, "01", "2999");
+ test::SetCreditCardInfo(&saved_credit_card, "Biggie Smalls",
+ "4111 1111 1111 1111" /* Visa */, "01", "2999", "");
personal_data_->AddCreditCard(saved_credit_card);
// Verify that the web database has been updated and the notification sent.
@@ -2847,7 +2853,7 @@ TEST_F(PersonalDataManagerTest,
// Start with a verified credit card.
CreditCard credit_card(base::GenerateGUID(), kSettingsOrigin);
test::SetCreditCardInfo(&credit_card, "Biggie Smalls",
- "4111 1111 1111 1111" /* Visa */, "01", "2998");
+ "4111 1111 1111 1111" /* Visa */, "01", "2998", "");
EXPECT_TRUE(credit_card.IsVerified());
// Add the credit card to the database.
@@ -2943,7 +2949,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData_OneAddressOneCreditCard) {
// Test that the credit card has also been saved.
CreditCard expected_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected_card, "Biggie Smalls", "4111111111111111",
- "01", "2999");
+ "01", "2999", "");
const std::vector<CreditCard*>& results_cards =
personal_data_->GetCreditCards();
ASSERT_EQ(1U, results_cards.size());
@@ -3017,7 +3023,7 @@ TEST_F(PersonalDataManagerTest, ImportFormData_TwoAddressesOneCreditCard) {
// Test that the credit card has been saved.
CreditCard expected_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&expected_card, "Biggie Smalls", "4111111111111111",
- "01", "2999");
+ "01", "2999", "");
const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
ASSERT_EQ(1U, results.size());
EXPECT_EQ(0, expected_card.Compare(*results[0]));
@@ -3072,8 +3078,8 @@ TEST_F(PersonalDataManagerTest, SaveImportedProfileWithVerifiedData) {
TEST_F(PersonalDataManagerTest, SaveImportedCreditCardWithVerifiedData) {
// Start with a verified credit card.
CreditCard credit_card(base::GenerateGUID(), kSettingsOrigin);
- test::SetCreditCardInfo(&credit_card,
- "Biggie Smalls", "4111 1111 1111 1111" /* Visa */, "01", "2999");
+ test::SetCreditCardInfo(&credit_card, "Biggie Smalls",
+ "4111 1111 1111 1111" /* Visa */, "01", "2999", "");
EXPECT_TRUE(credit_card.IsVerified());
// Add the credit card to the database.
@@ -3187,9 +3193,8 @@ TEST_F(PersonalDataManagerTest, GetNonEmptyTypes) {
// Test with credit card information also stored.
CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(&credit_card,
- "John Dillinger", "423456789012" /* Visa */,
- "01", "2999");
+ test::SetCreditCardInfo(&credit_card, "John Dillinger",
+ "423456789012" /* Visa */, "01", "2999", "");
personal_data_->AddCreditCard(credit_card);
// Verify that the web database has been updated and the notification sent.
@@ -3241,8 +3246,8 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
personal_data_->AddProfile(steve_jobs);
CreditCard bill_gates(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(
- &bill_gates, "William H. Gates", "5555555555554444", "1", "2020");
+ test::SetCreditCardInfo(&bill_gates, "William H. Gates", "5555555555554444",
+ "1", "2020", "1");
personal_data_->AddCreditCard(bill_gates);
// The personal data manager should be able to read existing profiles in an
@@ -3258,8 +3263,8 @@ TEST_F(PersonalDataManagerTest, IncognitoReadOnly) {
personal_data_->AddProfile(test::GetFullProfile());
CreditCard larry_page(base::GenerateGUID(), "https://www.example.com");
- test::SetCreditCardInfo(
- &larry_page, "Lawrence Page", "4111111111111111", "10", "2025");
+ test::SetCreditCardInfo(&larry_page, "Lawrence Page", "4111111111111111",
+ "10", "2025", "1");
personal_data_->AddCreditCard(larry_page);
ResetPersonalDataManager(USER_MODE_INCOGNITO);
@@ -3619,7 +3624,7 @@ TEST_F(PersonalDataManagerTest,
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b459"));
test::SetCreditCardInfo(&server_cards.back(), "Emmet Dalton", "2110", "12",
- "2999");
+ "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -3670,7 +3675,7 @@ TEST_F(PersonalDataManagerTest,
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b459"));
test::SetCreditCardInfo(&server_cards.back(), "Emmet Dalton", "2110", "12",
- "2999");
+ "2999", "1");
server_cards.back().set_use_count(2);
server_cards.back().set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
@@ -3678,7 +3683,7 @@ TEST_F(PersonalDataManagerTest,
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "b460"));
test::SetCreditCardInfo(&server_cards.back(), "Jesse James", "2109", "12",
- "2999");
+ "2999", "1");
server_cards.back().set_use_count(6);
server_cards.back().set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
@@ -3712,14 +3717,15 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ExpiredCards) {
CreditCard credit_card0("002149C1-EE28-4213-A3B9-DA243FFF021B",
"https://www.example.com");
test::SetCreditCardInfo(&credit_card0, "Bonnie Parker",
- "518765432109" /* Mastercard */, "04", "2999");
+ "518765432109" /* Mastercard */, "04", "2999", "1");
personal_data_->AddCreditCard(credit_card0);
// Add an expired card with a higher frecency score.
CreditCard credit_card1("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&credit_card1, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "1999");
+ "347666888555" /* American Express */, "04", "1999",
+ "1");
credit_card1.set_use_count(300);
credit_card1.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(10));
@@ -3732,7 +3738,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ExpiredCards) {
credit_card2.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
test::SetCreditCardInfo(&credit_card2, "John Dillinger",
- "423456789012" /* Visa */, "01", "1998");
+ "423456789012" /* Visa */, "01", "1998", "1");
personal_data_->AddCreditCard(credit_card2);
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -3764,7 +3770,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_NumberMissing) {
CreditCard credit_card0("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&credit_card0, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
credit_card0.set_use_count(3);
credit_card0.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
@@ -3775,7 +3782,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_NumberMissing) {
credit_card1.set_use_count(300);
credit_card1.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(10));
- test::SetCreditCardInfo(&credit_card1, "John Dillinger", "", "01", "2999");
+ test::SetCreditCardInfo(&credit_card1, "John Dillinger", "", "01", "2999",
+ "1");
personal_data_->AddCreditCard(credit_card1);
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -3810,7 +3818,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {
// suggestions since the locally saved card takes precedence.
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "9012" /* Visa */, "01", "2999");
+ "9012" /* Visa */, "01", "2999", "1");
server_cards.back().set_use_count(2);
server_cards.back().set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3820,7 +3828,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {
// card type. Not a dupe and therefore both should appear in the suggestions.
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker", "2109", "12",
- "2999");
+ "2999", "1");
server_cards.back().set_use_count(3);
server_cards.back().set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3831,7 +3839,8 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions_ServerDuplicates) {
// precedence over local cards.
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
server_cards.back().set_use_count(1);
server_cards.back().set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3881,7 +3890,8 @@ TEST_F(PersonalDataManagerTest,
// the local card should appear in the suggestions.
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -3899,7 +3909,7 @@ TEST_F(PersonalDataManagerTest,
// of more than one local card.
CreditCard credit_card3("4141084B-72D7-4B73-90CF-3D6AC154673B",
"https://www.example.com");
- test::SetCreditCardInfo(&credit_card3, "Clyde Barrow", "", "04", "");
+ test::SetCreditCardInfo(&credit_card3, "Clyde Barrow", "", "04", "", "");
personal_data_->AddCreditCard(credit_card3);
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -3922,7 +3932,7 @@ TEST_F(PersonalDataManagerTest,
CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&local_card, "Homer Simpson",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
local_card.set_use_count(3);
local_card.set_use_date(AutofillClock::Now() - base::TimeDelta::FromDays(1));
credit_cards.push_back(&local_card);
@@ -3930,7 +3940,7 @@ TEST_F(PersonalDataManagerTest,
// Create a full server card that is a duplicate of one of the local cards.
CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "c789");
test::SetCreditCardInfo(&full_server_card, "Homer Simpson",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
full_server_card.set_use_count(1);
full_server_card.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3953,13 +3963,13 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_LocalShadowsMasked) {
local_card.set_use_count(300);
local_card.set_use_date(AutofillClock::Now() - base::TimeDelta::FromDays(10));
test::SetCreditCardInfo(&local_card, "Homer Simpson",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
credit_cards.push_back(&local_card);
// Create a masked server card that is a duplicate of a local card.
CreditCard masked_card(CreditCard::MASKED_SERVER_CARD, "a123");
test::SetCreditCardInfo(&masked_card, "Homer Simpson", "9012" /* Visa */,
- "01", "2999");
+ "01", "2999", "1");
masked_card.set_use_count(2);
masked_card.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3980,7 +3990,7 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_FullServerAndMasked) {
// Create a full server card that is a duplicate of one of the local cards.
CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "c789");
test::SetCreditCardInfo(&full_server_card, "Homer Simpson",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
full_server_card.set_use_count(1);
full_server_card.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -3989,7 +3999,7 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_FullServerAndMasked) {
// Create a masked server card that is a duplicate of a local card.
CreditCard masked_card(CreditCard::MASKED_SERVER_CARD, "a123");
test::SetCreditCardInfo(&masked_card, "Homer Simpson", "9012" /* Visa */,
- "01", "2999");
+ "01", "2999", "1");
masked_card.set_use_count(2);
masked_card.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -4011,12 +4021,13 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_DifferentCards) {
credit_card2.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(1));
test::SetCreditCardInfo(&credit_card2, "Homer Simpson",
- "518765432109" /* Mastercard */, "", "");
+ "518765432109" /* Mastercard */, "", "", "");
credit_cards.push_back(&credit_card2);
// Create a masked server card that is slightly different of the local card.
CreditCard credit_card4(CreditCard::MASKED_SERVER_CARD, "b456");
- test::SetCreditCardInfo(&credit_card4, "Homer Simpson", "2109", "12", "2999");
+ test::SetCreditCardInfo(&credit_card4, "Homer Simpson", "2109", "12", "2999",
+ "1");
credit_card4.set_use_count(3);
credit_card4.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -4027,7 +4038,8 @@ TEST_F(PersonalDataManagerTest, DedupeCreditCardToSuggest_DifferentCards) {
// cards.
CreditCard credit_card5(CreditCard::FULL_SERVER_CARD, "c789");
test::SetCreditCardInfo(&credit_card5, "Homer Simpson",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
credit_card5.set_use_count(1);
credit_card5.set_use_date(AutofillClock::Now() -
base::TimeDelta::FromDays(15));
@@ -4050,7 +4062,7 @@ TEST_F(PersonalDataManagerTest, RecordUseOf) {
CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card, "John Dillinger",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
EXPECT_EQ(1U, credit_card.use_count());
EXPECT_EQ(kArbitraryTime, credit_card.use_date());
EXPECT_EQ(kArbitraryTime, credit_card.modification_date());
@@ -4106,17 +4118,18 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCardUsageStats) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "9012" /* Visa */, "01", "2999");
+ "9012" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
- "4444" /* Mastercard */, "12", "2999");
+ "4444" /* Mastercard */, "12", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kMasterCard);
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
// Create the test clock and set the time to a specific value.
TestAutofillClock test_clock;
@@ -4228,7 +4241,7 @@ TEST_F(PersonalDataManagerTest, ClearAllServerData) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "9012" /* Visa */, "01", "2999");
+ "9012" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -4253,12 +4266,13 @@ TEST_F(PersonalDataManagerTest, AllowDuplicateMaskedServerCard) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1881" /* Visa */, "01", "2999");
+ "1881" /* Visa */, "01", "2999", "");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "");
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -4300,7 +4314,7 @@ TEST_F(PersonalDataManagerTest, AllowDuplicateMaskedServerCard) {
CreditCard local_card(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&local_card, "John Dillinger", "4012888888881881",
- "01", "2999");
+ "01", "2999", "");
const std::vector<CreditCard*>& results =
personal_data_->GetLocalCreditCards();
ASSERT_EQ(1U, results.size());
@@ -4314,12 +4328,13 @@ TEST_F(PersonalDataManagerTest, DontDuplicateFullServerCard) {
std::vector<CreditCard> server_cards;
server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1881" /* Visa */, "01", "2999");
+ "1881" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
@@ -5140,17 +5155,18 @@ TEST_F(PersonalDataManagerTest,
// verifying results.
CreditCard credit_card1(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card1, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
credit_card1.set_use_count(10);
CreditCard credit_card2(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card2, "John Dillinger",
- "423456789012" /* Visa */, "01", "2999");
+ "423456789012" /* Visa */, "01", "2999", "1");
credit_card2.set_use_count(5);
CreditCard credit_card3(base::GenerateGUID(), "https://www.example.com");
test::SetCreditCardInfo(&credit_card3, "Bonnie Parker",
- "518765432109" /* Mastercard */, "12", "2999");
+ "518765432109" /* Mastercard */, "12", "2999", "1");
credit_card3.set_use_count(1);
// Associate the first card with profile1.
@@ -5931,7 +5947,8 @@ TEST_F(PersonalDataManagerTest,
CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&local_card, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
local_card.set_billing_address_id(kServerAddressId);
personal_data_->AddCreditCard(local_card);
@@ -5939,7 +5956,7 @@ TEST_F(PersonalDataManagerTest,
server_cards.push_back(
CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1111" /* Visa */, "01", "2999");
+ "1111" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.back().set_billing_address_id(kServerAddressId);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -6039,7 +6056,8 @@ TEST_F(PersonalDataManagerTest,
CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&local_card, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
local_card.set_billing_address_id(kServerAddressId);
personal_data_->AddCreditCard(local_card);
@@ -6047,7 +6065,7 @@ TEST_F(PersonalDataManagerTest,
server_cards.push_back(
CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1111" /* Visa */, "01", "2999");
+ "1111" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.back().set_billing_address_id(kServerAddressId);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -6214,7 +6232,8 @@ TEST_F(
CreditCard local_card("287151C8-6AB1-487C-9095-28E80BE5DA15",
"https://www.example.com");
test::SetCreditCardInfo(&local_card, "Clyde Barrow",
- "347666888555" /* American Express */, "04", "2999");
+ "347666888555" /* American Express */, "04", "2999",
+ "1");
local_card.set_billing_address_id(kServerAddressId);
personal_data_->AddCreditCard(local_card);
@@ -6222,7 +6241,7 @@ TEST_F(
server_cards.push_back(
CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1111" /* Visa */, "01", "2999");
+ "1111" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.back().set_billing_address_id(kServerAddressId2);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -6319,7 +6338,7 @@ TEST_F(
server_cards.push_back(
CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card1"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1111" /* Visa */, "01", "2999");
+ "1111" /* Visa */, "01", "2999", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.back().set_billing_address_id(kServerAddressId);
test::SetServerCreditCards(autofill_table_, server_cards);
@@ -6357,7 +6376,7 @@ TEST_F(
server_cards.push_back(
CreditCard(CreditCard::MASKED_SERVER_CARD, "server_card2"));
test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
- "1112" /* Visa */, "01", "2888");
+ "1112" /* Visa */, "01", "2888", "1");
server_cards.back().SetNetworkForMaskedCard(kVisaCard);
server_cards.back().set_billing_address_id(kServerAddressId);
test::SetServerCreditCards(autofill_table_, server_cards);
« components/autofill/core/browser/address_combobox_model.cc ('K') | « components/autofill/core/browser/payments/full_card_request_unittest.cc ('k') | components/autofill/core/browser/validation.h » ('j') | components/payments/core/autofill_payment_instrument_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698