Refactors cvc and expiration date validation in CC upload logic as well as unmask prompt.

components/autofill/core/browser/validation_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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/validation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 namespace {
 
 struct ExpirationDate {
   const char* year;
   const char* month;
 };
 
 struct IntExpirationDate {
   const int year;
   const int month;
 };
 
+struct SecurityCodeCardTypePair {
+  const char* security_code;
+  const char* card_type;
+};
+
 // From https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
 const char* const kValidNumbers[] = {
   "378282246310005",
   "3714 4963 5398 431",
   "3787-3449-3671-000",
   "5610591081018250",
   "3056 9309 0259 04",
   "3852-0000-0232-37",
   "6011111111111117",
   "6011 0009 9013 9424",
@@ skipping 19 matching lines @@
   { 2013, 5 },  // Valid month in current year.
   { 2014, 1 },  // Any month in next year.
   { 2014, 12 },  // Edge condition.
 };
 const IntExpirationDate kInvalidCreditCardIntExpirationDate[] = {
   { 2013, 4 },  // Previous month in current year.
   { 2012, 12 },  // Any month in previous year.
   { 2015, 13 },  // Not a real month.
   { 2015, 0 },  // Zero is legal in the CC class but is not a valid date.
 };
-const char* const kValidCreditCardSecurityCode[] = {
-  "323",  // 3-digit CSC.
-  "3234",  // 4-digit CSC.
+const SecurityCodeCardTypePair kValidSecurityCodeCardTypePairs[] = {
+  { "323",  kGenericCard }, // 3-digit CSC.
+  { "3234", kAmericanExpressCard }, // 4-digit CSC.
 };
-const char* const kInvalidCreditCardSecurityCode[] = {
-  "32",  // CSC too short.
-  "12345",  // CSC too long.
-  "asd",  // non-numeric CSC.
+const SecurityCodeCardTypePair kInvalidSecurityCodeCardTypePairs[] = {
+  { "32", kGenericCard }, // CSC too short.
+  { "323", kAmericanExpressCard }, // CSC too short.
+  { "3234", kGenericCard }, // CSC too long.
+  { "12345", kAmericanExpressCard }, // CSC too long.
+  { "asd", kGenericCard }, // non-numeric CSC.
 };
 const char* const kValidEmailAddress[] = {
   "user@example",
   "user@example.com",
   "user@subdomain.example.com",
   "user+postfix@example.com",
 };
 const char* const kInvalidEmailAddress[] = {
   "user",
   "foo.com",
   "user@",
   "user@=example.com"
 };
-const char kAmericanExpressCard[] = "341111111111111";
-const char kVisaCard[] = "4111111111111111";
-const char kAmericanExpressCVC[] = "1234";
-const char kVisaCVC[] = "123";
 }  // namespace
 
 TEST(AutofillValidation, IsValidCreditCardNumber) {
   for (const char* valid_number : kValidNumbers) {
     SCOPED_TRACE(valid_number);
     EXPECT_TRUE(IsValidCreditCardNumber(ASCIIToUTF16(valid_number)));
   }
   for (const char* invalid_number : kInvalidNumbers) {
     SCOPED_TRACE(invalid_number);
     EXPECT_FALSE(IsValidCreditCardNumber(ASCIIToUTF16(invalid_number)));
   }
 }
 
 TEST(AutofillValidation, IsValidCreditCardIntExpirationDate) {
   base::Time now;
   ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));
 
   for (const IntExpirationDate& data : kValidCreditCardIntExpirationDate) {
     SCOPED_TRACE(data.year);
     SCOPED_TRACE(data.month);
     EXPECT_TRUE(IsValidCreditCardExpirationDate(data.year, data.month, now));
   }
   for (const IntExpirationDate& data : kInvalidCreditCardIntExpirationDate) {
     SCOPED_TRACE(data.year);
     SCOPED_TRACE(data.month);
     EXPECT_TRUE(!IsValidCreditCardExpirationDate(data.year, data.month, now));
   }
 }
+
 TEST(AutofillValidation, IsValidCreditCardSecurityCode) {
-  for (const char* valid_code : kValidCreditCardSecurityCode) {
-    SCOPED_TRACE(valid_code);
-    EXPECT_TRUE(IsValidCreditCardSecurityCode(ASCIIToUTF16(valid_code)));
+  for (const auto data : kValidSecurityCodeCardTypePairs) {
+    SCOPED_TRACE(data.security_code);
+    SCOPED_TRACE(data.card_type);
+    EXPECT_TRUE(IsValidCreditCardSecurityCode(ASCIIToUTF16(data.security_code),
+                                              data.card_type));
   }
-  for (const char* invalid_code : kInvalidCreditCardSecurityCode) {
-    SCOPED_TRACE(invalid_code);
-    EXPECT_FALSE(IsValidCreditCardSecurityCode(ASCIIToUTF16(invalid_code)));
+  for (const auto data : kInvalidSecurityCodeCardTypePairs) {
+    SCOPED_TRACE(data.security_code);
+    SCOPED_TRACE(data.card_type);
+    EXPECT_FALSE(IsValidCreditCardSecurityCode(ASCIIToUTF16(data.security_code),
+                                               data.card_type));
   }
 }
 
 TEST(AutofillValidation, IsValidEmailAddress) {
   for (const char* valid_email : kValidEmailAddress) {
     SCOPED_TRACE(valid_email);
     EXPECT_TRUE(IsValidEmailAddress(ASCIIToUTF16(valid_email)));
   }
   for (const char* invalid_email : kInvalidEmailAddress) {
     SCOPED_TRACE(invalid_email);
     EXPECT_FALSE(IsValidEmailAddress(ASCIIToUTF16(invalid_email)));
   }
 }
 
-TEST(AutofillValidation, IsValidCreditCardSecurityCodeWithNumber) {
-  EXPECT_TRUE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kAmericanExpressCVC), ASCIIToUTF16(kAmericanExpressCard)));
-  EXPECT_TRUE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kVisaCVC), ASCIIToUTF16(kVisaCard)));
-  EXPECT_FALSE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kVisaCVC), ASCIIToUTF16(kAmericanExpressCard)));
-  EXPECT_FALSE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kAmericanExpressCVC), ASCIIToUTF16(kVisaCard)));
-  EXPECT_TRUE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kVisaCVC), ASCIIToUTF16(kInvalidNumbers[0])));
-  EXPECT_FALSE(IsValidCreditCardSecurityCode(
-      ASCIIToUTF16(kAmericanExpressCVC), ASCIIToUTF16(kInvalidNumbers[0])));
-}
-
 }  // namespace autofill