Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1054)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp ('k') | third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp
index 6b59fada296e26775b02620a3aa2a86235c80163..6a7e11045a2ae6af999560c7862a4df39afc70f5 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentsValidatorsTest.cpp
@@ -24,7 +24,7 @@ struct CurrencyCodeTestCase {
};
class PaymentsCurrencyValidatorTest
- : public testing::TestWithParam<CurrencyCodeTestCase> {};
+ : public ::testing::TestWithParam<CurrencyCodeTestCase> {};
const char* LongString2048() {
static char long_string[2049];
@@ -59,7 +59,7 @@ TEST_P(PaymentsCurrencyValidatorTest, IsValidCurrencyCodeFormat) {
INSTANTIATE_TEST_CASE_P(
CurrencyCodes,
PaymentsCurrencyValidatorTest,
- testing::Values(
+ ::testing::Values(
// The most common identifiers are three-letter alphabetic codes as
// defined by [ISO4217] (for example, "USD" for US Dollars).
// |system| is a URL that indicates the currency system that the
@@ -102,7 +102,8 @@ std::ostream& operator<<(std::ostream& out, const TestCase& test_case) {
return out;
}
-class PaymentsAmountValidatorTest : public testing::TestWithParam<TestCase> {};
+class PaymentsAmountValidatorTest : public ::testing::TestWithParam<TestCase> {
+};
TEST_P(PaymentsAmountValidatorTest, IsValidAmountFormat) {
String error_message;
@@ -121,34 +122,35 @@ TEST_P(PaymentsAmountValidatorTest, IsValidAmountFormat) {
INSTANTIATE_TEST_CASE_P(
Amounts,
PaymentsAmountValidatorTest,
- testing::Values(TestCase("0", true),
- TestCase("-0", true),
- TestCase("1", true),
- TestCase("10", true),
- TestCase("-3", true),
- TestCase("10.99", true),
- TestCase("-3.00", true),
- TestCase("01234567890123456789.0123456789", true),
- TestCase("01234567890123456789012345678.9", true),
- TestCase("012345678901234567890123456789", true),
- TestCase("-01234567890123456789.0123456789", true),
- TestCase("-01234567890123456789012345678.9", true),
- TestCase("-012345678901234567890123456789", true),
- // Invalid amount formats
- TestCase("", false),
- TestCase("-", false),
- TestCase("notdigits", false),
- TestCase("ALSONOTDIGITS", false),
- TestCase("10.", false),
- TestCase(".99", false),
- 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> {};
+ ::testing::Values(TestCase("0", true),
+ TestCase("-0", true),
+ TestCase("1", true),
+ TestCase("10", true),
+ TestCase("-3", true),
+ TestCase("10.99", true),
+ TestCase("-3.00", true),
+ TestCase("01234567890123456789.0123456789", true),
+ TestCase("01234567890123456789012345678.9", true),
+ TestCase("012345678901234567890123456789", true),
+ TestCase("-01234567890123456789.0123456789", true),
+ TestCase("-01234567890123456789012345678.9", true),
+ TestCase("-012345678901234567890123456789", true),
+ // Invalid amount formats
+ TestCase("", false),
+ TestCase("-", false),
+ TestCase("notdigits", false),
+ TestCase("ALSONOTDIGITS", false),
+ TestCase("10.", false),
+ TestCase(".99", false),
+ 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, IsValidCountryCodeFormat) {
String error_message;
@@ -166,16 +168,16 @@ TEST_P(PaymentsRegionValidatorTest, IsValidCountryCodeFormat) {
INSTANTIATE_TEST_CASE_P(CountryCodes,
PaymentsRegionValidatorTest,
- testing::Values(TestCase("US", true),
- // Invalid country code formats
- TestCase("U1", false),
- TestCase("U", false),
- TestCase("us", false),
- TestCase("USA", false),
- TestCase("", false)));
-
-class PaymentsLanguageValidatorTest : public testing::TestWithParam<TestCase> {
-};
+ ::testing::Values(TestCase("US", true),
+ // 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) {
String error_message;
@@ -193,17 +195,18 @@ TEST_P(PaymentsLanguageValidatorTest, IsValidLanguageCodeFormat) {
INSTANTIATE_TEST_CASE_P(LanguageCodes,
PaymentsLanguageValidatorTest,
- testing::Values(TestCase("", true),
- TestCase("en", true),
- TestCase("eng", true),
- // Invalid language code formats
- TestCase("e1", false),
- TestCase("en1", false),
- TestCase("e", false),
- TestCase("engl", false),
- TestCase("EN", false)));
-
-class PaymentsScriptValidatorTest : public testing::TestWithParam<TestCase> {};
+ ::testing::Values(TestCase("", true),
+ TestCase("en", true),
+ TestCase("eng", true),
+ // Invalid language code formats
+ TestCase("e1", false),
+ TestCase("en1", false),
+ TestCase("e", false),
+ TestCase("engl", false),
+ TestCase("EN", false)));
+
+class PaymentsScriptValidatorTest : public ::testing::TestWithParam<TestCase> {
+};
TEST_P(PaymentsScriptValidatorTest, IsValidScriptCodeFormat) {
String error_message;
@@ -221,15 +224,15 @@ TEST_P(PaymentsScriptValidatorTest, IsValidScriptCodeFormat) {
INSTANTIATE_TEST_CASE_P(ScriptCodes,
PaymentsScriptValidatorTest,
- testing::Values(TestCase("", true),
- 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)));
+ ::testing::Values(TestCase("", true),
+ 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* country_code,
@@ -249,7 +252,7 @@ struct ShippingAddressTestCase {
};
class PaymentsShippingAddressValidatorTest
- : public testing::TestWithParam<ShippingAddressTestCase> {};
+ : public ::testing::TestWithParam<ShippingAddressTestCase> {};
TEST_P(PaymentsShippingAddressValidatorTest, IsValidShippingAddress) {
payments::mojom::blink::PaymentAddressPtr address =
@@ -272,7 +275,7 @@ TEST_P(PaymentsShippingAddressValidatorTest, IsValidShippingAddress) {
INSTANTIATE_TEST_CASE_P(
ShippingAddresses,
PaymentsShippingAddressValidatorTest,
- testing::Values(
+ ::testing::Values(
ShippingAddressTestCase("US", "en", "Latn", true),
ShippingAddressTestCase("US", "en", "", true),
ShippingAddressTestCase("US", "", "", true),
« no previous file with comments | « third_party/WebKit/Source/modules/payments/PaymentTestHelper.cpp ('k') | third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698