[Autofill] Update credit card type detection logic.

components/autofill/browser/credit_card_unittest.cc

 // Copyright (c) 2011 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/basictypes.h"
 #include "base/guid.h"
 #include "base/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/common/form_field_data.h"
@@ skipping 22 matching lines @@
   "5019717010103742",
   "6331101999990016",
 };
 const char* const kInvalidNumbers[] = {
   "4111 1111 112", /* too short */
   "41111111111111111115", /* too long */
   "4111-1111-1111-1110", /* wrong Luhn checksum */
   "3056 9309 0259 04aa", /* non-digit characters */
 };
 
+// A simple wrapper function to handle string type conversion.
+std::string GetCreditCardType(const std::string& number) {
+  return CreditCard::GetCreditCardType(ASCIIToUTF16(number));
+}
+
 }  // namespace
 
 // Tests credit card summary string generation.  This test simulates a variety
 // of different possible summary strings.  Variations occur based on the
 // existence of credit card number, month, and year fields.
 TEST(CreditCardTest, PreviewSummaryAndObfuscatedNumberStrings) {
   // Case 0: empty credit card.
   CreditCard credit_card0(base::GenerateGUID(), "https://www.example.com/");
   base::string16 summary0 = credit_card0.Label();
   EXPECT_EQ(base::string16(), summary0);
@@ skipping 338 matching lines @@
   {
     // Case insensitivity:
     CreditCard credit_card(base::GenerateGUID(), "https://www.example.com/");
     credit_card.SetRawInfo(CREDIT_CARD_NUMBER,
                            ASCIIToUTF16("6011111111111117"));
     credit_card.FillSelectControl(CREDIT_CARD_TYPE, "en-US", &field);
     EXPECT_EQ(ASCIIToUTF16("discover"), field.value);
   }
 }
 
+TEST(CreditCardTest, GetCreditCardType) {
+  // Verify the relevant sample numbers from
+  // http://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("378282246310005"));

[Evan Stade, 2013/06/10 18:59:47]

I think the most common way to do this in tests is to have a struct of test
cases and then loop through them. It makes it a bit easier to read individual
test cases since they look like:

...
{ kDinersCard, "38520000023237" }
...

plus the code is all together (instead of pulling out related code into a
utility function at the other end of the file)

[Ilya Sherman, 2013/06/18 03:37:38]

Done.

+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("371449635398431"));
+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("378734493671000"));
+  EXPECT_EQ(kDinersCard, GetCreditCardType("30569309025904"));
+  EXPECT_EQ(kDinersCard, GetCreditCardType("38520000023237"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011111111111117"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011000990139424"));
+  EXPECT_EQ(kJCBCard, GetCreditCardType("3530111333300000"));
+  EXPECT_EQ(kJCBCard, GetCreditCardType("3566002020360505"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5555555555554444"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5105105105105100"));
+  EXPECT_EQ(kVisaCard, GetCreditCardType("4111111111111111"));
+  EXPECT_EQ(kVisaCard, GetCreditCardType("4012888888881881"));
+  EXPECT_EQ(kVisaCard, GetCreditCardType("4222222222222"));
+
+  // Verify the relevant sample numbers from
+  // http://auricsystems.com/support-center/sample-credit-card-numbers/
+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("343434343434343"));
+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("371144371144376"));
+  EXPECT_EQ(kAmericanExpressCard, GetCreditCardType("341134113411347"));
+  EXPECT_EQ(kDinersCard, GetCreditCardType("36438936438936"));
+  EXPECT_EQ(kDinersCard, GetCreditCardType("36110361103612"));
+  EXPECT_EQ(kDinersCard, GetCreditCardType("36111111111111"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011016011016011"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011000990139424"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011000000000004"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6011000995500000"));
+  EXPECT_EQ(kDiscoverCard, GetCreditCardType("6500000000000002"));
+  EXPECT_EQ(kJCBCard, GetCreditCardType("3566003566003566"));
+  EXPECT_EQ(kJCBCard, GetCreditCardType("3528000000000007"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5500005555555559"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5555555555555557"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5454545454545454"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5555515555555551"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5405222222222226"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5478050000000007"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5111005111051128"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5112345112345114"));
+  EXPECT_EQ(kMasterCard, GetCreditCardType("5115915115915118"));
+}

[benquan, 2013/06/08 07:27:57]

Please add a test for kGenericCard and some negative tests, like wrong length of
card number.

[Ilya Sherman, 2013/06/18 03:37:38]

Good call -- done.

+
 }  // namespace autofill