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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 982203002: Autofill - Move test only code to a test util file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add dcheck Created 5 years, 10 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
« no previous file with comments | « components/autofill/core/browser/autofill_test_utils.cc ('k') | components/autofill/core/browser/webdata/autofill_table.cc » ('j') | no next file with comments »
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 ae899cc87956fe833a9cfc8903ff845593efef4f..e94cd1977b819c1781099bd69a8652e32ede0322 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -428,7 +428,7 @@ TEST_F(PersonalDataManagerTest, ReturnsServerCreditCards) {
"2109" /* Mastercard */, "12", "2012");
server_cards.back().SetTypeForMaskedCard(kMasterCard);
- autofill_table_->SetServerCreditCards(server_cards);
+ test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -457,7 +457,7 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCards) {
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
"347666888555" /* American Express */, "04", "2015");
- autofill_table_->SetServerCreditCards(server_cards);
+ test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -1692,7 +1692,7 @@ TEST_F(PersonalDataManagerTest, AggregateCardsThatDuplicateServerCards) {
server_cards.push_back(CreditCard(CreditCard::FULL_SERVER_CARD, "c789"));
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
"347666888555" /* American Express */, "04", "2015");
- autofill_table_->SetServerCreditCards(server_cards);
+ test::SetServerCreditCards(autofill_table_, server_cards);
FormData form1;
@@ -2883,7 +2883,7 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions) {
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
"347666888555" /* American Express */, "04", "2015");
- autofill_table_->SetServerCreditCards(server_cards);
+ test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
.WillOnce(QuitMainMessageLoop());
@@ -2892,22 +2892,22 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions) {
suggestions = personal_data_->GetCreditCardSuggestions(
AutofillType(CREDIT_CARD_NAME), base::string16());
ASSERT_EQ(4U, suggestions.size());
- EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[0].value);
- EXPECT_EQ(suggestions[0].backend_id.guid, credit_card2.guid());
- EXPECT_EQ(ASCIIToUTF16("John Dillinger"), suggestions[1].value);
- EXPECT_NE(suggestions[1].backend_id.guid, credit_card1.guid());
- EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[2].value);
- EXPECT_NE(suggestions[2].backend_id.guid, credit_card2.guid());
- EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), suggestions[3].value);
+ EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), suggestions[0].value);
EXPECT_NE(suggestions[0].backend_id.guid, credit_card0.guid());
+ EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[1].value);
Evan Stade 2015/03/06 00:10:41 suggestions changed order because unmasking update
+ EXPECT_EQ(suggestions[1].backend_id.guid, credit_card2.guid());
+ EXPECT_EQ(ASCIIToUTF16("John Dillinger"), suggestions[2].value);
+ EXPECT_NE(suggestions[2].backend_id.guid, credit_card1.guid());
+ EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[3].value);
+ EXPECT_NE(suggestions[3].backend_id.guid, credit_card2.guid());
suggestions = personal_data_->GetCreditCardSuggestions(
AutofillType(CREDIT_CARD_NUMBER), base::string16());
ASSERT_EQ(4U, suggestions.size());
- EXPECT_EQ(ASCIIToUTF16("MasterCard - 2109"), suggestions[0].value);
- EXPECT_EQ(ASCIIToUTF16("Visa - 9012"), suggestions[1].value);
- EXPECT_EQ(ASCIIToUTF16("Visa - 2109"), suggestions[2].value);
- EXPECT_EQ(ASCIIToUTF16("Amex - 8555"), suggestions[3].value);
+ EXPECT_EQ(ASCIIToUTF16("Amex - 8555"), suggestions[0].value);
+ EXPECT_EQ(ASCIIToUTF16("MasterCard - 2109"), suggestions[1].value);
+ EXPECT_EQ(ASCIIToUTF16("Visa - 9012"), suggestions[2].value);
+ EXPECT_EQ(ASCIIToUTF16("Visa - 2109"), suggestions[3].value);
// Make sure a server card can be a dupe of more than one local card.
CreditCard credit_card3("4141084B-72D7-4B73-90CF-3D6AC154673B",
@@ -2922,10 +2922,10 @@ TEST_F(PersonalDataManagerTest, GetCreditCardSuggestions) {
suggestions = personal_data_->GetCreditCardSuggestions(
AutofillType(CREDIT_CARD_NAME), base::string16());
ASSERT_EQ(4U, suggestions.size());
- EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[0].value);
- EXPECT_EQ(ASCIIToUTF16("John Dillinger"), suggestions[1].value);
- EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[2].value);
- EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), suggestions[3].value);
+ EXPECT_EQ(ASCIIToUTF16("Clyde Barrow"), suggestions[0].value);
+ EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[1].value);
+ EXPECT_EQ(ASCIIToUTF16("John Dillinger"), suggestions[2].value);
+ EXPECT_EQ(ASCIIToUTF16("Bonnie Parker"), suggestions[3].value);
}
#if defined(OS_MACOSX) && !defined(OS_IOS)
@@ -3048,7 +3048,7 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCardUsageStats) {
test::SetCreditCardInfo(&server_cards.back(), "Clyde Barrow",
"347666888555" /* American Express */, "04", "2015");
- autofill_table_->SetServerCreditCards(server_cards);
+ test::SetServerCreditCards(autofill_table_, server_cards);
personal_data_->Refresh();
EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
@@ -3081,8 +3081,10 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCardUsageStats) {
EXPECT_EQ(0U, personal_data_->GetCreditCards()[1]->use_count());
EXPECT_EQ(base::Time(), personal_data_->GetCreditCards()[1]->use_date());
- EXPECT_EQ(0U, personal_data_->GetCreditCards()[2]->use_count());
- EXPECT_EQ(base::Time(), personal_data_->GetCreditCards()[2]->use_date());
+ // Having unmasked this card, usage stats should be 1 and Now().
+ EXPECT_EQ(1U, personal_data_->GetCreditCards()[2]->use_count());
+ EXPECT_NE(base::Time(), personal_data_->GetCreditCards()[2]->use_date());
+ base::Time initial_use_date = personal_data_->GetCreditCards()[2]->use_date();
server_cards.back().set_guid(personal_data_->GetCreditCards()[2]->guid());
personal_data_->RecordUseOf(server_cards.back());
@@ -3096,8 +3098,9 @@ TEST_F(PersonalDataManagerTest, UpdateServerCreditCardUsageStats) {
EXPECT_EQ(0U, personal_data_->GetCreditCards()[1]->use_count());
EXPECT_EQ(base::Time(), personal_data_->GetCreditCards()[1]->use_date());
- EXPECT_EQ(1U, personal_data_->GetCreditCards()[2]->use_count());
+ EXPECT_EQ(2U, personal_data_->GetCreditCards()[2]->use_count());
EXPECT_NE(base::Time(), personal_data_->GetCreditCards()[2]->use_date());
+ EXPECT_NE(initial_use_date, personal_data_->GetCreditCards()[2]->use_date());
}
} // namespace autofill
« no previous file with comments | « components/autofill/core/browser/autofill_test_utils.cc ('k') | components/autofill/core/browser/webdata/autofill_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698