net/quic/core/quic_connection_test.cc - Issue 2825083003: Landing Recent QUIC changes until Mon Apr 17 2017

Unified Diff: net/quic/core/quic_connection_test.cc

Issue 2825083003: Landing Recent QUIC changes until Mon Apr 17 2017 (Closed)

Patch Set: Format 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

Index: net/quic/core/quic_connection_test.cc

diff --git a/net/quic/core/quic_connection_test.cc b/net/quic/core/quic_connection_test.cc

index 144f6744650cd40528db1d7202c704ff1ae64264..76cf9e46c2ef9496d0b1022e522d85095c927174 100644

--- a/net/quic/core/quic_connection_test.cc

+++ b/net/quic/core/quic_connection_test.cc

@@ -17,10 +17,10 @@

#include "net/quic/core/crypto/null_encrypter.h"

#include "net/quic/core/crypto/quic_decrypter.h"

#include "net/quic/core/crypto/quic_encrypter.h"

-#include "net/quic/core/quic_flags.h"

#include "net/quic/core/quic_packets.h"

#include "net/quic/core/quic_simple_buffer_allocator.h"

#include "net/quic/core/quic_utils.h"

+#include "net/quic/platform/api/quic_flags.h"

#include "net/quic/platform/api/quic_logging.h"

#include "net/quic/platform/api/quic_reference_counted.h"

#include "net/quic/platform/api/quic_str_cat.h"

