| Index: components/autofill/core/browser/validation_unittest.cc
|
| diff --git a/components/autofill/core/browser/validation_unittest.cc b/components/autofill/core/browser/validation_unittest.cc
|
| index 9f8840dcdadbb425a21947eb1bb85b481797e19b..c7b880b0a17ad7e9315f9347dac3ab3d71485d50 100644
|
| --- a/components/autofill/core/browser/validation_unittest.cc
|
| +++ b/components/autofill/core/browser/validation_unittest.cc
|
| @@ -92,14 +92,13 @@
|
| } // namespace
|
|
|
| TEST(AutofillValidation, IsValidCreditCardNumber) {
|
| - for (size_t i = 0; i < arraysize(kValidNumbers); ++i) {
|
| - SCOPED_TRACE(kValidNumbers[i]);
|
| - EXPECT_TRUE(
|
| - IsValidCreditCardNumber(ASCIIToUTF16(kValidNumbers[i])));
|
| + for (const char* valid_number : kValidNumbers) {
|
| + SCOPED_TRACE(valid_number);
|
| + EXPECT_TRUE(IsValidCreditCardNumber(ASCIIToUTF16(valid_number)));
|
| }
|
| - for (size_t i = 0; i < arraysize(kInvalidNumbers); ++i) {
|
| - SCOPED_TRACE(kInvalidNumbers[i]);
|
| - EXPECT_FALSE(IsValidCreditCardNumber(ASCIIToUTF16(kInvalidNumbers[i])));
|
| + for (const char* invalid_number : kInvalidNumbers) {
|
| + SCOPED_TRACE(invalid_number);
|
| + EXPECT_FALSE(IsValidCreditCardNumber(ASCIIToUTF16(invalid_number)));
|
| }
|
| }
|
|
|
| @@ -107,40 +106,36 @@
|
| base::Time now;
|
| ASSERT_TRUE(base::Time::FromString(kCurrentDate, &now));
|
|
|
| - for (size_t i = 0; i < arraysize(kValidCreditCardIntExpirationDate); ++i) {
|
| - const IntExpirationDate& data = kValidCreditCardIntExpirationDate[i];
|
| + for (const IntExpirationDate& data : kValidCreditCardIntExpirationDate) {
|
| SCOPED_TRACE(data.year);
|
| SCOPED_TRACE(data.month);
|
| EXPECT_TRUE(IsValidCreditCardExpirationDate(data.year, data.month, now));
|
| }
|
| - for (size_t i = 0; i < arraysize(kInvalidCreditCardIntExpirationDate); ++i) {
|
| - const IntExpirationDate& data = kInvalidCreditCardIntExpirationDate[i];
|
| + 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 (size_t i = 0; i < arraysize(kValidCreditCardSecurityCode); ++i) {
|
| - SCOPED_TRACE(kValidCreditCardSecurityCode[i]);
|
| - EXPECT_TRUE(IsValidCreditCardSecurityCode(
|
| - ASCIIToUTF16(kValidCreditCardSecurityCode[i])));
|
| + for (const char* valid_code : kValidCreditCardSecurityCode) {
|
| + SCOPED_TRACE(valid_code);
|
| + EXPECT_TRUE(IsValidCreditCardSecurityCode(ASCIIToUTF16(valid_code)));
|
| }
|
| - for (size_t i = 0; i < arraysize(kInvalidCreditCardSecurityCode); ++i) {
|
| - SCOPED_TRACE(kInvalidCreditCardSecurityCode[i]);
|
| - EXPECT_FALSE(IsValidCreditCardSecurityCode(
|
| - ASCIIToUTF16(kInvalidCreditCardSecurityCode[i])));
|
| + for (const char* invalid_code : kInvalidCreditCardSecurityCode) {
|
| + SCOPED_TRACE(invalid_code);
|
| + EXPECT_FALSE(IsValidCreditCardSecurityCode(ASCIIToUTF16(invalid_code)));
|
| }
|
| }
|
|
|
| TEST(AutofillValidation, IsValidEmailAddress) {
|
| - for (size_t i = 0; i < arraysize(kValidEmailAddress); ++i) {
|
| - SCOPED_TRACE(kValidEmailAddress[i]);
|
| - EXPECT_TRUE(IsValidEmailAddress(ASCIIToUTF16(kValidEmailAddress[i])));
|
| + for (const char* valid_email : kValidEmailAddress) {
|
| + SCOPED_TRACE(valid_email);
|
| + EXPECT_TRUE(IsValidEmailAddress(ASCIIToUTF16(valid_email)));
|
| }
|
| - for (size_t i = 0; i < arraysize(kInvalidEmailAddress); ++i) {
|
| - SCOPED_TRACE(kInvalidEmailAddress[i]);
|
| - EXPECT_FALSE(IsValidEmailAddress(ASCIIToUTF16(kInvalidEmailAddress[i])));
|
| + for (const char* invalid_email : kInvalidEmailAddress) {
|
| + SCOPED_TRACE(invalid_email);
|
| + EXPECT_FALSE(IsValidEmailAddress(ASCIIToUTF16(invalid_email)));
|
| }
|
| }
|
|
|
|
|