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/tools/quic_server_test.cc b/quic/tools/quic_server_test.cc
index fb7955f..3c43720 100644
--- a/quic/tools/quic_server_test.cc
+++ b/quic/tools/quic_server_test.cc
@@ -48,10 +48,10 @@
kQuicDefaultConnectionIdLength) {}
~MockQuicSimpleDispatcher() override = default;
- MOCK_METHOD0(OnCanWrite, void());
- MOCK_CONST_METHOD0(HasPendingWrites, bool());
- MOCK_CONST_METHOD0(HasChlosBuffered, bool());
- MOCK_METHOD1(ProcessBufferedChlos, void(size_t));
+ MOCK_METHOD(void, OnCanWrite, (), (override));
+ MOCK_METHOD(bool, HasPendingWrites, (), (const, override));
+ MOCK_METHOD(bool, HasChlosBuffered, (), (const, override));
+ MOCK_METHOD(void, ProcessBufferedChlos, (size_t), (override));
};
class TestQuicServer : public QuicServer {
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc
index 966128b..f5dad7d 100644
--- a/quic/tools/quic_simple_server_session_test.cc
+++ b/quic/tools/quic_simple_server_session_test.cc
@@ -95,8 +95,10 @@
delete;
~MockQuicCryptoServerStream() override {}
- MOCK_METHOD1(SendServerConfigUpdate,
- void(const CachedNetworkParameters* cached_network_parameters));
+ MOCK_METHOD(void,
+ SendServerConfigUpdate,
+ (const CachedNetworkParameters*),
+ (override));
bool encryption_established() const override { return true; }
};
@@ -110,8 +112,10 @@
MockTlsServerHandshaker& operator=(const MockTlsServerHandshaker&) = delete;
~MockTlsServerHandshaker() override {}
- MOCK_METHOD1(SendServerConfigUpdate,
- void(const CachedNetworkParameters* cached_network_parameters));
+ MOCK_METHOD(void,
+ SendServerConfigUpdate,
+ (const CachedNetworkParameters*),
+ (override));
bool encryption_established() const override { return true; }
};
@@ -156,11 +160,13 @@
.WillByDefault(Invoke(consume_all_data));
}
- MOCK_METHOD4(SendStreamData,
- QuicConsumedData(QuicStreamId id,
- size_t write_length,
- QuicStreamOffset offset,
- StreamSendingState state));
+ MOCK_METHOD(QuicConsumedData,
+ SendStreamData,
+ (QuicStreamId id,
+ size_t write_length,
+ QuicStreamOffset offset,
+ StreamSendingState state),
+ (override));
};
class MockQuicSimpleServerSession : public QuicSimpleServerSession {
@@ -189,12 +195,14 @@
return WritePushPromiseMock(original_stream_id, promised_stream_id,
headers);
}
- MOCK_METHOD3(WritePushPromiseMock,
- void(QuicStreamId original_stream_id,
- QuicStreamId promised_stream_id,
- const spdy::SpdyHeaderBlock& headers));
+ MOCK_METHOD(void,
+ WritePushPromiseMock,
+ (QuicStreamId original_stream_id,
+ QuicStreamId promised_stream_id,
+ const spdy::SpdyHeaderBlock& headers),
+ ());
- MOCK_METHOD1(SendBlocked, void(QuicStreamId));
+ MOCK_METHOD(void, SendBlocked, (QuicStreamId), (override));
};
class QuicSimpleServerSessionTest
diff --git a/quic/tools/quic_simple_server_stream_test.cc b/quic/tools/quic_simple_server_stream_test.cc
index 8c45942..3dfaa1e 100644
--- a/quic/tools/quic_simple_server_stream_test.cc
+++ b/quic/tools/quic_simple_server_stream_test.cc
@@ -55,7 +55,7 @@
~TestStream() override = default;
- MOCK_METHOD1(WriteHeadersMock, void(bool fin));
+ MOCK_METHOD(void, WriteHeadersMock, (bool fin), ());
size_t WriteHeaders(spdy::SpdyHeaderBlock /*header_block*/,
bool fin,
@@ -120,30 +120,42 @@
delete;
~MockQuicSimpleServerSession() override = default;
- MOCK_METHOD2(OnConnectionClosed,
- void(const QuicConnectionCloseFrame& frame,
- ConnectionCloseSource source));
- MOCK_METHOD1(CreateIncomingStream, QuicSpdyStream*(QuicStreamId id));
- MOCK_METHOD6(WritevData,
- QuicConsumedData(QuicStreamId id,
- size_t write_length,
- QuicStreamOffset offset,
- StreamSendingState state,
- TransmissionType type,
- quiche::QuicheOptional<EncryptionLevel> level));
- MOCK_METHOD4(OnStreamHeaderList,
- void(QuicStreamId stream_id,
- bool fin,
- size_t frame_len,
- const QuicHeaderList& header_list));
- MOCK_METHOD2(OnStreamHeadersPriority,
- void(QuicStreamId stream_id,
- const spdy::SpdyStreamPrecedence& precedence));
- MOCK_METHOD3(SendRstStream,
- void(QuicStreamId stream_id,
- QuicRstStreamErrorCode error,
- QuicStreamOffset bytes_written));
- MOCK_METHOD1(OnHeadersHeadOfLineBlocking, void(QuicTime::Delta delta));
+ MOCK_METHOD(void,
+ OnConnectionClosed,
+ (const QuicConnectionCloseFrame& frame,
+ ConnectionCloseSource source),
+ (override));
+ MOCK_METHOD(QuicSpdyStream*,
+ CreateIncomingStream,
+ (QuicStreamId id),
+ (override));
+ MOCK_METHOD(QuicConsumedData,
+ WritevData,
+ (QuicStreamId id,
+ size_t write_length,
+ QuicStreamOffset offset,
+ StreamSendingState state,
+ TransmissionType type,
+ quiche::QuicheOptional<EncryptionLevel> level),
+ (override));
+ MOCK_METHOD(void,
+ OnStreamHeaderList,
+ (QuicStreamId stream_id,
+ bool fin,
+ size_t frame_len,
+ const QuicHeaderList& header_list),
+ (override));
+ MOCK_METHOD(void,
+ OnStreamHeadersPriority,
+ (QuicStreamId stream_id,
+ const spdy::SpdyStreamPrecedence& precedence),
+ (override));
+ MOCK_METHOD(void,
+ SendRstStream,
+ (QuicStreamId stream_id,
+ QuicRstStreamErrorCode error,
+ QuicStreamOffset bytes_written),
+ (override));
// Matchers cannot be used on non-copyable types like SpdyHeaderBlock.
void PromisePushResources(
const std::string& request_url,
@@ -155,17 +167,17 @@
PromisePushResourcesMock(request_url, resources, original_stream_id,
original_precedence, original_request_headers);
}
- MOCK_METHOD5(PromisePushResourcesMock,
- void(const std::string&,
- const std::list<QuicBackendResponse::ServerPushInfo>&,
- QuicStreamId,
- const spdy::SpdyStreamPrecedence&,
- const spdy::SpdyHeaderBlock&));
+ MOCK_METHOD(void,
+ PromisePushResourcesMock,
+ (const std::string&,
+ const std::list<QuicBackendResponse::ServerPushInfo>&,
+ QuicStreamId,
+ const spdy::SpdyStreamPrecedence&,
+ const spdy::SpdyHeaderBlock&),
+ ());
using QuicSession::ActivateStream;
- MOCK_METHOD1(OnStopSendingReceived, void(const QuicStopSendingFrame& frame));
-
QuicConsumedData ConsumeData(
QuicStreamId id,
size_t write_length,
