Index: third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp |
index 98bdf7d75c8b91f90461d12d93d977b7938c2436..2a31b40dbf93c1bc251fdbdd1cf41fa826d9e452 100644 |
--- a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp |
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp |
@@ -10,8 +10,8 @@ |
#include "core/dom/ExceptionCode.h" |
#include "core/testing/DummyPageHolder.h" |
#include "modules/payments/CurrencyAmount.h" |
-#include "modules/payments/PaymentDetailsTestHelper.h" |
#include "modules/payments/PaymentItem.h" |
+#include "modules/payments/PaymentTestHelper.h" |
#include "modules/payments/ShippingOption.h" |
#include "platform/heap/HeapAllocator.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -47,7 +47,7 @@ private: |
TEST_F(PaymentRequestTest, NoExceptionWithValidData) |
{ |
- PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
} |
@@ -56,7 +56,7 @@ TEST_F(PaymentRequestTest, SecureContextRequired) |
{ |
setSecurityOrigin("http://www.example.com"); |
- PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_TRUE(getExceptionState().hadException()); |
EXPECT_EQ(SecurityError, getExceptionState().code()); |
@@ -64,7 +64,7 @@ TEST_F(PaymentRequestTest, SecureContextRequired) |
TEST_F(PaymentRequestTest, SupportedMethodListRequired) |
{ |
- PaymentRequest::create(getScriptState(), Vector<String>(), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest::create(getScriptState(), HeapVector<PaymentMethodData>(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_TRUE(getExceptionState().hadException()); |
EXPECT_EQ(V8TypeError, getExceptionState().code()); |
@@ -72,7 +72,7 @@ TEST_F(PaymentRequestTest, SupportedMethodListRequired) |
TEST_F(PaymentRequestTest, ItemListRequired) |
{ |
- PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), PaymentDetails(), getExceptionState()); |
+ PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), PaymentDetails(), getExceptionState()); |
EXPECT_TRUE(getExceptionState().hadException()); |
EXPECT_EQ(V8TypeError, getExceptionState().code()); |
@@ -83,7 +83,7 @@ TEST_F(PaymentRequestTest, ItemListIsNotEmpty) |
PaymentDetails details; |
details.setDisplayItems(HeapVector<PaymentItem>()); |
- PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState()); |
+ PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, getExceptionState()); |
EXPECT_TRUE(getExceptionState().hadException()); |
EXPECT_EQ(V8TypeError, getExceptionState().code()); |
@@ -94,7 +94,7 @@ TEST_F(PaymentRequestTest, AtLeastOnePaymentDetailsItemRequired) |
PaymentDetails details; |
details.setShippingOptions(HeapVector<ShippingOption>(2, buildShippingOptionForTest())); |
- PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState()); |
+ PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, getExceptionState()); |
EXPECT_TRUE(getExceptionState().hadException()); |
EXPECT_EQ(V8TypeError, getExceptionState().code()); |
@@ -107,7 +107,7 @@ TEST_F(PaymentRequestTest, NullShippingOptionWhenNoOptionsAvailable) |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState()); |
EXPECT_TRUE(request->shippingOption().isNull()); |
} |
@@ -120,7 +120,7 @@ TEST_F(PaymentRequestTest, NullShippingOptionWhenMultipleOptionsAvailable) |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState()); |
EXPECT_TRUE(request->shippingOption().isNull()); |
} |
@@ -133,7 +133,7 @@ TEST_F(PaymentRequestTest, SelectSingleAvailableShippingOptionWhenShippingReques |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState()); |
EXPECT_EQ("standard", request->shippingOption()); |
} |
@@ -144,7 +144,7 @@ TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionByDefault) |
details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest())); |
details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard"))); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, getExceptionState()); |
EXPECT_TRUE(request->shippingOption().isNull()); |
} |
@@ -157,14 +157,14 @@ TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionWhenShippingNo |
PaymentOptions options; |
options.setRequestShipping(false); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState()); |
EXPECT_TRUE(request->shippingOption().isNull()); |
} |
TEST_F(PaymentRequestTest, AbortWithoutShowShouldThrow) |
{ |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->abort(getExceptionState()); |
@@ -206,7 +206,7 @@ private: |
TEST_F(PaymentRequestTest, CanAbortAfterShow) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::noExpectations(getScriptState())); |
@@ -218,7 +218,7 @@ TEST_F(PaymentRequestTest, CanAbortAfterShow) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnInvalidShippingAddress) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState())); |
@@ -229,7 +229,7 @@ TEST_F(PaymentRequestTest, RejectShowPromiseOnInvalidShippingAddress) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnInvalidShippingAddressInResponse) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
mojom::blink::PaymentResponsePtr response = mojom::blink::PaymentResponse::New(); |
response->shipping_address = mojom::blink::PaymentAddress::New(); |
@@ -242,7 +242,7 @@ TEST_F(PaymentRequestTest, RejectShowPromiseOnInvalidShippingAddressInResponse) |
TEST_F(PaymentRequestTest, DontRejectShowPromiseForValidShippingAddress) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
mojom::blink::PaymentAddressPtr shippingAddress = mojom::blink::PaymentAddress::New(); |
shippingAddress->region_code = "US"; |
@@ -257,7 +257,7 @@ TEST_F(PaymentRequestTest, DontRejectShowPromiseForValidShippingAddress) |
TEST_F(PaymentRequestTest, ResolveShowPromiseWithValidShippingAddressInResponse) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
mojom::blink::PaymentResponsePtr response = mojom::blink::PaymentResponse::New(); |
response->shipping_address = mojom::blink::PaymentAddress::New(); |
@@ -273,7 +273,7 @@ TEST_F(PaymentRequestTest, ResolveShowPromiseWithValidShippingAddressInResponse) |
TEST_F(PaymentRequestTest, ResolveShowPromiseWithoutShippingAddressInResponse) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
@@ -284,7 +284,7 @@ TEST_F(PaymentRequestTest, ResolveShowPromiseWithoutShippingAddressInResponse) |
TEST_F(PaymentRequestTest, OnShippingOptionChange) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
@@ -295,7 +295,7 @@ TEST_F(PaymentRequestTest, OnShippingOptionChange) |
TEST_F(PaymentRequestTest, CannotCallShowTwice) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()); |
@@ -305,7 +305,7 @@ TEST_F(PaymentRequestTest, CannotCallShowTwice) |
TEST_F(PaymentRequestTest, CannotCallCompleteTwice) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()); |
static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(mojom::blink::PaymentResponse::New()); |
@@ -317,7 +317,7 @@ TEST_F(PaymentRequestTest, CannotCallCompleteTwice) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnError) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState())); |
@@ -328,7 +328,7 @@ TEST_F(PaymentRequestTest, RejectShowPromiseOnError) |
TEST_F(PaymentRequestTest, RejectCompletePromiseOnError) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()); |
static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(mojom::blink::PaymentResponse::New()); |
@@ -341,7 +341,7 @@ TEST_F(PaymentRequestTest, RejectCompletePromiseOnError) |
TEST_F(PaymentRequestTest, ResolvePromiseOnComplete) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()); |
static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(mojom::blink::PaymentResponse::New()); |
@@ -354,7 +354,7 @@ TEST_F(PaymentRequestTest, ResolvePromiseOnComplete) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnUpdateDetailsFailure) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState())); |
@@ -365,7 +365,7 @@ TEST_F(PaymentRequestTest, RejectShowPromiseOnUpdateDetailsFailure) |
TEST_F(PaymentRequestTest, RejectCompletePromiseOnUpdateDetailsFailure) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(mojom::blink::PaymentResponse::New()); |
@@ -378,7 +378,7 @@ TEST_F(PaymentRequestTest, RejectCompletePromiseOnUpdateDetailsFailure) |
TEST_F(PaymentRequestTest, IgnoreUpdatePaymentDetailsAfterShowPromiseResolved) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(mojom::blink::PaymentResponse::New()); |
@@ -389,7 +389,7 @@ TEST_F(PaymentRequestTest, IgnoreUpdatePaymentDetailsAfterShowPromiseResolved) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnNonPaymentDetailsUpdate) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState())); |
@@ -400,7 +400,7 @@ TEST_F(PaymentRequestTest, RejectShowPromiseOnNonPaymentDetailsUpdate) |
TEST_F(PaymentRequestTest, RejectShowPromiseOnInvalidPaymentDetailsUpdate) |
{ |
ScriptState::Scope scope(getScriptState()); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState())); |
@@ -416,7 +416,7 @@ TEST_F(PaymentRequestTest, ClearShippingOptionOnPaymentDetailsUpdateWithoutShipp |
details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest())); |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), details, options, getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
EXPECT_TRUE(request->shippingOption().isNull()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
@@ -438,7 +438,7 @@ TEST_F(PaymentRequestTest, ClearShippingOptionOnPaymentDetailsUpdateWithMultiple |
ScriptState::Scope scope(getScriptState()); |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), options, getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
String detail = "{\"displayItems\": [{\"id\": \"total\", \"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]," |
@@ -456,7 +456,7 @@ TEST_F(PaymentRequestTest, UseTheSingleShippingOptionFromPaymentDetailsUpdate) |
ScriptState::Scope scope(getScriptState()); |
PaymentOptions options; |
options.setRequestShipping(true); |
- PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), options, getExceptionState()); |
+ PaymentRequest* request = PaymentRequest::create(getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), options, getExceptionState()); |
EXPECT_FALSE(getExceptionState().hadException()); |
request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState())); |
String detail = "{\"displayItems\": [{\"id\": \"total\", \"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]," |