[Autofill] Improve support for various credit card expiration dates.

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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 2120 matching lines @@
   base::MessageLoop::current()->Run();
 
   CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
   test::SetCreditCardInfo(&expected2, "", "5500000000000004", "02", "3999");
   std::vector<CreditCard*> cards;
   cards.push_back(&expected);
   cards.push_back(&expected2);
   ExpectSameElements(cards, personal_data_->GetCreditCards());
 }
 
+// This form has the expiration year as one field with MM/YY.
+TEST_F(PersonalDataManagerTest, ImportCreditCard_Month2DigitYearCombination) {

[sebsg, 2016/07/08 10:01:45]

There seems to be a some duplicate code between the tests for the expiration
date. Do you think you could use the array of structs way? That way we can see
the test cases more easily and can add some quickly. Thanks!

[Mathieu, 2016/07/08 14:27:05]

reused code when possible. I think the struct abstracts it a little too much (I
want the reader to exactly see which form is submitted).

+  FormData form;
+  FormFieldData field;
+  test::CreateTestFormField("Name on card:", "name_on_card", "John MMYY",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Card Number:", "card_number", "4111111111111111",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Exp Date:", "exp_date", "05/45", "text", &field);
+  field.autocomplete_attribute = "cc-exp";
+  field.max_length = 5;
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+  std::unique_ptr<CreditCard> imported_credit_card;
+  EXPECT_TRUE(ImportCreditCard(form_structure, false, &imported_credit_card));
+  ASSERT_TRUE(imported_credit_card);
+  personal_data_->SaveImportedCreditCard(*imported_credit_card);
+
+  // Verify that the web database has been updated and the notification sent.
+  EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
+      .WillOnce(QuitMainMessageLoop());
+  base::MessageLoop::current()->Run();
+
+  CreditCard expected(base::GenerateGUID(), "https://www.example.com");
+  test::SetCreditCardInfo(&expected, "John MMYY", "4111111111111111", "05",
+                          "2045");
+  const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
+  ASSERT_EQ(1U, results.size());
+  EXPECT_EQ(0, expected.Compare(*results[0]));
+}
+
+// This form has the expiration year as one field with MM/YYYY.
+TEST_F(PersonalDataManagerTest, ImportCreditCard_Month4DigitYearCombination) {
+  FormData form;
+  FormFieldData field;
+  test::CreateTestFormField("Name on card:", "name_on_card", "John MMYYYY",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Card Number:", "card_number", "4111111111111111",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Exp Date:", "exp_date", "05/2045", "text", &field);
+  field.autocomplete_attribute = "cc-exp";
+  field.max_length = 7;
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+  std::unique_ptr<CreditCard> imported_credit_card;
+  EXPECT_TRUE(ImportCreditCard(form_structure, false, &imported_credit_card));
+  ASSERT_TRUE(imported_credit_card);
+  personal_data_->SaveImportedCreditCard(*imported_credit_card);
+
+  // Verify that the web database has been updated and the notification sent.
+  EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
+      .WillOnce(QuitMainMessageLoop());
+  base::MessageLoop::current()->Run();
+
+  CreditCard expected(base::GenerateGUID(), "https://www.example.com");
+  test::SetCreditCardInfo(&expected, "John MMYYYY", "4111111111111111", "05",
+                          "2045");
+  const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
+  ASSERT_EQ(1U, results.size());
+  EXPECT_EQ(0, expected.Compare(*results[0]));
+}
+
+// This form has the expiration year as one field with M/YYYY.
+TEST_F(PersonalDataManagerTest, ImportCreditCard_1DigitMonth4DigitYear) {
+  FormData form;
+  FormFieldData field;
+  test::CreateTestFormField("Name on card:", "name_on_card", "John MYYYY",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Card Number:", "card_number", "4111111111111111",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Exp Date:", "exp_date", "5/2045", "text", &field);
+  field.autocomplete_attribute = "cc-exp";
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+  std::unique_ptr<CreditCard> imported_credit_card;
+  EXPECT_TRUE(ImportCreditCard(form_structure, false, &imported_credit_card));
+  ASSERT_TRUE(imported_credit_card);
+  personal_data_->SaveImportedCreditCard(*imported_credit_card);
+
+  // Verify that the web database has been updated and the notification sent.
+  EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
+      .WillOnce(QuitMainMessageLoop());
+  base::MessageLoop::current()->Run();
+
+  CreditCard expected(base::GenerateGUID(), "https://www.example.com");
+  test::SetCreditCardInfo(&expected, "John MYYYY", "4111111111111111", "05",
+                          "2045");
+  const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
+  ASSERT_EQ(1U, results.size());
+  EXPECT_EQ(0, expected.Compare(*results[0]));
+}
+
+// This form has the expiration year as a 2-digit field.
+TEST_F(PersonalDataManagerTest, ImportCreditCard_2DigitYear) {
+  FormData form;
+  FormFieldData field;
+  test::CreateTestFormField("Name on card:", "name_on_card", "John Smith",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Card Number:", "card_number", "4111111111111111",
+                            "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Exp Month:", "exp_month", "05", "text", &field);
+  form.fields.push_back(field);
+  test::CreateTestFormField("Exp Year:", "exp_year", "45", "text", &field);
+  field.max_length = 2;
+  form.fields.push_back(field);
+
+  FormStructure form_structure(form);
+  form_structure.DetermineHeuristicTypes();
+  std::unique_ptr<CreditCard> imported_credit_card;
+  EXPECT_TRUE(ImportCreditCard(form_structure, false, &imported_credit_card));
+  ASSERT_TRUE(imported_credit_card);
+  personal_data_->SaveImportedCreditCard(*imported_credit_card);
+
+  // Verify that the web database has been updated and the notification sent.
+  EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
+      .WillOnce(QuitMainMessageLoop());
+  base::MessageLoop::current()->Run();
+
+  CreditCard expected(base::GenerateGUID(), "https://www.example.com");
+  test::SetCreditCardInfo(&expected, "John Smith", "4111111111111111", "05",
+                          "2045");
+  const std::vector<CreditCard*>& results = personal_data_->GetCreditCards();
+  ASSERT_EQ(1U, results.size());
+  EXPECT_EQ(0, expected.Compare(*results[0]));
+}
+
 // Tests that a credit card is extracted because it only matches a masked server
 // card.
 TEST_F(PersonalDataManagerTest,
        ImportCreditCard_DuplicateServerCards_MaskedCard) {
   // Add a masked server card.
   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");
   server_cards.back().SetTypeForMaskedCard(kVisaCard);
@@ skipping 2474 matching lines @@
   EXPECT_EQ(profile1.use_count() + profile2.use_count() +
                 imported_profile.use_count(),
             profiles[0]->use_count());
   // The use date that results from the merge should be the one from the
   // imported profile since it was used just now.
   EXPECT_LT(base::Time::Now() - base::TimeDelta::FromSeconds(10),
             profiles[0]->use_date());
 }
 
 }  // namespace autofill