Add 'total' field to 'PaymentDetails'.

third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 52 matching lines @@
 }
 
 TEST_F(PaymentRequestTest, SupportedMethodListRequired)
 {
     PaymentRequest::create(getScriptState(), Vector<String>(), buildPaymentDetailsForTest(), getExceptionState());
 
     EXPECT_TRUE(getExceptionState().hadException());
     EXPECT_EQ(V8TypeError, getExceptionState().code());
 }
 
-TEST_F(PaymentRequestTest, ItemListRequired)
+TEST_F(PaymentRequestTest, TotalRequired)
 {
     PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), PaymentDetails(), getExceptionState());
 
     EXPECT_TRUE(getExceptionState().hadException());
     EXPECT_EQ(V8TypeError, getExceptionState().code());
 }
 
-TEST_F(PaymentRequestTest, ItemListIsNotEmpty)
-{
-    PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>());
-
-    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
-
-    EXPECT_TRUE(getExceptionState().hadException());
-    EXPECT_EQ(V8TypeError, getExceptionState().code());
-}
-
-TEST_F(PaymentRequestTest, AtLeastOnePaymentDetailsItemRequired)
-{
-    PaymentDetails details;
-    details.setShippingOptions(HeapVector<ShippingOption>(2, buildShippingOptionForTest()));
-
-    PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
-
-    EXPECT_TRUE(getExceptionState().hadException());
-    EXPECT_EQ(V8TypeError, getExceptionState().code());
-}
-
 TEST_F(PaymentRequestTest, NullShippingOptionWhenNoOptionsAvailable)
 {
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, NullShippingOptionWhenMultipleOptionsAvailable)
 {
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     details.setShippingOptions(HeapVector<ShippingOption>(2, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, SelectSingleAvailableShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard")));
     PaymentOptions options;
     options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
     EXPECT_EQ("standard", request->shippingOption());
 }
 
 TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionByDefault)
 {
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard")));
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionWhenShippingNotRequested)
 {
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
     PaymentOptions options;
     options.setRequestShipping(false);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, AbortWithoutShowShouldThrow)
@@ skipping 240 matching lines @@
     request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectCall(getScriptState()));
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), "{}", getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 }
 
 TEST_F(PaymentRequestTest, ClearShippingOptionOnPaymentDetailsUpdateWithoutShippingOptions)
 {
     ScriptState::Scope scope(getScriptState());
     PaymentDetails details;
-    details.setDisplayItems(HeapVector<PaymentItem>(1, buildPaymentItemForTest()));
+    details.setTotal(buildPaymentItemForTest());
     PaymentOptions options;
     options.setRequestShipping(true);
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
     EXPECT_FALSE(getExceptionState().hadException());
     EXPECT_TRUE(request->shippingOption().isNull());
     request->show(getScriptState()).then(MockFunction::expectNoCall(getScriptState()), MockFunction::expectNoCall(getScriptState()));
-    String detailWithShippingOptions = "{\"displayItems\": [{\"id\": \"total\", \"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}],"
+    String detailWithShippingOptions = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
         "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]}";
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detailWithShippingOptions, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
     EXPECT_EQ("standardShippingOption", request->shippingOption());
-    String detailWithoutShippingOptions = "{\"displayItems\": [{\"id\": \"total\", \"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]}";
+    String detailWithoutShippingOptions = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detailWithoutShippingOptions, getExceptionState())));
 
     EXPECT_FALSE(getExceptionState().hadException());
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 TEST_F(PaymentRequestTest, ClearShippingOptionOnPaymentDetailsUpdateWithMultipleShippingOptions)
 {
     ScriptState::Scope scope(getScriptState());
     PaymentOptions options;
     options.setRequestShipping(true);
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), 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\"}}],"
+    String detail = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
         "\"shippingOptions\": [{\"id\": \"slow\", \"label\": \"Slow\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
         "{\"id\": \"fast\", \"label\": \"Fast\", \"amount\": {\"currency\": \"USD\", \"value\": \"50.00\"}}]}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detail, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 
     EXPECT_TRUE(request->shippingOption().isNull());
 }
 
 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());
     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\"}}],"
+    String detail = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
         "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detail, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 
     EXPECT_EQ("standardShippingOption", request->shippingOption());
 }
 
 } // namespace
 } // namespace blink