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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/chromium/quic_chromium_client_session_test.cc

Issue 2856243003: Revert of Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000 (Closed)
Patch Set: Created 3 years, 7 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/chromium/quic_chromium_client_session.cc ('k') | net/quic/chromium/quic_chromium_client_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/chromium/quic_chromium_client_session_test.cc
diff --git a/net/quic/chromium/quic_chromium_client_session_test.cc b/net/quic/chromium/quic_chromium_client_session_test.cc
index 50f37a3df00fe9455870d784121d8b044034ae73..2ac521305b457e265ea593dcd845e8d1fbf41ac8 100644
--- a/net/quic/chromium/quic_chromium_client_session_test.cc
+++ b/net/quic/chromium/quic_chromium_client_session_test.cc
@@ -157,14 +157,6 @@
return writer.release();
}
- QuicStreamId GetNthClientInitiatedStreamId(int n) {
- return QuicSpdySessionPeer::GetNthClientInitiatedStreamId(*session_, n);
- }
-
- QuicStreamId GetNthServerInitiatedStreamId(int n) {
- return QuicSpdySessionPeer::GetNthServerInitiatedStreamId(*session_, n);
- }
-
QuicCryptoClientConfig crypto_config_;
TestNetLog net_log_;
BoundTestNetLog bound_test_net_log_;
@@ -276,8 +268,8 @@
TEST_P(QuicChromiumClientSessionTest, CancelStreamRequestBeforeRelease) {
MockQuicData quic_data;
quic_data.AddWrite(client_maker_.MakeInitialSettingsPacket(1, nullptr));
- quic_data.AddWrite(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_STREAM_CANCELLED));
+ quic_data.AddWrite(client_maker_.MakeRstPacket(2, true, kClientDataStreamId1,
+ QUIC_STREAM_CANCELLED));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -300,8 +292,8 @@
TEST_P(QuicChromiumClientSessionTest, AsyncStreamRequest) {
MockQuicData quic_data;
quic_data.AddWrite(client_maker_.MakeInitialSettingsPacket(1, nullptr));
- quic_data.AddWrite(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ quic_data.AddWrite(client_maker_.MakeRstPacket(2, true, kClientDataStreamId1,
+ QUIC_RST_ACKNOWLEDGEMENT));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -324,8 +316,7 @@
ASSERT_EQ(ERR_IO_PENDING, stream_request->StartRequest(callback.callback()));
// Close a stream and ensure the stream request completes.
- QuicRstStreamFrame rst(GetNthClientInitiatedStreamId(0),
- QUIC_STREAM_CANCELLED, 0);
+ QuicRstStreamFrame rst(kClientDataStreamId1, QUIC_STREAM_CANCELLED, 0);
session_->OnRstStream(rst);
ASSERT_TRUE(callback.have_result());
EXPECT_THAT(callback.WaitForResult(), IsOk());
@@ -339,8 +330,8 @@
TEST_P(QuicChromiumClientSessionTest, CancelPendingStreamRequest) {
MockQuicData quic_data;
quic_data.AddWrite(client_maker_.MakeInitialSettingsPacket(1, nullptr));
- quic_data.AddWrite(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ quic_data.AddWrite(client_maker_.MakeRstPacket(2, true, kClientDataStreamId1,
+ QUIC_RST_ACKNOWLEDGEMENT));
quic_data.AddRead(ASYNC, ERR_IO_PENDING);
quic_data.AddRead(ASYNC, OK); // EOF
quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -366,8 +357,7 @@
stream_request.reset();
// Close a stream and ensure that no new stream is created.
- QuicRstStreamFrame rst(GetNthClientInitiatedStreamId(0),
- QUIC_STREAM_CANCELLED, 0);
+ QuicRstStreamFrame rst(kClientDataStreamId1, QUIC_STREAM_CANCELLED, 0);
session_->OnRstStream(rst);
EXPECT_EQ(kMaxOpenStreams - 1, session_->GetNumOpenOutgoingStreams());
@@ -464,7 +454,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -503,7 +493,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthServerInitiatedStreamId(0), QUIC_PUSH_STREAM_TIMED_OUT));
+ 2, true, kServerDataStreamId1, QUIC_PUSH_STREAM_TIMED_OUT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -530,11 +520,11 @@
promise_headers[":path"] = "/pushed.jpg";
// Receive a PUSH PROMISE from the server.
- EXPECT_TRUE(session_->HandlePromised(
- stream->id(), GetNthServerInitiatedStreamId(0), promise_headers));
+ EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+ promise_headers));
QuicClientPromisedInfo* promised =
- session_->GetPromisedById(GetNthServerInitiatedStreamId(0));
+ session_->GetPromisedById(kServerDataStreamId1);
EXPECT_TRUE(promised);
// Fire alarm to time out the push stream.
alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
@@ -552,7 +542,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthServerInitiatedStreamId(0), QUIC_PUSH_STREAM_TIMED_OUT));
+ 2, true, kServerDataStreamId1, QUIC_PUSH_STREAM_TIMED_OUT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -578,19 +568,17 @@
promise_headers[":scheme"] = "https";
promise_headers[":path"] = "/pushed.jpg";
- session_->GetOrCreateStream(GetNthServerInitiatedStreamId(0));
+ session_->GetOrCreateStream(kServerDataStreamId1);
// Receive a PUSH PROMISE from the server.
- EXPECT_TRUE(session_->HandlePromised(
- stream->id(), GetNthServerInitiatedStreamId(0), promise_headers));
- session_->OnInitialHeadersComplete(GetNthServerInitiatedStreamId(0),
- SpdyHeaderBlock());
+ EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+ promise_headers));
+ session_->OnInitialHeadersComplete(kServerDataStreamId1, SpdyHeaderBlock());
// Read data on the pushed stream.
- QuicStreamFrame data(GetNthServerInitiatedStreamId(0), false, 0,
- QuicStringPiece("SP"));
+ QuicStreamFrame data(kServerDataStreamId1, false, 0, QuicStringPiece("SP"));
session_->OnStreamFrame(data);
QuicClientPromisedInfo* promised =
- session_->GetPromisedById(GetNthServerInitiatedStreamId(0));
+ session_->GetPromisedById(kServerDataStreamId1);
EXPECT_TRUE(promised);
// Fire alarm to time out the push stream.
alarm_factory_.FireAlarm(QuicClientPromisedInfoPeer::GetAlarm(promised));
@@ -605,7 +593,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
@@ -633,11 +621,11 @@
promise_headers[":path"] = "/pushed.jpg";
// Receive a PUSH PROMISE from the server.
- EXPECT_TRUE(session_->HandlePromised(
- stream->id(), GetNthServerInitiatedStreamId(0), promise_headers));
+ EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+ promise_headers));
QuicClientPromisedInfo* promised =
- session_->GetPromisedById(GetNthServerInitiatedStreamId(0));
+ session_->GetPromisedById(kServerDataStreamId1);
EXPECT_TRUE(promised);
// Initiate rendezvous.
@@ -651,7 +639,7 @@
EXPECT_TRUE(session_->GetPromisedByUrl(pushed_url.spec()));
// Reset the stream now before tear down.
- session_->CloseStream(GetNthClientInitiatedStreamId(0));
+ session_->CloseStream(kClientDataStreamId1);
}
TEST_P(QuicChromiumClientSessionTest, CancelPushBeforeReceivingResponse) {
@@ -660,7 +648,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthServerInitiatedStreamId(0), QUIC_STREAM_CANCELLED));
+ 2, true, kServerDataStreamId1, QUIC_STREAM_CANCELLED));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -687,11 +675,11 @@
promise_headers[":path"] = "/pushed.jpg";
// Receive a PUSH PROMISE from the server.
- EXPECT_TRUE(session_->HandlePromised(
- stream->id(), GetNthServerInitiatedStreamId(0), promise_headers));
+ EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+ promise_headers));
QuicClientPromisedInfo* promised =
- session_->GetPromisedById(GetNthServerInitiatedStreamId(0));
+ session_->GetPromisedById(kServerDataStreamId1);
EXPECT_TRUE(promised);
// Cancel the push before receiving the response to the pushed request.
GURL pushed_url("https://www.example.org/pushed.jpg");
@@ -710,7 +698,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthServerInitiatedStreamId(0), QUIC_STREAM_CANCELLED));
+ 2, true, kServerDataStreamId1, QUIC_STREAM_CANCELLED));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -736,19 +724,17 @@
promise_headers[":scheme"] = "https";
promise_headers[":path"] = "/pushed.jpg";
- session_->GetOrCreateStream(GetNthServerInitiatedStreamId(0));
+ session_->GetOrCreateStream(kServerDataStreamId1);
// Receive a PUSH PROMISE from the server.
- EXPECT_TRUE(session_->HandlePromised(
- stream->id(), GetNthServerInitiatedStreamId(0), promise_headers));
- session_->OnInitialHeadersComplete(GetNthServerInitiatedStreamId(0),
- SpdyHeaderBlock());
+ EXPECT_TRUE(session_->HandlePromised(stream->id(), kServerDataStreamId1,
+ promise_headers));
+ session_->OnInitialHeadersComplete(kServerDataStreamId1, SpdyHeaderBlock());
// Read data on the pushed stream.
- QuicStreamFrame data(GetNthServerInitiatedStreamId(0), false, 0,
- QuicStringPiece("SP"));
+ QuicStreamFrame data(kServerDataStreamId1, false, 0, QuicStringPiece("SP"));
session_->OnStreamFrame(data);
QuicClientPromisedInfo* promised =
- session_->GetPromisedById(GetNthServerInitiatedStreamId(0));
+ session_->GetPromisedById(kServerDataStreamId1);
EXPECT_TRUE(promised);
// Cancel the push after receiving data on the push stream.
GURL pushed_url("https://www.example.org/pushed.jpg");
@@ -766,7 +752,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
@@ -795,7 +781,7 @@
std::unique_ptr<QuicEncryptedPacket> settings_packet(
client_maker_.MakeInitialSettingsPacket(1, nullptr));
std::unique_ptr<QuicEncryptedPacket> client_rst(client_maker_.MakeRstPacket(
- 2, true, GetNthClientInitiatedStreamId(0), QUIC_RST_ACKNOWLEDGEMENT));
+ 2, true, kClientDataStreamId1, QUIC_RST_ACKNOWLEDGEMENT));
MockWrite writes[] = {
MockWrite(ASYNC, settings_packet->data(), settings_packet->length(), 1),
MockWrite(ASYNC, client_rst->data(), client_rst->length(), 2)};
« no previous file with comments | « net/quic/chromium/quic_chromium_client_session.cc ('k') | net/quic/chromium/quic_chromium_client_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698