Add MATCH_NUMBER to match types when parsing expiration date form field.

components/autofill/core/browser/credit_card_field_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/credit_card_field.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 284 matching lines @@
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH,
             field_candidates_map_[ASCIIToUTF16("month3")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("year4")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year4")].BestHeuristicType());
 }
 
 typedef struct {
+  const std::string cc_fields_form_control_type;
   const std::string label;
   const int max_length;
   const ServerFieldType expected_prediction;
 } ParseExpFieldTestCase;
 
 class ParseExpFieldTest : public CreditCardFieldTestBase,
                           public testing::TestWithParam<ParseExpFieldTestCase> {
 };
 
 TEST_P(ParseExpFieldTest, ParseExpField) {
   auto test_case = GetParam();
   // Clean up after previous test cases.
   list_.clear();
   field_.reset();
   field_candidates_map_.clear();
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   list_.push_back(
       base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
+  field.form_control_type = test_case.cc_fields_form_control_type;
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
   list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("num2")));
 
   field.label = ASCIIToUTF16(test_case.label);
   if (test_case.max_length != 0) {
     field.max_length = test_case.max_length;
   }
   field.name = ASCIIToUTF16("cc_exp");
   list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("exp3")));
@@ skipping 29 matching lines @@
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("exp3")) !=
               field_candidates_map_.end());
   EXPECT_EQ(test_case.expected_prediction,
             field_candidates_map_[ASCIIToUTF16("exp3")].BestHeuristicType());
 }
 
 INSTANTIATE_TEST_CASE_P(
     CreditCardFieldTest,
     ParseExpFieldTest,
     testing::Values(
+        // CC fields input_type="text"
         // General label, no maxlength.
-        ParseExpFieldTestCase{"Expiration Date", 0,
+        ParseExpFieldTestCase{"text", "Expiration Date", 0,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // General label, maxlength 4.
-        ParseExpFieldTestCase{"Expiration Date", 4,
+        ParseExpFieldTestCase{"text", "Expiration Date", 4,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // General label, maxlength 5.
-        ParseExpFieldTestCase{"Expiration Date", 5,
+        ParseExpFieldTestCase{"text", "Expiration Date", 5,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // General label, maxlength 6.
-        ParseExpFieldTestCase{"Expiration Date", 6,
+        ParseExpFieldTestCase{"text", "Expiration Date", 6,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // General label, maxlength 7.
-        ParseExpFieldTestCase{"Expiration Date", 7,
+        ParseExpFieldTestCase{"text", "Expiration Date", 7,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // General label, large maxlength.
-        ParseExpFieldTestCase{"Expiration Date", 12,
+        ParseExpFieldTestCase{"text", "Expiration Date", 12,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
 
         // Unsupported maxlength, general label.
-        ParseExpFieldTestCase{"Expiration Date", 3, UNKNOWN_TYPE},
+        ParseExpFieldTestCase{"text", "Expiration Date", 3, UNKNOWN_TYPE},
         // Unsupported maxlength, two digit year label.
-        ParseExpFieldTestCase{"Expiration Date (MM/YY)", 3, UNKNOWN_TYPE},
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YY)", 3,
+                              UNKNOWN_TYPE},
         // Unsupported maxlength, four digit year label.
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 3, UNKNOWN_TYPE},
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 3,
+                              UNKNOWN_TYPE},
 
         // Two digit year, simple label.
-        ParseExpFieldTestCase{"MM / YY", 0, CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        ParseExpFieldTestCase{"text", "MM / YY", 0,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // Two digit year, with slash (MM/YY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YY)", 0,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YY)", 0,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // Two digit year, no slash (MMYY).
-        ParseExpFieldTestCase{"Expiration Date (MMYY)", 4,
+        ParseExpFieldTestCase{"text", "Expiration Date (MMYY)", 4,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // Two digit year, with slash and maxlength (MM/YY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YY)", 5,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YY)", 5,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // Two digit year, with slash and large maxlength (MM/YY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YY)", 12,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YY)", 12,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
 
         // Four digit year, simple label.
-        ParseExpFieldTestCase{"MM / YYYY", 0,
+        ParseExpFieldTestCase{"text", "MM / YYYY", 0,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // Four digit year, with slash (MM/YYYY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 0,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 0,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // Four digit year, no slash (MMYYYY).
-        ParseExpFieldTestCase{"Expiration Date (MMYYYY)", 6,
+        ParseExpFieldTestCase{"text", "Expiration Date (MMYYYY)", 6,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // Four digit year, with slash and maxlength (MM/YYYY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 7,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 7,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
         // Four digit year, with slash and large maxlength (MM/YYYY).
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 12,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 12,
                               CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
 
         // Four digit year label with restrictive maxlength (4).
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 4,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 4,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
         // Four digit year label with restrictive maxlength (5).
-        ParseExpFieldTestCase{"Expiration Date (MM/YYYY)", 5,
+        ParseExpFieldTestCase{"text", "Expiration Date (MM/YYYY)", 5,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+
+        // CC fields input_type="number"
+        // General label, no maxlength.
+        ParseExpFieldTestCase{"number", "Expiration Date", 0,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // General label, maxlength 4.
+        ParseExpFieldTestCase{"number", "Expiration Date", 4,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // General label, maxlength 5.
+        ParseExpFieldTestCase{"number", "Expiration Date", 5,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // General label, maxlength 6.
+        ParseExpFieldTestCase{"number", "Expiration Date", 6,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // General label, maxlength 7.
+        ParseExpFieldTestCase{"number", "Expiration Date", 7,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // General label, large maxlength.
+        ParseExpFieldTestCase{"number", "Expiration Date", 12,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+
+        // Unsupported maxlength, general label.
+        ParseExpFieldTestCase{"number", "Expiration Date", 3, UNKNOWN_TYPE},
+        // Unsupported maxlength, two digit year label.
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YY)", 3,
+                              UNKNOWN_TYPE},
+        // Unsupported maxlength, four digit year label.
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 3,
+                              UNKNOWN_TYPE},
+
+        // Two digit year, simple label.
+        ParseExpFieldTestCase{"number", "MM / YY", 0,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // Two digit year, with slash (MM/YY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YY)", 0,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // Two digit year, no slash (MMYY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MMYY)", 4,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // Two digit year, with slash and maxlength (MM/YY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YY)", 5,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // Two digit year, with slash and large maxlength (MM/YY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YY)", 12,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+
+        // Four digit year, simple label.
+        ParseExpFieldTestCase{"number", "MM / YYYY", 0,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // Four digit year, with slash (MM/YYYY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 0,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // Four digit year, no slash (MMYYYY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MMYYYY)", 6,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // Four digit year, with slash and maxlength (MM/YYYY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 7,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+        // Four digit year, with slash and large maxlength (MM/YYYY).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 12,
+                              CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR},
+
+        // Four digit year label with restrictive maxlength (4).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 4,
+                              CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR},
+        // Four digit year label with restrictive maxlength (5).
+        ParseExpFieldTestCase{"number", "Expiration Date (MM/YYYY)", 5,
                               CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR}));
 
 TEST_F(CreditCardFieldTest, ParseCreditCardHolderNameWithCCFullName) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name");
   field.name = ASCIIToUTF16("ccfullname");
   list_.push_back(
       base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
@@ skipping 377 matching lines @@
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
             field_candidates_map_[ASCIIToUTF16("cvc")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("unknown")) ==
               field_candidates_map_.end());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("cvc2")) ==
               field_candidates_map_.end());
 }
 
 }  // namespace autofill