| Index: components/autofill/core/browser/payments/full_card_request_unittest.cc
|
| diff --git a/components/autofill/core/browser/payments/full_card_request_unittest.cc b/components/autofill/core/browser/payments/full_card_request_unittest.cc
|
| index 8f93cd765f8b1578e6895842459338e0c7b7914c..77b519ef10ba28fc733f352c9d912c9df51e7bdf 100644
|
| --- a/components/autofill/core/browser/payments/full_card_request_unittest.cc
|
| +++ b/components/autofill/core/browser/payments/full_card_request_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "components/autofill/core/browser/payments/full_card_request.h"
|
|
|
| #include "base/command_line.h"
|
| +#include "base/guid.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -156,8 +157,11 @@ TEST_F(FullCardRequestTest, GetFullCardPanAndCvcForLocalCard) {
|
| EXPECT_CALL(*client(), ShowUnmaskPrompt(_, _, _));
|
| EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
|
|
|
| - request()->GetFullCard(CreditCard(base::ASCIIToUTF16("4111"), 12, 2050),
|
| - AutofillClient::UNMASK_FOR_AUTOFILL,
|
| + CreditCard card(base::GenerateGUID(), std::string());
|
| + card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + card.SetExpirationMonth(12);
|
| + card.SetExpirationYear(2050);
|
| + request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| CardUnmaskDelegate::UnmaskResponse response;
|
| response.cvc = base::ASCIIToUTF16("123");
|
| @@ -174,8 +178,10 @@ TEST_F(FullCardRequestTest, GetFullCardPanAndCvcForFullServerCard) {
|
| EXPECT_CALL(*client(), ShowUnmaskPrompt(_, _, _));
|
| EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
|
|
|
| - CreditCard full_server_card(base::ASCIIToUTF16("4111"), 12, 2050);
|
| - full_server_card.set_record_type(CreditCard::FULL_SERVER_CARD);
|
| + CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "server_id");
|
| + full_server_card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + full_server_card.SetExpirationMonth(12);
|
| + full_server_card.SetExpirationYear(2050);
|
| request()->GetFullCard(full_server_card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| CardUnmaskDelegate::UnmaskResponse response;
|
| @@ -196,8 +202,10 @@ TEST_F(FullCardRequestTest,
|
| EXPECT_CALL(*personal_data(), UpdateServerCreditCard(_)).Times(0);
|
| EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
|
|
|
| - CreditCard full_server_card(base::ASCIIToUTF16("4111"), 12, 2050);
|
| - full_server_card.set_record_type(CreditCard::FULL_SERVER_CARD);
|
| + CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "server_id");
|
| + full_server_card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + full_server_card.SetExpirationMonth(12);
|
| + full_server_card.SetExpirationYear(2050);
|
| full_server_card.SetServerStatus(CreditCard::EXPIRED);
|
| request()->GetFullCard(full_server_card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| @@ -223,8 +231,10 @@ TEST_F(FullCardRequestTest, GetFullCardPanAndCvcForExpiredFullServerCard) {
|
|
|
| base::Time::Exploded today;
|
| base::Time::Now().LocalExplode(&today);
|
| - CreditCard full_server_card(base::ASCIIToUTF16("4111"), 12, today.year - 1);
|
| - full_server_card.set_record_type(CreditCard::FULL_SERVER_CARD);
|
| + CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "server_id");
|
| + full_server_card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + full_server_card.SetExpirationMonth(12);
|
| + full_server_card.SetExpirationYear(today.year - 1);
|
| full_server_card.SetServerStatus(CreditCard::OK);
|
| request()->GetFullCard(full_server_card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| @@ -262,16 +272,18 @@ TEST_F(FullCardRequestTest, SecondRequestOkAfterFirstFinished) {
|
| EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS))
|
| .Times(2);
|
|
|
| - request()->GetFullCard(CreditCard(base::ASCIIToUTF16("4111"), 12, 2050),
|
| - AutofillClient::UNMASK_FOR_AUTOFILL,
|
| + CreditCard card(base::GenerateGUID(), std::string());
|
| + card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + card.SetExpirationMonth(12);
|
| + card.SetExpirationYear(2050);
|
| + request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| CardUnmaskDelegate::UnmaskResponse response;
|
| response.cvc = base::ASCIIToUTF16("123");
|
| ui_delegate()->OnUnmaskResponse(response);
|
| ui_delegate()->OnUnmaskPromptClosed();
|
|
|
| - request()->GetFullCard(CreditCard(base::ASCIIToUTF16("4111"), 12, 2050),
|
| - AutofillClient::UNMASK_FOR_AUTOFILL,
|
| + request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| ui_delegate()->OnUnmaskResponse(response);
|
| ui_delegate()->OnUnmaskPromptClosed();
|
| @@ -400,8 +412,10 @@ TEST_F(FullCardRequestTest, UpdateExpDateForFullServerCard) {
|
| EXPECT_CALL(*client(), ShowUnmaskPrompt(_, _, _));
|
| EXPECT_CALL(*client(), OnUnmaskVerificationResult(AutofillClient::SUCCESS));
|
|
|
| - CreditCard full_server_card(base::ASCIIToUTF16("4111"), 10, 2000);
|
| - full_server_card.set_record_type(CreditCard::FULL_SERVER_CARD);
|
| + CreditCard full_server_card(CreditCard::FULL_SERVER_CARD, "server_id");
|
| + full_server_card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + full_server_card.SetExpirationMonth(10);
|
| + full_server_card.SetExpirationYear(2000);
|
| request()->GetFullCard(full_server_card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
| CardUnmaskDelegate::UnmaskResponse response;
|
| @@ -426,9 +440,12 @@ TEST_F(FullCardRequestTest, UpdateExpDateForLocalCard) {
|
|
|
| base::Time::Exploded today;
|
| base::Time::Now().LocalExplode(&today);
|
| - request()->GetFullCard(
|
| - CreditCard(base::ASCIIToUTF16("4111"), 12, today.year - 1),
|
| - AutofillClient::UNMASK_FOR_AUTOFILL, delegate()->AsWeakPtr());
|
| + CreditCard card(base::GenerateGUID(), std::string());
|
| + card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + card.SetExpirationMonth(12);
|
| + card.SetExpirationYear(today.year - 1);
|
| + request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| + delegate()->AsWeakPtr());
|
| CardUnmaskDelegate::UnmaskResponse response;
|
| response.cvc = base::ASCIIToUTF16("123");
|
| response.exp_month = base::ASCIIToUTF16("12");
|
| @@ -525,8 +542,11 @@ TEST_F(FullCardRequestTest, IsGettingFullCardForLocalCard) {
|
|
|
| EXPECT_FALSE(request()->IsGettingFullCard());
|
|
|
| - request()->GetFullCard(CreditCard(base::ASCIIToUTF16("4111"), 12, 2050),
|
| - AutofillClient::UNMASK_FOR_AUTOFILL,
|
| + CreditCard card(base::GenerateGUID(), std::string());
|
| + card.SetNumber(base::ASCIIToUTF16("4111"));
|
| + card.SetExpirationMonth(12);
|
| + card.SetExpirationYear(2050);
|
| + request()->GetFullCard(card, AutofillClient::UNMASK_FOR_AUTOFILL,
|
| delegate()->AsWeakPtr());
|
|
|
| EXPECT_TRUE(request()->IsGettingFullCard());
|
|
|