net/tools/quic/quic_time_wait_list_manager_test.cc - Issue 1660533002: Landing Recent QUIC changes until 01/26/2016 18:14 UTC

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

Issue 1660533002: Landing Recent QUIC changes until 01/26/2016 18:14 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

Index: net/tools/quic/quic_time_wait_list_manager_test.cc

diff --git a/net/tools/quic/quic_time_wait_list_manager_test.cc b/net/tools/quic/quic_time_wait_list_manager_test.cc

index 1030182432e4102a6790318a9a29a4068f8b2e5a..104054b4be1fcebc1748a7fbbd4c4f369463f6df 100644

--- a/net/tools/quic/quic_time_wait_list_manager_test.cc

+++ b/net/tools/quic/quic_time_wait_list_manager_test.cc

@@ -229,9 +229,9 @@ TEST_F(QuicTimeWaitListManagerTest, SendConnectionClose) {

/*connection_rejected_statelessly=*/false,

&termination_packets);

const int kRandomSequenceNumber = 1;

- EXPECT_CALL(writer_,

- WritePacket(_, kConnectionCloseLength,

- server_address_.address().bytes(), client_address_))

+ EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,

+ server_address_.address().bytes(),

+ client_address_, _))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));

ProcessPacket(connection_id_, kRandomSequenceNumber);

@@ -249,9 +249,9 @@ TEST_F(QuicTimeWaitListManagerTest, SendTwoConnectionCloses) {

/*connection_rejected_statelessly=*/false,

&termination_packets);

const int kRandomSequenceNumber = 1;

- EXPECT_CALL(writer_,

- WritePacket(_, kConnectionCloseLength,

- server_address_.address().bytes(), client_address_))

+ EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,

+ server_address_.address().bytes(),

+ client_address_, _))

.Times(2)

.WillRepeatedly(Return(WriteResult(WRITE_STATUS_OK, 1)));

@@ -263,7 +263,7 @@ TEST_F(QuicTimeWaitListManagerTest, SendPublicReset) {

AddConnectionId(connection_id_);

const int kRandomSequenceNumber = 1;

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.With(Args<0, 1>(

PublicResetPacketEq(connection_id_, kRandomSequenceNumber)))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, 0)));

@@ -277,7 +277,7 @@ TEST_F(QuicTimeWaitListManagerTest, SendPublicResetWithExponentialBackOff) {

EXPECT_EQ(1u, time_wait_list_manager_.num_connections());

for (int packet_number = 1; packet_number < 101; ++packet_number) {

if ((packet_number & (packet_number - 1)) == 0) {

- EXPECT_CALL(writer_, WritePacket(_, _, _, _))

+ EXPECT_CALL(writer_, WritePacket(_, _, _, _, _))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));

}

ProcessPacket(connection_id_, packet_number);

@@ -298,7 +298,7 @@ TEST_F(QuicTimeWaitListManagerTest, NoPublicResetForStatelessConnections) {

const int kRandomSequenceNumber = 1;

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));

ProcessPacket(connection_id_, kRandomSequenceNumber);

@@ -365,14 +365,14 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {

ConstructEncryptedPacket(connection_id, packet_number));

// Let first write through.

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.With(Args<0, 1>(PublicResetPacketEq(connection_id, packet_number)))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, packet->length())));

ProcessPacket(connection_id, packet_number);

// write block for the next packet.

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.With(Args<0, 1>(PublicResetPacketEq(connection_id, packet_number)))

.WillOnce(DoAll(Assign(&writer_is_blocked_, true),

Return(WriteResult(WRITE_STATUS_BLOCKED, EAGAIN))));

@@ -389,7 +389,7 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {

QuicPacketNumber other_packet_number = 23423;

scoped_ptr<QuicEncryptedPacket> other_packet(

ConstructEncryptedPacket(other_connection_id, other_packet_number));

- EXPECT_CALL(writer_, WritePacket(_, _, _, _)).Times(0);

+ EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)).Times(0);

EXPECT_CALL(visitor_, OnWriteBlocked(&time_wait_list_manager_));

ProcessPacket(other_connection_id, other_packet_number);

EXPECT_EQ(2u, time_wait_list_manager_.num_connections());

@@ -397,11 +397,11 @@ TEST_F(QuicTimeWaitListManagerTest, SendQueuedPackets) {

// Now expect all the write blocked public reset packets to be sent again.

writer_is_blocked_ = false;

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.With(Args<0, 1>(PublicResetPacketEq(connection_id, packet_number)))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, packet->length())));

EXPECT_CALL(writer_, WritePacket(_, _, server_address_.address().bytes(),

- client_address_))

+ client_address_, _))

.With(Args<0, 1>(

PublicResetPacketEq(other_connection_id, other_packet_number)))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, other_packet->length())));

@@ -450,9 +450,9 @@ TEST_F(QuicTimeWaitListManagerTest, AddConnectionIdTwice) {

EXPECT_TRUE(IsConnectionIdInTimeWait(connection_id_));

EXPECT_EQ(1u, time_wait_list_manager_.num_connections());

- EXPECT_CALL(writer_,

- WritePacket(_, kConnectionCloseLength,

- server_address_.address().bytes(), client_address_))

+ EXPECT_CALL(writer_, WritePacket(_, kConnectionCloseLength,

+ server_address_.address().bytes(),

+ client_address_, _))

.WillOnce(Return(WriteResult(WRITE_STATUS_OK, 1)));

const int kRandomSequenceNumber = 1;

« no previous file with comments | « net/tools/quic/quic_time_wait_list_manager.cc ('k') | net/tools/quic/test_tools/limited_mtu_test_writer.h » ('j') | no next file with comments »