Autofill - Move test only code to a test util file.

components/autofill/core/browser/personal_data_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 410 matching lines @@
   server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "a123"));
   test::SetCreditCardInfo(&server_cards.back(), "John Dillinger",
                           "9012" /* Visa */, "01", "2010");
   server_cards.back().SetTypeForMaskedCard(kVisaCard);
 
   server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
   test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
                           "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())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(0U, personal_data_->GetCreditCards().size());
 }
 
 // Tests that UpdateServerCreditCard can be used to mask or unmask server cards.
 TEST_F(PersonalDataManagerTest, UpdateServerCreditCards) {
   EnableWalletCardImport();
 
   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", "2010");
   server_cards.back().SetTypeForMaskedCard(kVisaCard);
 
   server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
   test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
                           "2109" /* Mastercard */, "12", "2012");
   server_cards.back().SetTypeForMaskedCard(kMasterCard);
 
   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);
   personal_data_->Refresh();
 
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   ASSERT_EQ(3U, personal_data_->GetCreditCards().size());
   // The GUIDs will be different, so just compare the data.
   for (size_t i = 0; i < 3; ++i)
     EXPECT_EQ(0, server_cards[i].Compare(*personal_data_->GetCreditCards()[i]));
@@ skipping 1214 matching lines @@
 TEST_F(PersonalDataManagerTest, AggregateCardsThatDuplicateServerCards) {
   // Add server cards.
   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", "2010");
   server_cards.back().SetTypeForMaskedCard(kVisaCard);
   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;
 
   // Type the same data as the masked card into a form.
   FormFieldData field;
   test::CreateTestFormField(
       "Name on card:", "name_on_card", "John Dillinger", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111111111111111", "text", &field);
@@ skipping 1170 matching lines @@
   server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
   test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
                           "2109", "12", "2012");
   server_cards.back().SetTypeForMaskedCard(kVisaCard);
 
   // This unmasked server card is a dupe.
   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);
   personal_data_->Refresh();
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   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 updates the usage stats (so MFU
filters the unmasked one to the top)

+  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",
                           "https://www.example.com");
   test::SetCreditCardInfo(&credit_card3, "John Dillinger", "", "01", "");
   personal_data_->AddCreditCard(credit_card3);
 
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   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)
 TEST_F(PersonalDataManagerTest, ShowAddressBookPrompt) {
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged()).Times(2);
 
   AutofillType type(ADDRESS_HOME_STREET_ADDRESS);
 
   prefs_->SetBoolean(prefs::kAutofillEnabled, false);
   EXPECT_FALSE(personal_data_->ShouldShowAccessAddressBookSuggestion(type));
@@ skipping 102 matching lines @@
 
   server_cards.push_back(CreditCard(CreditCard::MASKED_SERVER_CARD, "b456"));
   test::SetCreditCardInfo(&server_cards.back(), "Bonnie Parker",
                           "2109" /* Mastercard */, "12", "2012");
   server_cards.back().SetTypeForMaskedCard(kMasterCard);
 
   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);
   personal_data_->Refresh();
 
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   ASSERT_EQ(3U, personal_data_->GetCreditCards().size());
   // The GUIDs will be different, so just compare the data.
   for (size_t i = 0; i < 3; ++i)
     EXPECT_EQ(0, server_cards[i].Compare(*personal_data_->GetCreditCards()[i]));
@@ skipping 12 matching lines @@
   for (size_t i = 0; i < 3; ++i)
     EXPECT_EQ(0, server_cards[i].Compare(*personal_data_->GetCreditCards()[i]));
 
   // For an unmasked card, usage data starts out as 1 and Now().
   EXPECT_EQ(1U, personal_data_->GetCreditCards()[0]->use_count());
   EXPECT_NE(base::Time(), personal_data_->GetCreditCards()[0]->use_date());
 
   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());
   EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
       .WillOnce(QuitMainMessageLoop());
   base::MessageLoop::current()->Run();
 
   EXPECT_EQ(1U, personal_data_->GetCreditCards()[0]->use_count());
   EXPECT_NE(base::Time(), personal_data_->GetCreditCards()[0]->use_date());
 
   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