Index: third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp |
index 2f248f939c57efc9f0b69d55d25d6a89f065d95e..8402231008bd3c6e154b09ebe4aba1bee09eb243 100644 |
--- a/third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp |
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp |
@@ -112,8 +112,7 @@ std::ostream& operator<<(std::ostream& out, DetailsTestCase test_case) { |
switch (test_case.mod_type_) { |
case kPaymentTestOverwriteValue: |
- out << "is overwritten by "; |
- out << test_case.value_to_use_; |
+ out << "is overwritten by \"" << test_case.value_to_use_ << "\""; |
break; |
case kPaymentTestRemoveKey: |
out << "is removed"; |
@@ -144,106 +143,6 @@ TEST_P(PaymentRequestDetailsTest, ValidatesDetails) { |
} |
INSTANTIATE_TEST_CASE_P( |
- MissingData, |
- PaymentRequestDetailsTest, |
- testing::Values(DetailsTestCase(kPaymentTestDetailTotal, |
- kPaymentTestDataAmount, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailTotal, |
- kPaymentTestDataValue, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailTotal, |
- kPaymentTestDataLabel, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailItem, |
- kPaymentTestDataAmount, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailItem, |
- kPaymentTestDataValue, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailItem, |
- kPaymentTestDataLabel, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailShippingOption, |
- kPaymentTestDataAmount, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailShippingOption, |
- kPaymentTestDataValue, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailShippingOption, |
- kPaymentTestDataId, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailShippingOption, |
- kPaymentTestDataLabel, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierTotal, |
- kPaymentTestDataAmount, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierTotal, |
- kPaymentTestDataValue, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierTotal, |
- kPaymentTestDataLabel, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierItem, |
- kPaymentTestDataAmount, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierItem, |
- kPaymentTestDataValue, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError), |
- DetailsTestCase(kPaymentTestDetailModifierItem, |
- kPaymentTestDataLabel, |
- kPaymentTestRemoveKey, |
- "", |
- true, |
- kV8TypeError))); |
- |
-INSTANTIATE_TEST_CASE_P( |
EmptyData, |
PaymentRequestDetailsTest, |
testing::Values(DetailsTestCase(kPaymentTestDetailTotal, |
@@ -256,8 +155,7 @@ INSTANTIATE_TEST_CASE_P( |
kPaymentTestDataLabel, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError), |
+ false), |
DetailsTestCase(kPaymentTestDetailItem, |
kPaymentTestDataValue, |
kPaymentTestOverwriteValue, |
@@ -268,8 +166,7 @@ INSTANTIATE_TEST_CASE_P( |
kPaymentTestDataLabel, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError), |
+ false), |
DetailsTestCase(kPaymentTestDetailShippingOption, |
kPaymentTestDataValue, |
kPaymentTestOverwriteValue, |
@@ -280,14 +177,12 @@ INSTANTIATE_TEST_CASE_P( |
kPaymentTestDataId, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError), |
+ false), |
DetailsTestCase(kPaymentTestDetailShippingOption, |
kPaymentTestDataLabel, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError), |
+ false), |
DetailsTestCase(kPaymentTestDetailModifierTotal, |
kPaymentTestDataValue, |
kPaymentTestOverwriteValue, |
@@ -298,8 +193,7 @@ INSTANTIATE_TEST_CASE_P( |
kPaymentTestDataLabel, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError), |
+ false), |
DetailsTestCase(kPaymentTestDetailModifierItem, |
kPaymentTestDataValue, |
kPaymentTestOverwriteValue, |
@@ -310,8 +204,7 @@ INSTANTIATE_TEST_CASE_P( |
kPaymentTestDataLabel, |
kPaymentTestOverwriteValue, |
"", |
- true, |
- kV8TypeError))); |
+ false))); |
INSTANTIATE_TEST_CASE_P( |
ValidCurrencyCodeFormat, |