Autofill: Allow forms to have multiple distinct CC number inputs.

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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/credit_card_field.h"
@@ skipping 430 matching lines @@
 
   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("month5")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month5")]);
   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("year6")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_type_map_[ASCIIToUTF16("year6")]);
 }
 
-TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithInvalidSplit) {
+TEST_F(CreditCardFieldTest, ParseMultipleCreditCardNumbers) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
 
-  field.label = ASCIIToUTF16("Not Card Number");
-  field.name = ASCIIToUTF16("not_card_number");
+  field.label = ASCIIToUTF16("Confirm Card Number");
+  field.name = ASCIIToUTF16("confirm_card_number");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("number3")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("month4")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
   list_.push_back(new AutofillField(field, ASCIIToUTF16("year5")));
 
   Parse();
   ASSERT_NE(static_cast<CreditCardField*>(NULL), field_.get());
   EXPECT_TRUE(ClassifyField());
 
   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("name1")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME, field_type_map_[ASCIIToUTF16("name1")]);
-  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number2")) ==
-              field_type_map_.end());
-  ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("number3")) ==
-              field_type_map_.end());
+  EXPECT_FALSE(field_type_map_.find(ASCIIToUTF16("number2")) ==
+               field_type_map_.end());
+  EXPECT_FALSE(field_type_map_.find(ASCIIToUTF16("number3")) ==
+               field_type_map_.end());

[Ilya Sherman, 2014/10/21 01:28:01]

nit: Please use ASSERT_TRUE + EXPECT_EQ stmts like the other conditions.

[Evan Stade, 2014/10/21 18:38:15]

Done.

   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("month4")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH, field_type_map_[ASCIIToUTF16("month4")]);
   ASSERT_TRUE(field_type_map_.find(ASCIIToUTF16("year5")) !=
               field_type_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_type_map_[ASCIIToUTF16("year5")]);
 }
 
 }  // namespace autofill