PaymentRequest: Sync up PaymentAddress with the payment request spec.

third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp

 // Copyright 2016 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 "modules/payments/PaymentsValidators.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/text/WTFString.h"
 #include <ostream> // NOLINT
 
@@ skipping 79 matching lines @@
         TestCase("-10.", false),
         TestCase("-.99", false),
         TestCase("10-", false),
         TestCase("1-0", false),
         TestCase("1.0.0", false),
         TestCase("1/3", false)));
 
 class PaymentsRegionValidatorTest : public testing::TestWithParam<TestCase> {
 };
 
-TEST_P(PaymentsRegionValidatorTest, IsValidRegionCodeFormat)
+TEST_P(PaymentsRegionValidatorTest, IsValidCountryCodeFormat)
 {
     String errorMessage;
-    EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidRegionCodeFormat(GetParam().input, &errorMessage)) << errorMessage;
+    EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidCountryCodeFormat(GetParam().input, &errorMessage)) << errorMessage;
     EXPECT_EQ(GetParam().expectedValid, errorMessage.isEmpty()) << errorMessage;
 
-    EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidRegionCodeFormat(GetParam().input, nullptr));
+    EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidCountryCodeFormat(GetParam().input, nullptr));
 }
 
-INSTANTIATE_TEST_CASE_P(RegionCodes,
+INSTANTIATE_TEST_CASE_P(CountryCodes,
     PaymentsRegionValidatorTest,
     testing::Values(
         TestCase("US", true),
-        // Invalid region code formats
+        // Invalid country code formats
         TestCase("U1", false),
         TestCase("U", false),
         TestCase("us", false),
         TestCase("USA", false),
         TestCase("", false)));
 
 class PaymentsLanguageValidatorTest : public testing::TestWithParam<TestCase> {
 };
 
 TEST_P(PaymentsLanguageValidatorTest, IsValidLanguageCodeFormat)
@@ skipping 37 matching lines @@
         TestCase("Latn", true),
         // Invalid script code formats
         TestCase("Lat1", false),
         TestCase("1lat", false),
         TestCase("Latin", false),
         TestCase("Lat", false),
         TestCase("latn", false),
         TestCase("LATN", false)));
 
 struct ShippingAddressTestCase {
-    ShippingAddressTestCase(const char* regionCode, const char* languageCode, const char* scriptCode, bool expectedValid)
-        : regionCode(regionCode)
+    ShippingAddressTestCase(const char* countryCode, const char* languageCode, const char* scriptCode, bool expectedValid)
+        : countryCode(countryCode)
         , languageCode(languageCode)
         , scriptCode(scriptCode)
         , expectedValid(expectedValid)
     {
     }
     ~ShippingAddressTestCase() {}
 
-    const char* regionCode;
+    const char* countryCode;
     const char* languageCode;
     const char* scriptCode;
     bool expectedValid;
 };
 
 class PaymentsShippingAddressValidatorTest : public testing::TestWithParam<ShippingAddressTestCase> {
 };
 
 TEST_P(PaymentsShippingAddressValidatorTest, IsValidShippingAddress)
 {
     mojom::blink::PaymentAddressPtr address = mojom::blink::PaymentAddress::New();
-    address->region_code = GetParam().regionCode;
+    address->country = GetParam().countryCode;
     address->language_code = GetParam().languageCode;
     address->script_code = GetParam().scriptCode;
 
     String errorMessage;
     EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidShippingAddress(address, &errorMessage)) << errorMessage;
     EXPECT_EQ(GetParam().expectedValid, errorMessage.isEmpty()) << errorMessage;
 
     EXPECT_EQ(GetParam().expectedValid, PaymentsValidators::isValidShippingAddress(address, nullptr));
 }
 
 INSTANTIATE_TEST_CASE_P(ShippingAddresses,
     PaymentsShippingAddressValidatorTest,
     testing::Values(
         ShippingAddressTestCase("US", "en", "Latn", true),
         ShippingAddressTestCase("US", "en", "", true),
         ShippingAddressTestCase("US", "", "", true),
         // Invalid shipping addresses
         ShippingAddressTestCase("", "", "", false),
-        ShippingAddressTestCase("InvalidRegionCode", "", "", false),
+        ShippingAddressTestCase("InvalidCountryCode", "", "", false),
         ShippingAddressTestCase("US", "InvalidLanguageCode", "", false),
         ShippingAddressTestCase("US", "en", "InvalidScriptCode", false),
         ShippingAddressTestCase("US", "", "Latn", false)));
 
 } // namespace
 } // namespace blink