Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1223)

Unified Diff: net/tools/quic/quic_dispatcher_test.cc

Issue 2846013002: Remove unused packet_number parameter from multiple functions in QUIC. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_time_wait_list_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_dispatcher_test.cc
diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index 926b2208cfb2534e15ecf8d0a03f8ac1c9c7c28d..52943192f55674639a7025b16a27cdbde2b26343 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -449,8 +449,7 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
// Dispatcher forwards subsequent packets for this connection_id to the time
// wait list manager.
- EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, _, connection_id, _, _))
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
.Times(1);
EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
.Times(0);
@@ -465,8 +464,7 @@ TEST_F(QuicDispatcherTest, NoVersionPacketToTimeWaitListManager) {
// Dispatcher forwards all packets for this connection_id to the time wait
// list manager.
EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
- EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, _, connection_id, _, _))
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
.Times(1);
EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
.Times(1);
@@ -481,7 +479,7 @@ TEST_F(QuicDispatcherTest, ProcessPacketWithZeroPort) {
// dispatcher_ should drop this packet.
EXPECT_CALL(*dispatcher_, CreateQuicSession(1, client_address)).Times(0);
- EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _)).Times(0);
EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
.Times(0);
ProcessPacket(client_address, 1, true, SerializeCHLO());
@@ -518,8 +516,7 @@ TEST_F(QuicDispatcherTest, TooBigSeqNoPacketToTimeWaitListManager) {
// Dispatcher forwards this packet for this connection_id to the time wait
// list manager.
EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
- EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, _, connection_id, _, _))
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
.Times(1);
EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
.Times(1);
@@ -752,8 +749,7 @@ TEST_P(QuicDispatcherStatelessRejectTest, ParameterizedBasicTest) {
time_wait_list_manager_->IsConnectionIdInTimeWait(connection_id));
if (ExpectStatelessReject()) {
// The second packet will be processed on the time-wait list.
- EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, _, connection_id, _, _))
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
.Times(1);
} else {
// The second packet will trigger a packet-validation
@@ -864,8 +860,7 @@ TEST_F(QuicDispatcherTestStrayPacketConnectionId,
QuicConnectionId connection_id = 1;
// Dispatcher drops this packet.
EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
- EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, _, connection_id, _, _))
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
.Times(0);
EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
.Times(0);
@@ -1350,7 +1345,7 @@ TEST_P(BufferedPacketStoreTest, ReceiveCHLOAfterExpiration) {
// New arrived CHLO will be dropped because this connection is in time wait
// list.
ASSERT_TRUE(time_wait_list_manager_->IsConnectionIdInTimeWait(conn_id));
- EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, conn_id, _, _));
+ EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, conn_id, _));
ProcessPacket(client_address, conn_id, true, SerializeFullCHLO());
}
@@ -1708,13 +1703,13 @@ TEST_F(AsyncGetProofTest, BasicReject) {
EXPECT_CALL(*time_wait_list_manager_,
AddConnectionIdToTimeWait(conn_id, _, true, _));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id, _, _));
+ ProcessPacket(_, client_addr_, conn_id, _));
EXPECT_CALL(check, Call(2));
EXPECT_CALL(*dispatcher_, CreateQuicSession(conn_id, client_addr_))
.Times(0);
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id, _, _));
+ ProcessPacket(_, client_addr_, conn_id, _));
}
// Send a CHLO that the StatelessRejector will reject.
@@ -1830,11 +1825,11 @@ TEST_F(AsyncGetProofTest, MultipleReject) {
EXPECT_CALL(*time_wait_list_manager_,
AddConnectionIdToTimeWait(conn_id_2, _, true, _));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id_2, _, _));
+ ProcessPacket(_, client_addr_, conn_id_2, _));
EXPECT_CALL(check, Call(2));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id_2, _, _));
+ ProcessPacket(_, client_addr_, conn_id_2, _));
EXPECT_CALL(check, Call(3));
EXPECT_CALL(*dispatcher_,
@@ -1844,7 +1839,7 @@ TEST_F(AsyncGetProofTest, MultipleReject) {
EXPECT_CALL(*time_wait_list_manager_,
AddConnectionIdToTimeWait(conn_id_1, _, true, _));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id_1, _, _));
+ ProcessPacket(_, client_addr_, conn_id_1, _));
}
// Send a CHLO that the StatelessRejector will reject.
@@ -1903,7 +1898,7 @@ TEST_F(AsyncGetProofTest, MultipleIdenticalReject) {
EXPECT_CALL(*time_wait_list_manager_,
AddConnectionIdToTimeWait(conn_id_1, _, true, _));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id_1, _, _));
+ ProcessPacket(_, client_addr_, conn_id_1, _));
}
// Send a CHLO that the StatelessRejector will reject.
@@ -1943,7 +1938,7 @@ TEST_F(AsyncGetProofTest, BufferTimeout) {
EXPECT_CALL(check, Call(2));
EXPECT_CALL(*time_wait_list_manager_,
- ProcessPacket(_, client_addr_, conn_id, _, _));
+ ProcessPacket(_, client_addr_, conn_id, _));
EXPECT_CALL(*dispatcher_, CreateQuicSession(conn_id, client_addr_))
.Times(0);
}
« no previous file with comments | « net/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_time_wait_list_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698