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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_network_transaction_unittest.cc

Issue 804813010: QUIC - enabled FLAGS_allow_truncated_connection_ids_for_quic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enable FLAGS_allow_truncated_connection_ids_for_quic by default Created 5 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
« no previous file with comments | « net/quic/quic_http_stream_test.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_network_transaction_unittest.cc
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index ab926d5dfd8dcba43cbcdc91b1c6e4410ff08931..320141ab837fccb5458ea4d901bca7f924348278 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -142,8 +142,10 @@ class QuicNetworkTransactionTest
scoped_ptr<QuicEncryptedPacket> ConstructAckPacket(
QuicPacketSequenceNumber largest_received,
- QuicPacketSequenceNumber least_unacked) {
- return maker_.MakeAckPacket(2, largest_received, least_unacked, true);
+ QuicPacketSequenceNumber least_unacked,
+ QuicConnectionIdLength connection_id_length) {
+ return maker_.MakeAckPacket(2, connection_id_length, largest_received,
+ least_unacked, true);
}
SpdyHeaderBlock GetRequestHeaders(const std::string& method,
@@ -163,28 +165,32 @@ class QuicNetworkTransactionTest
bool fin,
QuicStreamOffset offset,
base::StringPiece data) {
- return maker_.MakeDataPacket(
- sequence_number, stream_id, should_include_version, fin, offset, data);
+ return maker_.MakeDataPacket(sequence_number, stream_id,
+ should_include_version, fin, offset, data);
}
scoped_ptr<QuicEncryptedPacket> ConstructRequestHeadersPacket(
QuicPacketSequenceNumber sequence_number,
QuicStreamId stream_id,
+ QuicConnectionIdLength connection_id_length,
bool should_include_version,
bool fin,
const SpdyHeaderBlock& headers) {
return maker_.MakeRequestHeadersPacket(
- sequence_number, stream_id, should_include_version, fin, headers);
+ sequence_number, stream_id, connection_id_length,
+ should_include_version, fin, headers);
}
scoped_ptr<QuicEncryptedPacket> ConstructResponseHeadersPacket(
QuicPacketSequenceNumber sequence_number,
QuicStreamId stream_id,
+ QuicConnectionIdLength connection_id_length,
bool should_include_version,
bool fin,
const SpdyHeaderBlock& headers) {
return maker_.MakeResponseHeadersPacket(
- sequence_number, stream_id, should_include_version, fin, headers);
+ sequence_number, stream_id, connection_id_length,
+ should_include_version, fin, headers);
}
void CreateSession() {
@@ -331,15 +337,15 @@ TEST_P(QuicNetworkTransactionTest, ForceQuic) {
HostPortPair::FromString("www.google.com:80");
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
Ryan Hamilton 2015/01/08 18:35:44 As discussed offline, we should probably change th
ramant (doing other things) 2015/01/08 22:21:15 Done.
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -393,15 +399,15 @@ TEST_P(QuicNetworkTransactionTest, QuicProxy) {
ProxyService::CreateFixedFromPacResult("QUIC myproxy:70"));
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -469,15 +475,15 @@ TEST_P(QuicNetworkTransactionTest, UseAlternateProtocolForQuic) {
socket_factory_.AddSocketDataProvider(&http_data);
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -506,15 +512,15 @@ TEST_P(QuicNetworkTransactionTest, UseAlternateProtocolProbabilityForQuic) {
socket_factory_.AddSocketDataProvider(&http_data);
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -590,15 +596,15 @@ TEST_P(QuicNetworkTransactionTest, UseAlternateProtocolForQuicForHttps) {
socket_factory_.AddSocketDataProvider(&http_data);
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -673,15 +679,15 @@ TEST_P(QuicNetworkTransactionTest, HungAlternateProtocol) {
TEST_P(QuicNetworkTransactionTest, ZeroRTTWithHttpRace) {
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_8BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_8BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_8BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -697,15 +703,15 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithHttpRace) {
TEST_P(QuicNetworkTransactionTest, ZeroRTTWithNoHttpRace) {
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_8BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_8BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_8BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -771,15 +777,15 @@ TEST_P(QuicNetworkTransactionTest, ZeroRTTWithProxy) {
TEST_P(QuicNetworkTransactionTest, ZeroRTTWithConfirmationRequired) {
MockQuicData mock_quic_data;
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddRead(
- ConstructResponseHeadersPacket(1, kClientDataStreamId1, false, false,
- GetResponseHeaders("200 OK")));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddRead(ConstructResponseHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, false, false,
+ GetResponseHeaders("200 OK")));
mock_quic_data.AddRead(
ConstructDataPacket(2, kClientDataStreamId1, false, true, 0, "hello!"));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddRead(SYNCHRONOUS, 0); // EOF
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 1);
@@ -999,10 +1005,10 @@ TEST_P(QuicNetworkTransactionTest, BrokenAlternateProtocolOnConnectFailure) {
TEST_P(QuicNetworkTransactionTest, ConnectionCloseDuringConnect) {
MockQuicData mock_quic_data;
mock_quic_data.AddRead(ConstructConnectionClosePacket(1));
- mock_quic_data.AddWrite(
- ConstructRequestHeadersPacket(1, kClientDataStreamId1, true, true,
- GetRequestHeaders("GET", "http", "/")));
- mock_quic_data.AddWrite(ConstructAckPacket(2, 1));
+ mock_quic_data.AddWrite(ConstructRequestHeadersPacket(
+ 1, kClientDataStreamId1, PACKET_0BYTE_CONNECTION_ID, true, true,
+ GetRequestHeaders("GET", "http", "/")));
+ mock_quic_data.AddWrite(ConstructAckPacket(2, 1, PACKET_0BYTE_CONNECTION_ID));
mock_quic_data.AddDelayedSocketDataToFactory(&socket_factory_, 0);
// When the QUIC connection fails, we will try the request again over HTTP.
« no previous file with comments | « net/quic/quic_http_stream_test.cc ('k') | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698