@@ -59,7 +59,6 @@ namespace {

const char data1[] = "foo";

const char data2[] = "bar";

-const bool kFin = true;

const bool kHasStopWaiting = true;

const int kDefaultRetransmissionTimeMs = 500;

@@ -390,6 +389,10 @@ class TestPacketWriter : public QuicPacketWriter {

return framer_.ping_frames();

}

+ const std::vector<QuicPaddingFrame>& padding_frames() const {

+ return framer_.padding_frames();

+ }

size_t last_packet_size() { return last_packet_size_; }

const QuicVersionNegotiationPacket* version_negotiation_packet() {

@@ -511,24 +514,24 @@ class TestConnection : public QuicConnection {

QuicStreamId id,

QuicStringPiece data,

QuicStreamOffset offset,

- bool fin,

+ StreamSendingState state,

QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener) {

if (id != kCryptoStreamId && this->encryption_level() == ENCRYPTION_NONE) {

this->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);

}

struct iovec iov;

QuicIOVector data_iov(MakeIOVector(data, &iov));

- return QuicConnection::SendStreamData(id, data_iov, offset, fin,

+ return QuicConnection::SendStreamData(id, data_iov, offset, state,

std::move(ack_listener));

}

QuicConsumedData SendStreamData3() {

- return SendStreamDataWithString(kClientDataStreamId1, "food", 0, !kFin,

+ return SendStreamDataWithString(kClientDataStreamId1, "food", 0, NO_FIN,

nullptr);

}

QuicConsumedData SendStreamData5() {

- return SendStreamDataWithString(kClientDataStreamId2, "food2", 0, !kFin,

+ return SendStreamDataWithString(kClientDataStreamId2, "food2", 0, NO_FIN,

nullptr);

}

@@ -544,7 +547,8 @@ class TestConnection : public QuicConnection {

// split needlessly across packet boundaries). As a result, we have separate

// tests for some cases for this stream.

QuicConsumedData SendCryptoStreamData() {

- return SendStreamDataWithString(kCryptoStreamId, "chlo", 0, !kFin, nullptr);

+ return SendStreamDataWithString(kCryptoStreamId, "chlo", 0, NO_FIN,

+ nullptr);

}

void set_version(QuicVersion version) {

@@ -885,12 +889,12 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {

QuicByteCount SendStreamDataToPeer(QuicStreamId id,

QuicStringPiece data,

QuicStreamOffset offset,

- bool fin,

+ StreamSendingState state,

QuicPacketNumber* last_packet) {

QuicByteCount packet_size;

EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))

.WillOnce(DoAll(SaveArg<3>(&packet_size), Return(true)));

- connection_.SendStreamDataWithString(id, data, offset, fin, nullptr);

+ connection_.SendStreamDataWithString(id, data, offset, state, nullptr);

if (last_packet != nullptr) {

*last_packet = creator_->packet_number();

}

@@ -1418,8 +1422,8 @@ TEST_P(QuicConnectionTest, OutOfOrderReceiptCausesAckSend) {

TEST_P(QuicConnectionTest, OutOfOrderAckReceiptCausesNoAck) {

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

- SendStreamDataToPeer(1, "foo", 0, !kFin, nullptr);

- SendStreamDataToPeer(1, "bar", 3, !kFin, nullptr);

+ SendStreamDataToPeer(1, "foo", 0, NO_FIN, nullptr);

+ SendStreamDataToPeer(1, "bar", 3, NO_FIN, nullptr);

EXPECT_EQ(2u, writer_->packets_write_attempts());

QuicAckFrame ack1 = InitAckFrame(1);

@@ -1441,7 +1445,7 @@ TEST_P(QuicConnectionTest, AckReceiptCausesAckSend) {

EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))

.WillOnce(

DoAll(SaveArg<2>(&original), SaveArg<3>(&packet_size), Return(true)));

- connection_.SendStreamDataWithString(3, "foo", 0, !kFin, nullptr);

+ connection_.SendStreamDataWithString(3, "foo", 0, NO_FIN, nullptr);

QuicAckFrame frame = InitAckFrame(original);

NackPacket(original, &frame);

// First nack triggers early retransmit.

@@ -1468,7 +1472,7 @@ TEST_P(QuicConnectionTest, AckReceiptCausesAckSend) {

// indicate the high water mark needs to be raised.

EXPECT_CALL(*send_algorithm_,

OnPacketSent(_, _, _, _, HAS_RETRANSMITTABLE_DATA));

- connection_.SendStreamDataWithString(3, "foo", 3, !kFin, nullptr);

+ connection_.SendStreamDataWithString(3, "foo", 3, NO_FIN, nullptr);

// No ack sent.

EXPECT_EQ(1u, writer_->frame_count());

EXPECT_EQ(1u, writer_->stream_frames().size());

@@ -1478,7 +1482,7 @@ TEST_P(QuicConnectionTest, AckReceiptCausesAckSend) {

ProcessAckPacket(&frame2);

EXPECT_CALL(*send_algorithm_,

OnPacketSent(_, _, _, _, HAS_RETRANSMITTABLE_DATA));

- connection_.SendStreamDataWithString(3, "foo", 3, !kFin, nullptr);

+ connection_.SendStreamDataWithString(3, "foo", 3, NO_FIN, nullptr);

// Ack bundled.

if (GetParam().no_stop_waiting) {

EXPECT_EQ(2u, writer_->frame_count());

@@ -1497,7 +1501,7 @@ TEST_P(QuicConnectionTest, AckReceiptCausesAckSend) {

TEST_P(QuicConnectionTest, 20AcksCausesAckSend) {

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

- SendStreamDataToPeer(1, "foo", 0, !kFin, nullptr);

+ SendStreamDataToPeer(1, "foo", 0, NO_FIN, nullptr);

QuicAlarm* ack_alarm = QuicConnectionPeer::GetAckAlarm(&connection_);

// But an ack with no missing packets will not send an ack.

@@ -1516,9 +1520,9 @@ TEST_P(QuicConnectionTest, 20AcksCausesAckSend) {

TEST_P(QuicConnectionTest, LeastUnackedLower) {

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

- SendStreamDataToPeer(1, "foo", 0, !kFin, nullptr);

- SendStreamDataToPeer(1, "bar", 3, !kFin, nullptr);

- SendStreamDataToPeer(1, "eep", 6, !kFin, nullptr);

+ SendStreamDataToPeer(1, "foo", 0, NO_FIN, nullptr);

+ SendStreamDataToPeer(1, "bar", 3, NO_FIN, nullptr);

+ SendStreamDataToPeer(1, "eep", 6, NO_FIN, nullptr);

// Start out saying the least unacked is 2.

QuicPacketCreatorPeer::SetPacketNumber(&peer_creator_, 5);

@@ -1553,7 +1557,7 @@ TEST_P(QuicConnectionTest, TooManySentPackets) {

const int num_packets = kMaxTrackedPackets + 100;

for (int i = 0; i < num_packets; ++i) {

- SendStreamDataToPeer(1, "foo", 3 * i, !kFin, nullptr);

+ SendStreamDataToPeer(1, "foo", 3 * i, NO_FIN, nullptr);

}

// Ack packet 1, which leaves more than the limit outstanding.

@@ -1579,9 +1583,9 @@ TEST_P(QuicConnectionTest, TooManyReceivedPackets) {

TEST_P(QuicConnectionTest, LargestObservedLower) {

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

- SendStreamDataToPeer(1, "foo", 0, !kFin, nullptr);

- SendStreamDataToPeer(1, "bar", 3, !kFin, nullptr);

- SendStreamDataToPeer(1, "eep", 6, !kFin, nullptr);

+ SendStreamDataToPeer(1, "foo", 0, NO_FIN, nullptr);

+ SendStreamDataToPeer(1, "bar", 3, NO_FIN, nullptr);

+ SendStreamDataToPeer(1, "eep", 6, NO_FIN, nullptr);

EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _, _));

// Start out saying the largest observed is 2.

@@ -1619,7 +1623,7 @@ TEST_P(QuicConnectionTest, AckAll) {

TEST_P(QuicConnectionTest, BasicSending) {

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

QuicPacketNumber last_packet;

- SendStreamDataToPeer(1, "foo", 0, !kFin, &last_packet); // Packet 1

+ SendStreamDataToPeer(1, "foo", 0, NO_FIN, &last_packet); // Packet 1

EXPECT_EQ(1u, last_packet);

SendAckPacketToPeer(); // Packet 2

@@ -1638,7 +1642,7 @@ TEST_P(QuicConnectionTest, BasicSending) {

EXPECT_EQ(1u, least_unacked());

}

- SendStreamDataToPeer(1, "bar", 3, !kFin, &last_packet); // Packet 4

+ SendStreamDataToPeer(1, "bar", 3, NO_FIN, &last_packet); // Packet 4

EXPECT_EQ(4u, last_packet);

SendAckPacketToPeer(); // Packet 5

if (GetParam().no_stop_waiting) {

@@ -1691,7 +1695,7 @@ TEST_P(QuicConnectionTest, BasicSending) {

}

// But if we send more data it should.

- SendStreamDataToPeer(1, "eep", 6, !kFin, &last_packet); // Packet 8

+ SendStreamDataToPeer(1, "eep", 6, NO_FIN, &last_packet); // Packet 8

EXPECT_EQ(8u, last_packet);

SendAckPacketToPeer(); // Packet 9

if (GetParam().no_stop_waiting) {

@@ -1715,7 +1719,7 @@ TEST_P(QuicConnectionTest, RecordSentTimeBeforePacketSent) {

// First send without any pause and check the result.

QuicTime expected_recorded_send_time = clock_.Now();

- connection_.SendStreamDataWithString(1, "foo", 0, !kFin, nullptr);

+ connection_.SendStreamDataWithString(1, "foo", 0, NO_FIN, nullptr);

EXPECT_EQ(expected_recorded_send_time, actual_recorded_send_time)

<< "Expected time = " << expected_recorded_send_time.ToDebuggingValue()

<< ". Actual time = " << actual_recorded_send_time.ToDebuggingValue();

@@ -1729,7 +1733,7 @@ TEST_P(QuicConnectionTest, RecordSentTimeBeforePacketSent) {

EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))

.WillOnce(DoAll(SaveArg<0>(&actual_recorded_send_time), Return(true)));

- connection_.SendStreamDataWithString(2, "baz", 0, !kFin, nullptr);

+ connection_.SendStreamDataWithString(2, "baz", 0, NO_FIN, nullptr);

EXPECT_EQ(expected_recorded_send_time, actual_recorded_send_time)

<< "Expected time = " << expected_recorded_send_time.ToDebuggingValue()

<< ". Actual time = " << actual_recorded_send_time.ToDebuggingValue();

@@ -1776,8 +1780,9 @@ TEST_P(QuicConnectionTest, FramePackingNonCryptoThenCrypto) {

EXPECT_FALSE(connection_.HasQueuedData());

// Parse the last packet and ensure it's the crypto stream frame.

- EXPECT_EQ(1u, writer_->frame_count());

+ EXPECT_EQ(2u, writer_->frame_count());

ASSERT_EQ(1u, writer_->stream_frames().size());

+ ASSERT_EQ(1u, writer_->padding_frames().size());

EXPECT_EQ(kCryptoStreamId, writer_->stream_frames()[0]->stream_id);

}

@@ -1847,15 +1852,16 @@ TEST_P(QuicConnectionTest, FramePackingSendv) {

iov[0].iov_len = 2;

iov[1].iov_base = data + 2;

iov[1].iov_len = 2;

- connection_.SendStreamData(1, QuicIOVector(iov, 2, 4), 0, !kFin, nullptr);

+ connection_.SendStreamData(1, QuicIOVector(iov, 2, 4), 0, NO_FIN, nullptr);

EXPECT_EQ(0u, connection_.NumQueuedPackets());

EXPECT_FALSE(connection_.HasQueuedData());

// Parse the last packet and ensure multiple iovector blocks have

// been packed into a single stream frame from one stream.

- EXPECT_EQ(1u, writer_->frame_count());

+ EXPECT_EQ(2u, writer_->frame_count());

EXPECT_EQ(1u, writer_->stream_frames().size());

+ EXPECT_EQ(1u, writer_->padding_frames().size());

QuicStreamFrame* frame = writer_->stream_frames()[0].get();

EXPECT_EQ(1u, frame->stream_id);

EXPECT_EQ("ABCD", QuicStringPiece(frame->data_buffer, frame->data_length));

@@ -1872,7 +1878,7 @@ TEST_P(QuicConnectionTest, FramePackingSendvQueued) {

iov[0].iov_len = 2;

iov[1].iov_base = data + 2;

iov[1].iov_len = 2;

- connection_.SendStreamData(1, QuicIOVector(iov, 2, 4), 0, !kFin, nullptr);

+ connection_.SendStreamData(1, QuicIOVector(iov, 2, 4), 0, NO_FIN, nullptr);

EXPECT_EQ(1u, connection_.NumQueuedPackets());

EXPECT_TRUE(connection_.HasQueuedData());

@@ -1883,8 +1889,9 @@ TEST_P(QuicConnectionTest, FramePackingSendvQueued) {

EXPECT_EQ(0u, connection_.NumQueuedPackets());

// Parse the last packet and ensure it's one stream frame from one stream.

- EXPECT_EQ(1u, writer_->frame_count());

+ EXPECT_EQ(2u, writer_->frame_count());

EXPECT_EQ(1u, writer_->stream_frames().size());

+ EXPECT_EQ(1u, writer_->padding_frames().size());

EXPECT_EQ(1u, writer_->stream_frames()[0]->stream_id);

}

@@ -1893,7 +1900,7 @@ TEST_P(QuicConnectionTest, SendingZeroBytes) {

// Send a zero byte write with a fin using writev.

EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _));

QuicIOVector empty_iov(nullptr, 0, 0);

- connection_.SendStreamData(kHeadersStreamId, empty_iov, 0, kFin, nullptr);

+ connection_.SendStreamData(kHeadersStreamId, empty_iov, 0, FIN, nullptr);

EXPECT_EQ(0u, connection_.NumQueuedPackets());

EXPECT_FALSE(connection_.HasQueuedData());

@@ -1926,7 +1933,7 @@ TEST_P(QuicConnectionTest, LargeSendWithPendingAck) {

iov.iov_len = len;

QuicIOVector iovector(&iov, 1, len);

QuicConsumedData consumed =

- connection_.SendStreamData(kHeadersStreamId, iovector, 0, true, nullptr);

+ connection_.SendStreamData(kHeadersStreamId, iovector, 0, FIN, nullptr);

EXPECT_EQ(len, consumed.bytes_consumed);

EXPECT_TRUE(consumed.fin_consumed);

EXPECT_EQ(0u, connection_.NumQueuedPackets());

@@ -1971,10 +1978,10 @@ TEST_P(QuicConnectionTest, OnCanWrite) {

TEST_P(QuicConnectionTest, RetransmitOnNack) {

QuicPacketNumber last_packet;

QuicByteCount second_packet_size;

- SendStreamDataToPeer(3, "foo", 0, !kFin, &last_packet); // Packet 1

+ SendStreamDataToPeer(3, "foo", 0, NO_FIN, &last_packet); // Packet 1

second_packet_size =

- SendStreamDataToPeer(3, "foos", 3, !kFin, &last_packet); // Packet 2

- SendStreamDataToPeer(3, "fooos", 7, !kFin, &last_packet); // Packet 3

+ SendStreamDataToPeer(3, "foos", 3, NO_FIN, &last_packet); // Packet 2

+ SendStreamDataToPeer(3, "fooos", 7, NO_FIN, &last_packet); // Packet 3

EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));

@@ -2002,7 +2009,7 @@ TEST_P(QuicConnectionTest, DoNotSendQueuedPacketForResetStream) {

BlockOnNextWrite();

QuicStreamId stream_id = 2;

- connection_.SendStreamDataWithString(stream_id, "foo", 0, !kFin, nullptr);

+ connection_.SendStreamDataWithString(stream_id, "foo", 0, NO_FIN, nullptr);

// Now that there is a queued packet, reset the stream.

connection_.SendRstStream(stream_id, QUIC_ERROR_PROCESSING_STREAM, 14);

@@ -2020,7 +2027,7 @@ TEST_P(QuicConnectionTest, SendQueuedPacketForQuicRstStreamNoError) {

BlockOnNextWrite();

QuicStreamId stream_id = 2;

- connection_.SendStreamDataWithString(stream_id, "foo", 0, !kFin, nullptr);

+ connection_.SendStreamDataWithString(stream_id, "foo", 0, NO_FIN, nullptr);

// Now that there is a queued packet, reset the stream.

connection_.SendRstStream(stream_id, QUIC_STREAM_NO_ERROR, 14);

@@ -2037,9 +2044,9 @@ TEST_P(QuicConnectionTest, SendQueuedPacketForQuicRstStreamNoError) {

TEST_P(QuicConnectionTest, DoNotRetransmitForResetStreamOnNack) {

QuicStreamId stream_id = 2;

QuicPacketNumber last_packet;

- SendStreamDataToPeer(stream_id, "foo", 0, !kFin, &last_packet);

- SendStreamDataToPeer(stream_id, "foos", 3, !kFin, &last_packet);

- SendStreamDataToPeer(stream_id, "fooos", 7, !kFin, &last_packet);

+ SendStreamDataToPeer(stream_id, "foo", 0, NO_FIN, &last_packet);

+ SendStreamDataToPeer(stream_id, "foos", 3, NO_FIN, &last_packet);

+ SendStreamDataToPeer(stream_id, "fooos", 7, NO_FIN, &last_packet);

EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _)).Times(1);

connection_.SendRstStream(stream_id, QUIC_ERROR_PROCESSING_STREAM, 14);

@@ -2057,9 +2064,9 @@ TEST_P(QuicConnectionTest, DoNotRetransmitForResetStreamOnNack) {

TEST_P(QuicConnectionTest, RetransmitForQuicRstStreamNoErrorOnNack) {