gfe-relnote: Update MOCK_METHODn to MOCK_METHOD in //third_party/quic/. Test only change.
This CL is generated by experimental/users/bjaspan/mock_method/update-mock-method.pl with manual edits to fix build and test.
#updatemockmethod
PiperOrigin-RevId: 308619078
Change-Id: I584385cc7a4540900ff3d997f64ee35b39eb2170
diff --git a/quic/core/http/http_decoder_test.cc b/quic/core/http/http_decoder_test.cc
index 2e8885c..27f0990 100644
--- a/quic/core/http/http_decoder_test.cc
+++ b/quic/core/http/http_decoder_test.cc
@@ -39,42 +39,79 @@
~MockVisitor() override = default;
// Called if an error is detected.
- MOCK_METHOD1(OnError, void(HttpDecoder* decoder));
+ MOCK_METHOD(void, OnError, (HttpDecoder*), (override));
- MOCK_METHOD1(OnCancelPushFrame, bool(const CancelPushFrame& frame));
- MOCK_METHOD1(OnMaxPushIdFrame, bool(const MaxPushIdFrame& frame));
- MOCK_METHOD1(OnGoAwayFrame, bool(const GoAwayFrame& frame));
- MOCK_METHOD1(OnSettingsFrameStart, bool(QuicByteCount header_length));
- MOCK_METHOD1(OnSettingsFrame, bool(const SettingsFrame& frame));
+ MOCK_METHOD(bool,
+ OnCancelPushFrame,
+ (const CancelPushFrame& frame),
+ (override));
+ MOCK_METHOD(bool,
+ OnMaxPushIdFrame,
+ (const MaxPushIdFrame& frame),
+ (override));
+ MOCK_METHOD(bool, OnGoAwayFrame, (const GoAwayFrame& frame), (override));
+ MOCK_METHOD(bool,
+ OnSettingsFrameStart,
+ (QuicByteCount header_length),
+ (override));
+ MOCK_METHOD(bool, OnSettingsFrame, (const SettingsFrame& frame), (override));
- MOCK_METHOD2(OnDataFrameStart,
- bool(QuicByteCount header_length, QuicByteCount payload_length));
- MOCK_METHOD1(OnDataFramePayload, bool(quiche::QuicheStringPiece payload));
- MOCK_METHOD0(OnDataFrameEnd, bool());
+ MOCK_METHOD(bool,
+ OnDataFrameStart,
+ (QuicByteCount header_length, QuicByteCount payload_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnDataFramePayload,
+ (quiche::QuicheStringPiece payload),
+ (override));
+ MOCK_METHOD(bool, OnDataFrameEnd, (), (override));
- MOCK_METHOD2(OnHeadersFrameStart,
- bool(QuicByteCount header_length, QuicByteCount payload_length));
- MOCK_METHOD1(OnHeadersFramePayload, bool(quiche::QuicheStringPiece payload));
- MOCK_METHOD0(OnHeadersFrameEnd, bool());
+ MOCK_METHOD(bool,
+ OnHeadersFrameStart,
+ (QuicByteCount header_length, QuicByteCount payload_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnHeadersFramePayload,
+ (quiche::QuicheStringPiece payload),
+ (override));
+ MOCK_METHOD(bool, OnHeadersFrameEnd, (), (override));
- MOCK_METHOD1(OnPushPromiseFrameStart, bool(QuicByteCount header_length));
- MOCK_METHOD3(OnPushPromiseFramePushId,
- bool(PushId push_id,
- QuicByteCount push_id_length,
- QuicByteCount header_block_length));
- MOCK_METHOD1(OnPushPromiseFramePayload,
- bool(quiche::QuicheStringPiece payload));
- MOCK_METHOD0(OnPushPromiseFrameEnd, bool());
+ MOCK_METHOD(bool,
+ OnPushPromiseFrameStart,
+ (QuicByteCount header_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnPushPromiseFramePushId,
+ (PushId push_id,
+ QuicByteCount push_id_length,
+ QuicByteCount header_block_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnPushPromiseFramePayload,
+ (quiche::QuicheStringPiece payload),
+ (override));
+ MOCK_METHOD(bool, OnPushPromiseFrameEnd, (), (override));
- MOCK_METHOD1(OnPriorityUpdateFrameStart, bool(QuicByteCount header_length));
- MOCK_METHOD1(OnPriorityUpdateFrame, bool(const PriorityUpdateFrame& frame));
+ MOCK_METHOD(bool,
+ OnPriorityUpdateFrameStart,
+ (QuicByteCount header_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnPriorityUpdateFrame,
+ (const PriorityUpdateFrame& frame),
+ (override));
- MOCK_METHOD3(OnUnknownFrameStart,
- bool(uint64_t frame_type,
- QuicByteCount header_length,
- QuicByteCount payload_length));
- MOCK_METHOD1(OnUnknownFramePayload, bool(quiche::QuicheStringPiece payload));
- MOCK_METHOD0(OnUnknownFrameEnd, bool());
+ MOCK_METHOD(bool,
+ OnUnknownFrameStart,
+ (uint64_t frame_type,
+ QuicByteCount header_length,
+ QuicByteCount payload_length),
+ (override));
+ MOCK_METHOD(bool,
+ OnUnknownFramePayload,
+ (quiche::QuicheStringPiece payload),
+ (override));
+ MOCK_METHOD(bool, OnUnknownFrameEnd, (), (override));
};
class HttpDecoderTest : public QuicTest {
diff --git a/quic/core/http/quic_client_promised_info_test.cc b/quic/core/http/quic_client_promised_info_test.cc
index 381160b..a599626 100644
--- a/quic/core/http/quic_client_promised_info_test.cc
+++ b/quic/core/http/quic_client_promised_info_test.cc
@@ -52,7 +52,7 @@
void set_authorized(bool authorized) { authorized_ = authorized; }
- MOCK_METHOD1(CloseStream, void(QuicStreamId stream_id));
+ MOCK_METHOD(void, CloseStream, (QuicStreamId stream_id), (override));
private:
QuicCryptoClientConfig crypto_config_;
diff --git a/quic/core/http/quic_client_push_promise_index_test.cc b/quic/core/http/quic_client_push_promise_index_test.cc
index 3ca377e..0fc903a 100644
--- a/quic/core/http/quic_client_push_promise_index_test.cc
+++ b/quic/core/http/quic_client_push_promise_index_test.cc
@@ -40,7 +40,7 @@
delete;
~MockQuicSpdyClientSession() override {}
- MOCK_METHOD1(CloseStream, void(QuicStreamId stream_id));
+ MOCK_METHOD(void, CloseStream, (QuicStreamId stream_id), (override));
private:
QuicCryptoClientConfig crypto_config_;
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index 6f92345..d9e1c8e 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -78,66 +78,90 @@
MockQuicHpackDebugVisitor& operator=(const MockQuicHpackDebugVisitor&) =
delete;
- MOCK_METHOD1(OnUseEntry, void(QuicTime::Delta elapsed));
+ MOCK_METHOD(void, OnUseEntry, (QuicTime::Delta elapsed), (override));
};
namespace {
class MockVisitor : public SpdyFramerVisitorInterface {
public:
- MOCK_METHOD1(OnError,
- void(http2::Http2DecoderAdapter::SpdyFramerError error));
- MOCK_METHOD3(OnDataFrameHeader,
- void(SpdyStreamId stream_id, size_t length, bool fin));
- MOCK_METHOD3(OnStreamFrameData,
- void(SpdyStreamId stream_id, const char* data, size_t len));
- MOCK_METHOD1(OnStreamEnd, void(SpdyStreamId stream_id));
- MOCK_METHOD2(OnStreamPadding, void(SpdyStreamId stream_id, size_t len));
- MOCK_METHOD1(OnHeaderFrameStart,
- SpdyHeadersHandlerInterface*(SpdyStreamId stream_id));
- MOCK_METHOD1(OnHeaderFrameEnd, void(SpdyStreamId stream_id));
- MOCK_METHOD3(OnControlFrameHeaderData,
- bool(SpdyStreamId stream_id,
- const char* header_data,
- size_t len));
- MOCK_METHOD2(OnRstStream,
- void(SpdyStreamId stream_id, SpdyErrorCode error_code));
- MOCK_METHOD0(OnSettings, void());
- MOCK_METHOD2(OnSetting, void(SpdySettingsId id, uint32_t value));
- MOCK_METHOD0(OnSettingsAck, void());
- MOCK_METHOD0(OnSettingsEnd, void());
- MOCK_METHOD2(OnPing, void(SpdyPingId unique_id, bool is_ack));
- MOCK_METHOD2(OnGoAway,
- void(SpdyStreamId last_accepted_stream_id,
- SpdyErrorCode error_code));
- MOCK_METHOD7(OnHeaders,
- void(SpdyStreamId stream_id,
- bool has_priority,
- int weight,
- SpdyStreamId parent_stream_id,
- bool exclusive,
- bool fin,
- bool end));
- MOCK_METHOD2(OnWindowUpdate,
- void(SpdyStreamId stream_id, int delta_window_size));
- MOCK_METHOD1(OnBlocked, void(SpdyStreamId stream_id));
- MOCK_METHOD3(OnPushPromise,
- void(SpdyStreamId stream_id,
- SpdyStreamId promised_stream_id,
- bool end));
- MOCK_METHOD2(OnContinuation, void(SpdyStreamId stream_id, bool end));
- MOCK_METHOD3(OnAltSvc,
- void(SpdyStreamId stream_id,
- quiche::QuicheStringPiece origin,
- const SpdyAltSvcWireFormat::AlternativeServiceVector&
- altsvc_vector));
- MOCK_METHOD4(OnPriority,
- void(SpdyStreamId stream_id,
- SpdyStreamId parent_stream_id,
- int weight,
- bool exclusive));
- MOCK_METHOD2(OnUnknownFrame,
- bool(SpdyStreamId stream_id, uint8_t frame_type));
+ MOCK_METHOD(void,
+ OnError,
+ (http2::Http2DecoderAdapter::SpdyFramerError error),
+ (override));
+ MOCK_METHOD(void,
+ OnDataFrameHeader,
+ (SpdyStreamId stream_id, size_t length, bool fin),
+ (override));
+ MOCK_METHOD(void,
+ OnStreamFrameData,
+ (SpdyStreamId stream_id, const char*, size_t len),
+ (override));
+ MOCK_METHOD(void, OnStreamEnd, (SpdyStreamId stream_id), (override));
+ MOCK_METHOD(void,
+ OnStreamPadding,
+ (SpdyStreamId stream_id, size_t len),
+ (override));
+ MOCK_METHOD(SpdyHeadersHandlerInterface*,
+ OnHeaderFrameStart,
+ (SpdyStreamId stream_id),
+ (override));
+ MOCK_METHOD(void, OnHeaderFrameEnd, (SpdyStreamId stream_id), (override));
+ MOCK_METHOD(void,
+ OnRstStream,
+ (SpdyStreamId stream_id, SpdyErrorCode error_code),
+ (override));
+ MOCK_METHOD(void, OnSettings, (), (override));
+ MOCK_METHOD(void, OnSetting, (SpdySettingsId id, uint32_t value), (override));
+ MOCK_METHOD(void, OnSettingsAck, (), (override));
+ MOCK_METHOD(void, OnSettingsEnd, (), (override));
+ MOCK_METHOD(void, OnPing, (SpdyPingId unique_id, bool is_ack), (override));
+ MOCK_METHOD(void,
+ OnGoAway,
+ (SpdyStreamId last_accepted_stream_id, SpdyErrorCode error_code),
+ (override));
+ MOCK_METHOD(void,
+ OnHeaders,
+ (SpdyStreamId stream_id,
+ bool has_priority,
+ int weight,
+ SpdyStreamId parent_stream_id,
+ bool exclusive,
+ bool fin,
+ bool end),
+ (override));
+ MOCK_METHOD(void,
+ OnWindowUpdate,
+ (SpdyStreamId stream_id, int delta_window_size),
+ (override));
+ MOCK_METHOD(void,
+ OnPushPromise,
+ (SpdyStreamId stream_id,
+ SpdyStreamId promised_stream_id,
+ bool end),
+ (override));
+ MOCK_METHOD(void,
+ OnContinuation,
+ (SpdyStreamId stream_id, bool end),
+ (override));
+ MOCK_METHOD(
+ void,
+ OnAltSvc,
+ (SpdyStreamId stream_id,
+ quiche::QuicheStringPiece origin,
+ const SpdyAltSvcWireFormat::AlternativeServiceVector& altsvc_vector),
+ (override));
+ MOCK_METHOD(void,
+ OnPriority,
+ (SpdyStreamId stream_id,
+ SpdyStreamId parent_stream_id,
+ int weight,
+ bool exclusive),
+ (override));
+ MOCK_METHOD(bool,
+ OnUnknownFrame,
+ (SpdyStreamId stream_id, uint8_t frame_type),
+ (override));
};
struct TestParams {
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc
index 51b981f..c482856 100644
--- a/quic/core/http/quic_server_session_base_test.cc
+++ b/quic/core/http/quic_server_session_base_test.cc
@@ -475,8 +475,10 @@
delete;
~MockQuicCryptoServerStream() override {}
- MOCK_METHOD1(SendServerConfigUpdate,
- void(const CachedNetworkParameters* cached_network_parameters));
+ MOCK_METHOD(void,
+ SendServerConfigUpdate,
+ (const CachedNetworkParameters*),
+ (override));
};
class MockTlsServerHandshaker : public TlsServerHandshaker {
@@ -488,8 +490,10 @@
MockTlsServerHandshaker& operator=(const MockTlsServerHandshaker&) = delete;
~MockTlsServerHandshaker() override {}
- MOCK_METHOD1(SendServerConfigUpdate,
- void(const CachedNetworkParameters* cached_network_parameters));
+ MOCK_METHOD(void,
+ SendServerConfigUpdate,
+ (const CachedNetworkParameters*),
+ (override));
};
TEST_P(QuicServerSessionBaseTest, BandwidthEstimates) {
diff --git a/quic/core/http/quic_spdy_client_stream_test.cc b/quic/core/http/quic_spdy_client_stream_test.cc
index 50224cb..fdc0e29 100644
--- a/quic/core/http/quic_spdy_client_stream_test.cc
+++ b/quic/core/http/quic_spdy_client_stream_test.cc
@@ -46,7 +46,7 @@
delete;
~MockQuicSpdyClientSession() override = default;
- MOCK_METHOD1(CloseStream, void(QuicStreamId stream_id));
+ MOCK_METHOD(void, CloseStream, (QuicStreamId stream_id), (override));
private:
QuicCryptoClientConfig crypto_config_;
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index 705d45c..dceccd9 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -139,11 +139,11 @@
void OnOneRttPacketAcknowledged() override {}
void OnHandshakeDoneReceived() override {}
- MOCK_METHOD0(OnCanWrite, void());
+ MOCK_METHOD(void, OnCanWrite, (), (override));
bool HasPendingCryptoRetransmission() const override { return false; }
- MOCK_CONST_METHOD0(HasPendingRetransmission, bool());
+ MOCK_METHOD(bool, HasPendingRetransmission, (), (const, override));
private:
using QuicCryptoStream::session;
@@ -158,7 +158,7 @@
explicit TestHeadersStream(QuicSpdySession* session)
: QuicHeadersStream(session) {}
- MOCK_METHOD0(OnCanWrite, void());
+ MOCK_METHOD(void, OnCanWrite, (), (override));
};
class TestStream : public QuicSpdyStream {
@@ -173,11 +173,13 @@
void OnBodyAvailable() override {}
- MOCK_METHOD0(OnCanWrite, void());
- MOCK_METHOD4(RetransmitStreamData,
- bool(QuicStreamOffset, QuicByteCount, bool, TransmissionType));
+ MOCK_METHOD(void, OnCanWrite, (), (override));
+ MOCK_METHOD(bool,
+ RetransmitStreamData,
+ (QuicStreamOffset, QuicByteCount, bool, TransmissionType),
+ (override));
- MOCK_CONST_METHOD0(HasPendingRetransmission, bool());
+ MOCK_METHOD(bool, HasPendingRetransmission, (), (const, override));
};
class TestSession : public QuicSpdySession {
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc
index 9db9f22..6d708d4 100644
--- a/quic/core/http/quic_spdy_stream_test.cc
+++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -124,11 +124,11 @@
void OnOneRttPacketAcknowledged() override {}
void OnHandshakeDoneReceived() override {}
- MOCK_METHOD0(OnCanWrite, void());
+ MOCK_METHOD(void, OnCanWrite, (), (override));
bool HasPendingCryptoRetransmission() const override { return false; }
- MOCK_CONST_METHOD0(HasPendingRetransmission, bool());
+ MOCK_METHOD(bool, HasPendingRetransmission, (), (const, override));
private:
using QuicCryptoStream::session;
@@ -164,7 +164,7 @@
data_ += std::string(buffer, bytes_read);
}
- MOCK_METHOD1(WriteHeadersMock, void(bool fin));
+ MOCK_METHOD(void, WriteHeadersMock, (bool fin), ());
size_t WriteHeadersImpl(spdy::SpdyHeaderBlock header_block,
bool fin,
@@ -899,6 +899,7 @@
}
EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _))
.WillOnce(Return(QuicConsumedData(kWindow - kHeaderLength, true)));
+ EXPECT_CALL(*session_, SendBlocked(_));
EXPECT_CALL(*connection_, SendControlFrame(_));
stream_->WriteOrBufferBody(body, false);
@@ -918,7 +919,7 @@
Initialize(!kShouldProcessData);
// Expect no WINDOW_UPDATE frames to be sent.
- EXPECT_CALL(*connection_, SendWindowUpdate(_, _)).Times(0);
+ EXPECT_CALL(*session_, SendWindowUpdate(_, _)).Times(0);
// Set a small flow control receive window.
const uint64_t kWindow = 36;
@@ -1012,6 +1013,7 @@
QuicStreamFrame frame2(GetNthClientInitiatedBidirectionalId(0), false,
kWindow / 3 + header_length,
quiche::QuicheStringPiece(data));
+ EXPECT_CALL(*session_, SendWindowUpdate(_, _));
EXPECT_CALL(*connection_, SendControlFrame(_));
stream_->OnStreamFrame(frame2);
EXPECT_EQ(kWindow, QuicFlowControllerPeer::ReceiveWindowSize(
@@ -1084,6 +1086,7 @@
// Now receive a further single byte on one stream - again this does not
// trigger a stream WINDOW_UPDATE, but now the connection flow control window
// is over half full and thus a connection WINDOW_UPDATE is sent.
+ EXPECT_CALL(*session_, SendWindowUpdate(_, _));
EXPECT_CALL(*connection_, SendControlFrame(_));
QuicStreamFrame frame3(GetNthClientInitiatedBidirectionalId(0), false,
body.length() + header_length,
@@ -1170,8 +1173,7 @@
std::string body = "";
bool fin = true;
- EXPECT_CALL(*connection_,
- SendBlocked(GetNthClientInitiatedBidirectionalId(0)))
+ EXPECT_CALL(*session_, SendBlocked(GetNthClientInitiatedBidirectionalId(0)))
.Times(0);
EXPECT_CALL(*session_, WritevData(_, 0, _, FIN, _, _));
