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, _, _));
diff --git a/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc b/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc
index c98f854..93e2561 100644
--- a/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc
+++ b/quic/core/qpack/qpack_decoded_headers_accumulator_test.cc
@@ -42,11 +42,14 @@
class MockVisitor : public QpackDecodedHeadersAccumulator::Visitor {
public:
~MockVisitor() override = default;
- MOCK_METHOD2(OnHeadersDecoded,
- void(QuicHeaderList headers,
- bool header_list_size_limit_exceeded));
- MOCK_METHOD1(OnHeaderDecodingError,
- void(quiche::QuicheStringPiece error_message));
+ MOCK_METHOD(void,
+ OnHeadersDecoded,
+ (QuicHeaderList headers, bool header_list_size_limit_exceeded),
+ (override));
+ MOCK_METHOD(void,
+ OnHeaderDecodingError,
+ (quiche::QuicheStringPiece error_message),
+ (override));
};
} // anonymous namespace
diff --git a/quic/core/qpack/qpack_decoder_stream_receiver_test.cc b/quic/core/qpack/qpack_decoder_stream_receiver_test.cc
index 44a2286..70d2450 100644
--- a/quic/core/qpack/qpack_decoder_stream_receiver_test.cc
+++ b/quic/core/qpack/qpack_decoder_stream_receiver_test.cc
@@ -19,10 +19,16 @@
public:
~MockDelegate() override = default;
- MOCK_METHOD1(OnInsertCountIncrement, void(uint64_t increment));
- MOCK_METHOD1(OnHeaderAcknowledgement, void(QuicStreamId stream_id));
- MOCK_METHOD1(OnStreamCancellation, void(QuicStreamId stream_id));
- MOCK_METHOD1(OnErrorDetected, void(quiche::QuicheStringPiece error_message));
+ MOCK_METHOD(void, OnInsertCountIncrement, (uint64_t increment), (override));
+ MOCK_METHOD(void,
+ OnHeaderAcknowledgement,
+ (QuicStreamId stream_id),
+ (override));
+ MOCK_METHOD(void, OnStreamCancellation, (QuicStreamId stream_id), (override));
+ MOCK_METHOD(void,
+ OnErrorDetected,
+ (quiche::QuicheStringPiece error_message),
+ (override));
};
class QpackDecoderStreamReceiverTest : public QuicTest {
diff --git a/quic/core/qpack/qpack_encoder_stream_receiver_test.cc b/quic/core/qpack/qpack_encoder_stream_receiver_test.cc
index b5edd5f..71b6d34 100644
--- a/quic/core/qpack/qpack_encoder_stream_receiver_test.cc
+++ b/quic/core/qpack/qpack_encoder_stream_receiver_test.cc
@@ -19,16 +19,22 @@
public:
~MockDelegate() override = default;
- MOCK_METHOD3(OnInsertWithNameReference,
- void(bool is_static,
- uint64_t name_index,
- quiche::QuicheStringPiece value));
- MOCK_METHOD2(OnInsertWithoutNameReference,
- void(quiche::QuicheStringPiece name,
- quiche::QuicheStringPiece value));
- MOCK_METHOD1(OnDuplicate, void(uint64_t index));
- MOCK_METHOD1(OnSetDynamicTableCapacity, void(uint64_t capacity));
- MOCK_METHOD1(OnErrorDetected, void(quiche::QuicheStringPiece error_message));
+ MOCK_METHOD(void,
+ OnInsertWithNameReference,
+ (bool is_static,
+ uint64_t name_index,
+ quiche::QuicheStringPiece value),
+ (override));
+ MOCK_METHOD(void,
+ OnInsertWithoutNameReference,
+ (quiche::QuicheStringPiece name, quiche::QuicheStringPiece value),
+ (override));
+ MOCK_METHOD(void, OnDuplicate, (uint64_t index), (override));
+ MOCK_METHOD(void, OnSetDynamicTableCapacity, (uint64_t capacity), (override));
+ MOCK_METHOD(void,
+ OnErrorDetected,
+ (quiche::QuicheStringPiece error_message),
+ (override));
};
class QpackEncoderStreamReceiverTest : public QuicTest {
diff --git a/quic/core/qpack/qpack_header_table_test.cc b/quic/core/qpack/qpack_header_table_test.cc
index 5cf3920..a96159b 100644
--- a/quic/core/qpack/qpack_header_table_test.cc
+++ b/quic/core/qpack/qpack_header_table_test.cc
@@ -25,8 +25,8 @@
public:
~MockObserver() override = default;
- MOCK_METHOD0(OnInsertCountReachedThreshold, void());
- MOCK_METHOD0(Cancel, void());
+ MOCK_METHOD(void, OnInsertCountReachedThreshold, (), (override));
+ MOCK_METHOD(void, Cancel, (), (override));
};
class QpackHeaderTableTest : public QuicTest {
diff --git a/quic/core/qpack/qpack_instruction_decoder_test.cc b/quic/core/qpack/qpack_instruction_decoder_test.cc
index 99cda08..a4bbc91 100644
--- a/quic/core/qpack/qpack_instruction_decoder_test.cc
+++ b/quic/core/qpack/qpack_instruction_decoder_test.cc
@@ -61,8 +61,14 @@
MockDelegate& operator=(const MockDelegate&) = delete;
~MockDelegate() override = default;
- MOCK_METHOD1(OnInstructionDecoded, bool(const QpackInstruction* instruction));
- MOCK_METHOD1(OnError, void(quiche::QuicheStringPiece error_message));
+ MOCK_METHOD(bool,
+ OnInstructionDecoded,
+ (const QpackInstruction*),
+ (override));
+ MOCK_METHOD(void,
+ OnError,
+ (quiche::QuicheStringPiece error_message),
+ (override));
};
class QpackInstructionDecoderTest : public QuicTestWithParam<FragmentMode> {
diff --git a/quic/core/quic_alarm_test.cc b/quic/core/quic_alarm_test.cc
index b2f4690..87cbd69 100644
--- a/quic/core/quic_alarm_test.cc
+++ b/quic/core/quic_alarm_test.cc
@@ -14,7 +14,7 @@
class MockDelegate : public QuicAlarm::Delegate {
public:
- MOCK_METHOD0(OnAlarm, void());
+ MOCK_METHOD(void, OnAlarm, (), (override));
};
class DestructiveDelegate : public QuicAlarm::Delegate {
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 0de52b4..4ad005d 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -1094,8 +1094,6 @@
.WillRepeatedly(Return(kDefaultTCPMSS));
EXPECT_CALL(*send_algorithm_, PacingRate(_))
.WillRepeatedly(Return(QuicBandwidth::Zero()));
- EXPECT_CALL(*send_algorithm_, HasReliableBandwidthEstimate())
- .Times(AnyNumber());
EXPECT_CALL(*send_algorithm_, BandwidthEstimate())
.Times(AnyNumber())
.WillRepeatedly(Return(QuicBandwidth::Zero()));
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index fde97c9..814462e 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -80,13 +80,27 @@
~TestQuicSpdyServerSession() override { DeleteConnection(); }
- MOCK_METHOD2(OnConnectionClosed,
- void(const QuicConnectionCloseFrame& frame,
- ConnectionCloseSource source));
- MOCK_METHOD1(CreateIncomingStream, QuicSpdyStream*(QuicStreamId id));
- MOCK_METHOD1(CreateIncomingStream, QuicSpdyStream*(PendingStream* pending));
- MOCK_METHOD0(CreateOutgoingBidirectionalStream, QuicSpdyStream*());
- MOCK_METHOD0(CreateOutgoingUnidirectionalStream, QuicSpdyStream*());
+ MOCK_METHOD(void,
+ OnConnectionClosed,
+ (const QuicConnectionCloseFrame& frame,
+ ConnectionCloseSource source),
+ (override));
+ MOCK_METHOD(QuicSpdyStream*,
+ CreateIncomingStream,
+ (QuicStreamId id),
+ (override));
+ MOCK_METHOD(QuicSpdyStream*,
+ CreateIncomingStream,
+ (PendingStream*),
+ (override));
+ MOCK_METHOD(QuicSpdyStream*,
+ CreateOutgoingBidirectionalStream,
+ (),
+ (override));
+ MOCK_METHOD(QuicSpdyStream*,
+ CreateOutgoingUnidirectionalStream,
+ (),
+ (override));
std::unique_ptr<QuicCryptoServerStreamBase> CreateQuicCryptoServerStream(
const QuicCryptoServerConfig* crypto_config,
@@ -116,15 +130,18 @@
kQuicDefaultConnectionIdLength),
random_(random) {}
- MOCK_METHOD4(
- CreateQuicSession,
- std::unique_ptr<QuicSession>(QuicConnectionId connection_id,
- const QuicSocketAddress& peer_address,
- quiche::QuicheStringPiece alpn,
- const quic::ParsedQuicVersion& version));
+ MOCK_METHOD(std::unique_ptr<QuicSession>,
+ CreateQuicSession,
+ (QuicConnectionId connection_id,
+ const QuicSocketAddress& peer_address,
+ quiche::QuicheStringPiece alpn,
+ const quic::ParsedQuicVersion& version),
+ (override));
- MOCK_METHOD1(ShouldCreateOrBufferPacketForConnection,
- bool(const ReceivedPacketInfo& packet_info));
+ MOCK_METHOD(bool,
+ ShouldCreateOrBufferPacketForConnection,
+ (const ReceivedPacketInfo& packet_info),
+ (override));
struct TestQuicPerPacketContext : public QuicPerPacketContext {
std::string custom_packet_context;
diff --git a/quic/core/quic_flow_controller_test.cc b/quic/core/quic_flow_controller_test.cc
index 8f4cdf7..29a9ba3 100644
--- a/quic/core/quic_flow_controller_test.cc
+++ b/quic/core/quic_flow_controller_test.cc
@@ -31,7 +31,7 @@
MockFlowController& operator=(const MockFlowController&) = delete;
~MockFlowController() override {}
- MOCK_METHOD1(EnsureWindowAtLeast, void(QuicByteCount));
+ MOCK_METHOD(void, EnsureWindowAtLeast, (QuicByteCount), (override));
};
class QuicFlowControllerTest : public QuicTest {
diff --git a/quic/core/quic_idle_network_detector_test.cc b/quic/core/quic_idle_network_detector_test.cc
index 16941ef..0d40d64 100644
--- a/quic/core/quic_idle_network_detector_test.cc
+++ b/quic/core/quic_idle_network_detector_test.cc
@@ -22,8 +22,8 @@
class MockDelegate : public QuicIdleNetworkDetector::Delegate {
public:
- MOCK_METHOD0(OnHandshakeTimeout, void());
- MOCK_METHOD0(OnIdleNetworkDetected, void());
+ MOCK_METHOD(void, OnHandshakeTimeout, (), (override));
+ MOCK_METHOD(void, OnIdleNetworkDetected, (), (override));
};
class QuicIdleNetworkDetectorTest : public QuicTest {
diff --git a/quic/core/quic_network_blackhole_detector_test.cc b/quic/core/quic_network_blackhole_detector_test.cc
index eca50e3..0178887 100644
--- a/quic/core/quic_network_blackhole_detector_test.cc
+++ b/quic/core/quic_network_blackhole_detector_test.cc
@@ -21,8 +21,8 @@
namespace {
class MockDelegate : public QuicNetworkBlackholeDetector::Delegate {
public:
- MOCK_METHOD0(OnPathDegradingDetected, void());
- MOCK_METHOD0(OnBlackholeDetected, void());
+ MOCK_METHOD(void, OnPathDegradingDetected, (), (override));
+ MOCK_METHOD(void, OnBlackholeDetected, (), (override));
};
const size_t kPathDegradingDelayInSeconds = 5;
diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 98e86c3..19fc5cb 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -86,9 +86,12 @@
public:
~MockDebugDelegate() override = default;
- MOCK_METHOD1(OnFrameAddedToPacket, void(const QuicFrame& frame));
+ MOCK_METHOD(void, OnFrameAddedToPacket, (const QuicFrame& frame), (override));
- MOCK_METHOD1(OnStreamFrameCoalesced, void(const QuicStreamFrame& frame));
+ MOCK_METHOD(void,
+ OnStreamFrameCoalesced,
+ (const QuicStreamFrame& frame),
+ (override));
};
class TestPacketCreator : public QuicPacketCreator {
@@ -2237,13 +2240,20 @@
MockDelegate& operator=(const MockDelegate&) = delete;
~MockDelegate() override {}
- MOCK_METHOD2(ShouldGeneratePacket,
- bool(HasRetransmittableData retransmittable,
- IsHandshake handshake));
- MOCK_METHOD0(MaybeBundleAckOpportunistically, const QuicFrames());
- MOCK_METHOD0(GetPacketBuffer, char*());
- MOCK_METHOD1(OnSerializedPacket, void(SerializedPacket* packet));
- MOCK_METHOD2(OnUnrecoverableError, void(QuicErrorCode, const std::string&));
+ MOCK_METHOD(bool,
+ ShouldGeneratePacket,
+ (HasRetransmittableData retransmittable, IsHandshake handshake),
+ (override));
+ MOCK_METHOD(const QuicFrames,
+ MaybeBundleAckOpportunistically,
+ (),
+ (override));
+ MOCK_METHOD(char*, GetPacketBuffer, (), (override));
+ MOCK_METHOD(void, OnSerializedPacket, (SerializedPacket*), (override));
+ MOCK_METHOD(void,
+ OnUnrecoverableError,
+ (QuicErrorCode, const std::string&),
+ (override));
void SetCanWriteAnything() {
EXPECT_CALL(*this, ShouldGeneratePacket(_, _)).WillRepeatedly(Return(true));
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index e63a9b8..7efa8e3 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -43,14 +43,17 @@
class MockDebugDelegate : public QuicSentPacketManager::DebugDelegate {
public:
- MOCK_METHOD2(OnSpuriousPacketRetransmission,
- void(TransmissionType transmission_type,
- QuicByteCount byte_size));
- MOCK_METHOD4(OnPacketLoss,
- void(QuicPacketNumber lost_packet_number,
- EncryptionLevel encryption_level,
- TransmissionType transmission_type,
- QuicTime detection_time));
+ MOCK_METHOD(void,
+ OnSpuriousPacketRetransmission,
+ (TransmissionType transmission_type, QuicByteCount byte_size),
+ (override));
+ MOCK_METHOD(void,
+ OnPacketLoss,
+ (QuicPacketNumber lost_packet_number,
+ EncryptionLevel encryption_level,
+ TransmissionType transmission_type,
+ QuicTime detection_time),
+ (override));
};
class QuicSentPacketManagerTest : public QuicTest {
@@ -105,8 +108,6 @@
EXPECT_CALL(*send_algorithm_, GetCongestionControlType())
.WillRepeatedly(Return(kInitialCongestionControlType));
- EXPECT_CALL(*send_algorithm_, HasReliableBandwidthEstimate())
- .Times(AnyNumber());
EXPECT_CALL(*send_algorithm_, BandwidthEstimate())
.Times(AnyNumber())
.WillRepeatedly(Return(QuicBandwidth::Zero()));
@@ -526,7 +527,6 @@
// Since 1 has been retransmitted, it has already been lost, and so the
// send algorithm is not informed that it has been ACK'd.
ExpectUpdatedRtt(1);
- EXPECT_CALL(*send_algorithm_, RevertRetransmissionTimeout());
manager_.OnAckFrameStart(QuicPacketNumber(1), QuicTime::Delta::Infinite(),
clock_.Now());
manager_.OnAckRange(QuicPacketNumber(1), QuicPacketNumber(2));
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index 36b55a1..372fa07 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -161,7 +161,7 @@
(QuicStreamOffset, QuicByteCount, bool, TransmissionType),
(override));
- MOCK_METHOD(bool, HasPendingRetransmission, (), (override, const));
+ MOCK_METHOD(bool, HasPendingRetransmission, (), (const, override));
};
class TestSession : public QuicSession {
diff --git a/quic/core/quic_stream_id_manager_test.cc b/quic/core/quic_stream_id_manager_test.cc
index cf7129c..2179ba2 100644
--- a/quic/core/quic_stream_id_manager_test.cc
+++ b/quic/core/quic_stream_id_manager_test.cc
@@ -24,8 +24,10 @@
class MockDelegate : public QuicStreamIdManager::DelegateInterface {
public:
- MOCK_METHOD2(SendMaxStreams,
- void(QuicStreamCount stream_count, bool unidirectional));
+ MOCK_METHOD(void,
+ SendMaxStreams,
+ (QuicStreamCount stream_count, bool unidirectional),
+ (override));
};
struct TestParams {
diff --git a/quic/core/quic_stream_sequencer_test.cc b/quic/core/quic_stream_sequencer_test.cc
index 188eb86..bdf1412 100644
--- a/quic/core/quic_stream_sequencer_test.cc
+++ b/quic/core/quic_stream_sequencer_test.cc
@@ -31,13 +31,14 @@
class MockStream : public QuicStreamSequencer::StreamInterface {
public:
- MOCK_METHOD0(OnFinRead, void());
- MOCK_METHOD0(OnDataAvailable, void());
- MOCK_METHOD2(OnUnrecoverableError,
- void(QuicErrorCode error, const std::string& details));
- MOCK_METHOD1(Reset, void(QuicRstStreamErrorCode error));
- MOCK_METHOD0(OnCanWrite, void());
- MOCK_METHOD1(AddBytesConsumed, void(QuicByteCount bytes));
+ MOCK_METHOD(void, OnFinRead, (), (override));
+ MOCK_METHOD(void, OnDataAvailable, (), (override));
+ MOCK_METHOD(void,
+ OnUnrecoverableError,
+ (QuicErrorCode error, const std::string& details),
+ (override));
+ MOCK_METHOD(void, Reset, (QuicRstStreamErrorCode error), (override));
+ MOCK_METHOD(void, AddBytesConsumed, (QuicByteCount bytes), (override));
QuicStreamId id() const override { return 1; }
};
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index fdff93b..f2269bb 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -61,9 +61,9 @@
TestStream(PendingStream* pending, StreamType type, bool is_static)
: QuicStream(pending, type, is_static) {}
- MOCK_METHOD0(OnDataAvailable, void());
+ MOCK_METHOD(void, OnDataAvailable, (), (override));
- MOCK_METHOD0(OnCanWriteNewData, void());
+ MOCK_METHOD(void, OnCanWriteNewData, (), (override));
using QuicStream::CanWriteNewData;
using QuicStream::CanWriteNewDataAfterData;
diff --git a/quic/core/quic_time_wait_list_manager_test.cc b/quic/core/quic_time_wait_list_manager_test.cc
index 9e09a80..468b21b 100644
--- a/quic/core/quic_time_wait_list_manager_test.cc
+++ b/quic/core/quic_time_wait_list_manager_test.cc
@@ -113,8 +113,8 @@
return QuicArenaScopedPtr<MockAlarm>(
new MockAlarm(std::move(delegate), alarm_index_++, this));
}
- MOCK_METHOD2(OnAlarmSet, void(int, QuicTime));
- MOCK_METHOD1(OnAlarmCancelled, void(int));
+ MOCK_METHOD(void, OnAlarmSet, (int, QuicTime), ());
+ MOCK_METHOD(void, OnAlarmCancelled, (int), ());
private:
int alarm_index_ = 0;
diff --git a/quic/core/tls_handshaker_test.cc b/quic/core/tls_handshaker_test.cc
index f774e28..147d62f 100644
--- a/quic/core/tls_handshaker_test.cc
+++ b/quic/core/tls_handshaker_test.cc
@@ -225,10 +225,16 @@
MockProofHandler() = default;
~MockProofHandler() override {}
- MOCK_METHOD1(OnProofValid, // NOLINT(build/deprecated)
- void(const QuicCryptoClientConfig::CachedState&));
- MOCK_METHOD1(OnProofVerifyDetailsAvailable, // NOLINT(build/deprecated)
- void(const ProofVerifyDetails&));
+ MOCK_METHOD( // NOLINT(build/deprecated)
+ void,
+ OnProofValid,
+ (const QuicCryptoClientConfig::CachedState&),
+ (override));
+ MOCK_METHOD( // NOLINT(build/deprecated)
+ void,
+ OnProofVerifyDetailsAvailable,
+ (const ProofVerifyDetails&),
+ (override));
};
class TestQuicCryptoClientStream : public TestQuicCryptoStream {
diff --git a/quic/core/uber_quic_stream_id_manager_test.cc b/quic/core/uber_quic_stream_id_manager_test.cc
index 6fe8363..7cae0a6 100644
--- a/quic/core/uber_quic_stream_id_manager_test.cc
+++ b/quic/core/uber_quic_stream_id_manager_test.cc
@@ -46,8 +46,10 @@
class MockDelegate : public QuicStreamIdManager::DelegateInterface {
public:
- MOCK_METHOD2(SendMaxStreams,
- void(QuicStreamCount stream_count, bool unidirectional));
+ MOCK_METHOD(void,
+ SendMaxStreams,
+ (QuicStreamCount stream_count, bool unidirectional),
+ (override));
};
class UberQuicStreamIdManagerTest : public QuicTestWithParam<TestParams> {
