| Index: ios/web/payments/payment_request_unittest.cc
|
| diff --git a/ios/web/payments/payment_request_unittest.cc b/ios/web/payments/payment_request_unittest.cc
|
| index d4f1a0f764ffd292411e24668c76b8f71ffc76f2..ea22212e5e5ef54b88f704e17799507f7cf80e52 100644
|
| --- a/ios/web/payments/payment_request_unittest.cc
|
| +++ b/ios/web/payments/payment_request_unittest.cc
|
| @@ -8,6 +8,8 @@
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| +#include "components/payments/core/basic_card_response.h"
|
| +#include "components/payments/core/payment_address.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace web {
|
| @@ -357,104 +359,6 @@ TEST(PaymentRequestTest, PopulatedResponseDictionary) {
|
|
|
| // Value equality tests.
|
|
|
| -// Tests that two addresses are not equal if their property values differ or
|
| -// one is missing a value present in the other, and equal otherwise.
|
| -TEST(PaymentRequestTest, PaymentAddressEquality) {
|
| - PaymentAddress address1;
|
| - PaymentAddress address2;
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.country = base::ASCIIToUTF16("Madagascar");
|
| - EXPECT_NE(address1, address2);
|
| - address2.country = base::ASCIIToUTF16("Monaco");
|
| - EXPECT_NE(address1, address2);
|
| - address2.country = base::ASCIIToUTF16("Madagascar");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - std::vector<base::string16> address_line1;
|
| - address_line1.push_back(base::ASCIIToUTF16("123 Main St."));
|
| - address_line1.push_back(base::ASCIIToUTF16("Apartment B"));
|
| - address1.address_line = address_line1;
|
| - EXPECT_NE(address1, address2);
|
| - std::vector<base::string16> address_line2;
|
| - address_line2.push_back(base::ASCIIToUTF16("123 Main St."));
|
| - address_line2.push_back(base::ASCIIToUTF16("Apartment C"));
|
| - address2.address_line = address_line2;
|
| - EXPECT_NE(address1, address2);
|
| - address2.address_line = address_line1;
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.region = base::ASCIIToUTF16("Quebec");
|
| - EXPECT_NE(address1, address2);
|
| - address2.region = base::ASCIIToUTF16("Newfoundland and Labrador");
|
| - EXPECT_NE(address1, address2);
|
| - address2.region = base::ASCIIToUTF16("Quebec");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.city = base::ASCIIToUTF16("Timbuktu");
|
| - EXPECT_NE(address1, address2);
|
| - address2.city = base::ASCIIToUTF16("Timbuk 3");
|
| - EXPECT_NE(address1, address2);
|
| - address2.city = base::ASCIIToUTF16("Timbuktu");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.dependent_locality = base::ASCIIToUTF16("Manhattan");
|
| - EXPECT_NE(address1, address2);
|
| - address2.dependent_locality = base::ASCIIToUTF16("Queens");
|
| - EXPECT_NE(address1, address2);
|
| - address2.dependent_locality = base::ASCIIToUTF16("Manhattan");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.postal_code = base::ASCIIToUTF16("90210");
|
| - EXPECT_NE(address1, address2);
|
| - address2.postal_code = base::ASCIIToUTF16("89049");
|
| - EXPECT_NE(address1, address2);
|
| - address2.postal_code = base::ASCIIToUTF16("90210");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.sorting_code = base::ASCIIToUTF16("14390");
|
| - EXPECT_NE(address1, address2);
|
| - address2.sorting_code = base::ASCIIToUTF16("09341");
|
| - EXPECT_NE(address1, address2);
|
| - address2.sorting_code = base::ASCIIToUTF16("14390");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.language_code = base::ASCIIToUTF16("fr");
|
| - EXPECT_NE(address1, address2);
|
| - address2.language_code = base::ASCIIToUTF16("zh-HK");
|
| - EXPECT_NE(address1, address2);
|
| - address2.language_code = base::ASCIIToUTF16("fr");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.organization = base::ASCIIToUTF16("The Willy Wonka Candy Company");
|
| - EXPECT_NE(address1, address2);
|
| - address2.organization = base::ASCIIToUTF16("Sears");
|
| - EXPECT_NE(address1, address2);
|
| - address2.organization = base::ASCIIToUTF16("The Willy Wonka Candy Company");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.recipient = base::ASCIIToUTF16("Veruca Salt");
|
| - EXPECT_NE(address1, address2);
|
| - address2.recipient = base::ASCIIToUTF16("Veronica Mars");
|
| - EXPECT_NE(address1, address2);
|
| - address2.recipient = base::ASCIIToUTF16("Veruca Salt");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.care_of = base::ASCIIToUTF16("Jarvis");
|
| - EXPECT_NE(address1, address2);
|
| - address2.care_of = base::ASCIIToUTF16("Tony");
|
| - EXPECT_NE(address1, address2);
|
| - address2.care_of = base::ASCIIToUTF16("Jarvis");
|
| - EXPECT_EQ(address1, address2);
|
| -
|
| - address1.phone = base::ASCIIToUTF16("888-867-5309");
|
| - EXPECT_NE(address1, address2);
|
| - address2.phone = base::ASCIIToUTF16("800-984-3672");
|
| - EXPECT_NE(address1, address2);
|
| - address2.phone = base::ASCIIToUTF16("888-867-5309");
|
| - EXPECT_EQ(address1, address2);
|
| -}
|
| -
|
| // Tests that two method data objects are not equal if their property values
|
| // differ or one is missing a value present in the other, and equal otherwise.
|
| TEST(PaymentRequestTest, PaymentMethodDataEquality) {
|
| @@ -721,11 +625,11 @@ TEST(PaymentRequestTest, PaymentRequestEquality) {
|
| PaymentRequest request2;
|
| EXPECT_EQ(request1, request2);
|
|
|
| - PaymentAddress address1;
|
| + payments::PaymentAddress address1;
|
| address1.recipient = base::ASCIIToUTF16("Jessica Jones");
|
| request1.shipping_address = address1;
|
| EXPECT_NE(request1, request2);
|
| - PaymentAddress address2;
|
| + payments::PaymentAddress address2;
|
| address2.recipient = base::ASCIIToUTF16("Luke Cage");
|
| request2.shipping_address = address2;
|
| EXPECT_NE(request1, request2);
|
| @@ -770,62 +674,6 @@ TEST(PaymentRequestTest, PaymentRequestEquality) {
|
| EXPECT_EQ(request1, request2);
|
| }
|
|
|
| -// Tests that two credit card response objects are not equal if their property
|
| -// values differ or one is missing a value present in the other, and equal
|
| -// otherwise. Doesn't test all properties of child objects, relying instead on
|
| -// their respective tests.
|
| -TEST(PaymentRequestTest, BasicCardResponseEquality) {
|
| - BasicCardResponse card_response1;
|
| - BasicCardResponse card_response2;
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - card_response1.cardholder_name = base::ASCIIToUTF16("Shadow Moon");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.cardholder_name = base::ASCIIToUTF16("Mad Sweeney");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.cardholder_name = base::ASCIIToUTF16("Shadow Moon");
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - card_response1.card_number = base::ASCIIToUTF16("4111111111111111");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.card_number = base::ASCIIToUTF16("1111");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.card_number = base::ASCIIToUTF16("4111111111111111");
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - card_response1.expiry_month = base::ASCIIToUTF16("01");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_month = base::ASCIIToUTF16("11");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_month = base::ASCIIToUTF16("01");
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - card_response1.expiry_year = base::ASCIIToUTF16("27");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_year = base::ASCIIToUTF16("72");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_year = base::ASCIIToUTF16("27");
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - card_response1.expiry_year = base::ASCIIToUTF16("123");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_year = base::ASCIIToUTF16("999");
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.expiry_year = base::ASCIIToUTF16("123");
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -
|
| - PaymentAddress billing_address1;
|
| - billing_address1.postal_code = base::ASCIIToUTF16("90210");
|
| - PaymentAddress billing_address2;
|
| - billing_address2.postal_code = base::ASCIIToUTF16("01209");
|
| - card_response1.billing_address = billing_address1;
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.billing_address = billing_address2;
|
| - EXPECT_NE(card_response1, card_response2);
|
| - card_response2.billing_address = billing_address1;
|
| - EXPECT_EQ(card_response1, card_response2);
|
| -}
|
| -
|
| // Tests that two payment response objects are not equal if their property
|
| // values differ or one is missing a value present in the other, and equal
|
| // otherwise. Doesn't test all properties of child objects, relying instead on
|
| @@ -842,9 +690,9 @@ TEST(PaymentRequestTest, PaymentResponseEquality) {
|
| response2.method_name = base::ASCIIToUTF16("Visa");
|
| EXPECT_EQ(response1, response2);
|
|
|
| - BasicCardResponse card_response1;
|
| + payments::BasicCardResponse card_response1;
|
| card_response1.card_number = base::ASCIIToUTF16("1234");
|
| - BasicCardResponse card_response2;
|
| + payments::BasicCardResponse card_response2;
|
| card_response2.card_number = base::ASCIIToUTF16("8888");
|
| response1.details = card_response1;
|
| EXPECT_NE(response1, response2);
|
|
|