Add 'selected' boolean to 'ShippingOption'

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 85 matching lines @@
     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)
+TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionByDefault)
 {
     PaymentDetails details;
     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.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, DontSelectSingleUnselectedShippingOptionWhenShippingRequested)
+{
+    PaymentDetails details;
+    details.setTotal(buildPaymentItemForTest());
+    details.setShippingOptions(HeapVector<ShippingOption>(1, 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, SelectSingleSelectedShippingOptionWhenShippingRequested)
+{
+    PaymentDetails details;
+    details.setTotal(buildPaymentItemForTest());
+    HeapVector<ShippingOption> shippingOptions(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard"));
+    shippingOptions[0].setSelected(true);
+    details.setShippingOptions(shippingOptions);
+    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)
+TEST_F(PaymentRequestTest, SelectOnlySelectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard")));
+    HeapVector<ShippingOption> shippingOptions(2);
+    shippingOptions[0] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard");
+    shippingOptions[0].setSelected(true);
+    shippingOptions[1] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "express");
+    details.setShippingOptions(shippingOptions);
+    PaymentOptions options;
+    options.setRequestShipping(true);
 
-    PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, getExceptionState());
+    PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
-    EXPECT_TRUE(request->shippingOption().isNull());
+    EXPECT_EQ("standard", request->shippingOption());
 }
 
-TEST_F(PaymentRequestTest, DontSelectSingleAvailableShippingOptionWhenShippingNotRequested)
+TEST_F(PaymentRequestTest, SelectLastSelectedShippingOptionWhenShippingRequested)
 {
     PaymentDetails details;
     details.setTotal(buildPaymentItemForTest());
-    details.setShippingOptions(HeapVector<ShippingOption>(1, buildShippingOptionForTest()));
+    HeapVector<ShippingOption> shippingOptions(2);
+    shippingOptions[0] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "standard");
+    shippingOptions[0].setSelected(true);
+    shippingOptions[1] = buildShippingOptionForTest(PaymentTestDataId, PaymentTestOverwriteValue, "express");
+    shippingOptions[1].setSelected(true);
+    details.setShippingOptions(shippingOptions);
     PaymentOptions options;
-    options.setRequestShipping(false);
+    options.setRequestShipping(true);
 
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), details, options, getExceptionState());
 
-    EXPECT_TRUE(request->shippingOption().isNull());
+    EXPECT_EQ("express", request->shippingOption());
 }
 
 TEST_F(PaymentRequestTest, AbortWithoutShowShouldThrow)
 {
     PaymentRequest* request = PaymentRequest::create(getScriptState(), Vector<String>(1, "foo"), buildPaymentDetailsForTest(), getExceptionState());
     EXPECT_FALSE(getExceptionState().hadException());
 
     request->abort(getExceptionState());
     EXPECT_TRUE(getExceptionState().hadException());
 }
@@ skipping 241 matching lines @@
     ScriptState::Scope scope(getScriptState());
     PaymentDetails details;
     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 = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
-        "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}}]}";
+        "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}, \"selected\": true}]}";
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detailWithShippingOptions, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
     EXPECT_EQ("standardShippingOption", request->shippingOption());
     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)
+TEST_F(PaymentRequestTest, ClearShippingOptionOnPaymentDetailsUpdateWithMultipleUnselectedShippingOptions)
 {
     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 = "{\"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)
+TEST_F(PaymentRequestTest, UseTheSelectedShippingOptionFromPaymentDetailsUpdate)
 {
     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 = "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", \"value\": \"5.00\"}},"
-        "\"shippingOptions\": [{\"id\": \"standardShippingOption\", \"label\": \"Standard shipping\", \"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\"}, \"selected\": true}]}";
 
     request->onUpdatePaymentDetails(ScriptValue::from(getScriptState(), fromJSONString(getScriptState(), detail, getExceptionState())));
     EXPECT_FALSE(getExceptionState().hadException());
 
-    EXPECT_EQ("standardShippingOption", request->shippingOption());
+    EXPECT_EQ("fast", request->shippingOption());
 }
 
 } // namespace
 } // namespace blink