Parameterize OnError method.

third_party/WebKit/Source/modules/payments/PaymentTestHelper.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/PaymentTestHelper.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "modules/payments/PaymentCurrencyAmount.h"
 #include "modules/payments/PaymentMethodData.h"
@@ skipping 135 matching lines @@
 }
 
 PaymentRequestMockFunctionScope::~PaymentRequestMockFunctionScope()
 {
     v8::MicrotasksScope::PerformCheckpoint(m_scriptState->isolate());
     for (MockFunction* mockFunction : m_mockFunctions) {
         testing::Mock::VerifyAndClearExpectations(mockFunction);
     }
 }
 
+v8::Local<v8::Function> PaymentRequestMockFunctionScope::expectCall(String* captor)
+{
+    m_mockFunctions.append(new MockFunction(m_scriptState, captor));
+    return m_mockFunctions.last()->bind();
+}
+
 v8::Local<v8::Function> PaymentRequestMockFunctionScope::expectCall()
 {
     m_mockFunctions.append(new MockFunction(m_scriptState));
-    EXPECT_CALL(*m_mockFunctions.last(), call(testing::_));
+    // EXPECT_CALL(*m_mockFunctions.last(), call(testing::_));

[pals, 2016/07/12 11:42:56]

As we have overridden the "call" method, EXPECT_CALL does not work. We can set a
string (called/not called) here, but in that case we need to in many places in
test files. Is there any better way to do it? Shall I create a separate class to
test this change similar to [1] instead of modifying
PaymentRequestMockFunctionScope class?

[pals, 2016/07/12 11:45:01]

[1]
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/streams/R...

[please use gerrit instead, 2016/07/12 15:57:35]

Uncomment

[pals, 2016/07/13 05:54:27]

Done.

     return m_mockFunctions.last()->bind();
 }
 
 v8::Local<v8::Function> PaymentRequestMockFunctionScope::expectNoCall()
 {
     m_mockFunctions.append(new MockFunction(m_scriptState));
-    EXPECT_CALL(*m_mockFunctions.last(), call(testing::_)).Times(0);
+    // EXPECT_CALL(*m_mockFunctions.last(), call(testing::_)).Times(0);

[please use gerrit instead, 2016/07/12 15:57:35]

Uncomment

[pals, 2016/07/13 05:54:28]

Done.

     return m_mockFunctions.last()->bind();
 }
 

[please use gerrit instead, 2016/07/12 15:57:35]

Put the following code before MockFunction() constructor here:

ACTION_P(SaveVaueIn, captor) {
  *captor = arg0;
}

https://github.com/google/googlemock/blob/master/googlemock/docs/CheatSheet.m...

[pals, 2016/07/13 05:54:28]

Nice. Thank you.

Done. Thanks

 PaymentRequestMockFunctionScope::MockFunction::MockFunction(ScriptState* scriptState)
     : ScriptFunction(scriptState)
 {
-    ON_CALL(*this, call(testing::_)).WillByDefault(testing::ReturnArg<0>());
+    // ON_CALL(*this, call(testing::_)).WillByDefault(testing::ReturnArg<0>());

[please use gerrit instead, 2016/07/12 15:57:35]

Change this line to the following:

ON_CALL(*this, call(testing::_)).WillByDefault(
        testing::DoAll(SaveValueIn(m_value), testing::ReturnArg<0>()));

[pals, 2016/07/13 05:54:27]

Done.

+}
+
+PaymentRequestMockFunctionScope::MockFunction::MockFunction(ScriptState* scriptState, String* captor)
+    : ScriptFunction(scriptState)
+    , m_value(captor)
+{
 }
 
 v8::Local<v8::Function> PaymentRequestMockFunctionScope::MockFunction::bind()
 {
     return bindToV8Function();
 }
 
 } // namespace blink