Print proper debug message in case of change event timeout.

third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.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/PaymentRequestUpdateEvent.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/EventTypeNames.h"
+#include "modules/payments/PaymentRequest.h"
+#include "modules/payments/PaymentTestHelper.h"
 #include "modules/payments/PaymentUpdater.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <memory>
 
 namespace blink {
 namespace {
 
 class MockPaymentUpdater : public GarbageCollectedFinalized<MockPaymentUpdater>, public PaymentUpdater {
     USING_GARBAGE_COLLECTED_MIXIN(MockPaymentUpdater);
     WTF_MAKE_NONCOPYABLE(MockPaymentUpdater);
 
 public:
     MockPaymentUpdater() {}
     ~MockPaymentUpdater() override {}
 
     MOCK_METHOD1(onUpdatePaymentDetails, void(const ScriptValue& detailsScriptValue));
     MOCK_METHOD1(onUpdatePaymentDetailsFailure, void(const ScriptValue& error));

[please use gerrit instead, 2016/07/29 15:40:50]

Change ScriptValue to String

[pals, 2016/08/01 11:18:23]

Done.

+    MOCK_METHOD1(abortPaymentRequest, void(const String& message));

[please use gerrit instead, 2016/07/29 15:40:50]

No need for the extra method.

[pals, 2016/08/01 11:18:23]

Done.

 
     DEFINE_INLINE_TRACE() {}
 };
 
 TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsCalled)
 {
     V8TestingScope scope;
     PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create();
     MockPaymentUpdater* updater = new MockPaymentUpdater;
     event->setPaymentDetailsUpdater(updater);
@@ skipping 57 matching lines @@
     PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
 
     event->updateWith(scope.getScriptState(), ScriptPromiseResolver::create(scope.getScriptState())->promise(), scope.getExceptionState());
 
     EXPECT_FALSE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsTimeout)
 {
     V8TestingScope scope;
+    PaymentRequestMockFunctionScope funcs(scope.getScriptState());
+    makePaymentRequestOriginSecure(scope.document());
+    PaymentRequest* request = PaymentRequest::create(scope.getScriptState(), buildPaymentMethodDataForTest(), buildPaymentDetailsForTest(), scope.getExceptionState());
     PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create();
-    MockPaymentUpdater* updater = new MockPaymentUpdater;
-    event->setPaymentDetailsUpdater(updater);
+    event->setPaymentDetailsUpdater(request);
+    EXPECT_FALSE(scope.getExceptionState().hadException());
 
-    EXPECT_CALL(*updater, onUpdatePaymentDetails(testing::_)).Times(0);
-    EXPECT_CALL(*updater, onUpdatePaymentDetailsFailure(testing::_));
+    String errorMessage;
+    request->show(scope.getScriptState()).then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
 
     event->onTimerFired(0);
+
+    v8::MicrotasksScope::PerformCheckpoint(scope.getScriptState()->isolate());
+    EXPECT_EQ("AbortError: Timed out as the page didn't resolve the promise from change event", errorMessage);

[please use gerrit instead, 2016/07/29 15:40:50]

Great test!

[pals, 2016/08/01 11:18:23]

Thanks.

 }
 
 } // namespace
 } // namespace blink