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

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/validation.h"
@@ skipping 37 matching lines @@
   // A UnionPay card that doesn't pass the Luhn checksum
   "6200000000000000",
 };
 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 */
 };
 const char kCurrentDate[]="1 May 2013";
-const ExpirationDate kValidCreditCardExpirationDate[] = {
-  { "2013", "5" },  // Valid month in current year.
-  { "2014", "1" },  // Any month in next year.
-  { "2014", "12" },  // Edge condition.
-  { "2014", " 1" },  // Whitespace in month.
-  { " 2014", "1" },  // Whitespace in year.
-};
 const IntExpirationDate kValidCreditCardIntExpirationDate[] = {
   { 2013, 5 },  // Valid month in current year.
   { 2014, 1 },  // Any month in next year.
   { 2014, 12 },  // Edge condition.
 };
-const ExpirationDate kInvalidCreditCardExpirationDate[] = {
-  { "2013", "04" },  // Previous month in current year.
-  { "2012", "12" },  // Any month in previous year.
-  { "2015", "13" },  // Not a real month.
-  { "2015", "00" },  // Zero is legal in the CC class but is not a valid date.
-};
 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.
 };
@@ skipping 25 matching lines @@
     SCOPED_TRACE(kValidNumbers[i]);
     EXPECT_TRUE(
         IsValidCreditCardNumber(ASCIIToUTF16(kValidNumbers[i])));
   }
   for (size_t i = 0; i < arraysize(kInvalidNumbers); ++i) {
     SCOPED_TRACE(kInvalidNumbers[i]);
     EXPECT_FALSE(IsValidCreditCardNumber(ASCIIToUTF16(kInvalidNumbers[i])));
   }
 }
 
-TEST(AutofillValidation, IsValidCreditCardExpirationDate) {
-  base::Time now;
-  ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));
-
-  for (size_t i = 0; i < arraysize(kValidCreditCardExpirationDate); ++i) {
-    const ExpirationDate& data = kValidCreditCardExpirationDate[i];
-    SCOPED_TRACE(data.year);
-    SCOPED_TRACE(data.month);
-    EXPECT_TRUE(IsValidCreditCardExpirationDate(ASCIIToUTF16(data.year),
-                                                ASCIIToUTF16(data.month),
-                                                now));
-  }
-  for (size_t i = 0; i < arraysize(kInvalidCreditCardExpirationDate); ++i) {
-    const ExpirationDate& data = kInvalidCreditCardExpirationDate[i];
-    SCOPED_TRACE(data.year);
-    SCOPED_TRACE(data.month);
-    EXPECT_TRUE(!IsValidCreditCardExpirationDate(ASCIIToUTF16(data.year),
-                                                 ASCIIToUTF16(data.month),
-                                                 now));
-  }
-}
-
 TEST(AutofillValidation, IsValidCreditCardIntExpirationDate) {
   base::Time now;
   ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));
 
   for (size_t i = 0; i < arraysize(kValidCreditCardIntExpirationDate); ++i) {
     const IntExpirationDate& data = kValidCreditCardIntExpirationDate[i];
     SCOPED_TRACE(data.year);
     SCOPED_TRACE(data.month);
     EXPECT_TRUE(IsValidCreditCardExpirationDate(data.year, data.month, now));
   }
@@ skipping 37 matching lines @@
       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