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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2862563003: Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000 (Closed)
Patch Set: rebase and fix test bugs detected by swarm bot. 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/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/chromium/quic_chromium_client_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
diff --git a/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc b/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
index fe867052cfa9a8a2b26d5a42e9e7e6af256eeda4..4aacba85ecf1f46c7b01904a854a67b7fa694cc5 100644
--- a/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
@@ -41,6 +41,7 @@
#include "net/quic/test_tools/mock_clock.h"
#include "net/quic/test_tools/mock_random.h"
#include "net/quic/test_tools/quic_connection_peer.h"
+#include "net/quic/test_tools/quic_spdy_session_peer.h"
#include "net/quic/test_tools/quic_test_utils.h"
#include "net/socket/socket_test_util.h"
#include "net/test/gtest_util.h"
@@ -356,7 +357,7 @@ class BidirectionalStreamQuicImplTest
: crypto_config_(crypto_test_utils::ProofVerifierForTesting()),
read_buffer_(new IOBufferWithSize(4096)),
connection_id_(2),
- stream_id_(kClientDataStreamId1),
+ stream_id_(GetNthClientInitiatedStreamId(0)),
client_maker_(GetParam(),
connection_id_,
&clock_,
@@ -680,6 +681,10 @@ class BidirectionalStreamQuicImplTest
QuicChromiumClientSession* session() const { return session_.get(); }
+ QuicStreamId GetNthClientInitiatedStreamId(int n) {
+ return test::GetNthClientInitiatedStreamId(GetParam(), n);
+ }
+
protected:
BoundTestNetLog net_log_;
scoped_refptr<TestTaskRunner> runner_;
@@ -717,7 +722,7 @@ TEST_P(BidirectionalStreamQuicImplTest, GetRequest) {
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructRequestHeadersPacketInner(
- 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
+ 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructClientAckPacket(3, 3, 1, 1));
@@ -814,11 +819,13 @@ TEST_P(BidirectionalStreamQuicImplTest, LoadTimingTwoRequests) {
SetRequest("GET", "/", DEFAULT_PRIORITY);
QuicStreamOffset offset = 0;
AddWrite(ConstructRequestHeadersPacketInner(
- 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY, nullptr, &offset));
+ 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY, nullptr,
+ &offset));
// SetRequest() again for second request as |request_headers_| was moved.
SetRequest("GET", "/", DEFAULT_PRIORITY);
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId2, kFin, DEFAULT_PRIORITY, nullptr, &offset));
+ 2, GetNthClientInitiatedStreamId(1), kFin, DEFAULT_PRIORITY, nullptr,
+ &offset));
AddWrite(ConstructInitialSettingsPacket(3, &offset));
AddWrite(ConstructClientAckPacket(4, 3, 1, 1));
Initialize();
@@ -851,12 +858,12 @@ TEST_P(BidirectionalStreamQuicImplTest, LoadTimingTwoRequests) {
// Server sends the response headers.
offset = 0;
ProcessPacket(ConstructResponseHeadersPacketInner(
- 2, kClientDataStreamId1, kFin, ConstructResponseHeaders("200"), nullptr,
- &offset));
+ 2, GetNthClientInitiatedStreamId(0), kFin,
+ ConstructResponseHeaders("200"), nullptr, &offset));
ProcessPacket(ConstructResponseHeadersPacketInner(
- 3, kClientDataStreamId2, kFin, ConstructResponseHeaders("200"), nullptr,
- &offset));
+ 3, GetNthClientInitiatedStreamId(1), kFin,
+ ConstructResponseHeaders("200"), nullptr, &offset));
delegate->WaitUntilNextCallback(); // OnHeadersReceived
delegate2->WaitUntilNextCallback(); // OnHeadersReceived
@@ -886,7 +893,7 @@ TEST_P(BidirectionalStreamQuicImplTest, CoalesceDataBuffersNotHeadersFrame) {
const char kBody2[] = "data keep coming";
std::vector<std::string> two_writes = {kBody1, kBody2};
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructClientMultipleDataFramesPacket(3, kIncludeVersion, !kFin, 0,
{kBody1, kBody2}));
@@ -1194,7 +1201,7 @@ TEST_P(BidirectionalStreamQuicImplTest, PostRequest) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructDataPacket(3, kIncludeVersion, kFin, 0, kUploadData,
&client_maker_));
@@ -1352,7 +1359,7 @@ TEST_P(BidirectionalStreamQuicImplTest, InterleaveReadDataAndSendData) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructAckAndDataPacket(3, !kIncludeVersion, 2, 1, 1, !kFin, 0,
kUploadData, &client_maker_));
@@ -1439,7 +1446,7 @@ TEST_P(BidirectionalStreamQuicImplTest, ServerSendsRstAfterHeaders) {
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructRequestHeadersPacketInner(
- 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
+ 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
Initialize();
@@ -1480,7 +1487,7 @@ TEST_P(BidirectionalStreamQuicImplTest, ServerSendsRstAfterReadData) {
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructRequestHeadersPacketInner(
- 1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
+ 1, GetNthClientInitiatedStreamId(0), kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
// Why does QUIC ack Rst? Is this expected?
@@ -1542,7 +1549,7 @@ TEST_P(BidirectionalStreamQuicImplTest, SessionClosedBeforeReadData) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
Initialize();
@@ -1602,7 +1609,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamAfterReadData) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1));
@@ -1656,7 +1663,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamDuringOnHeadersReceived) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1));
@@ -1702,7 +1709,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamDuringOnDataRead) {
QuicStreamOffset header_stream_offset = 0;
AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
AddWrite(ConstructRequestHeadersPacketInner(
- 2, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
+ 2, GetNthClientInitiatedStreamId(0), !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
AddWrite(ConstructClientAckPacket(3, 3, 1, 1));
AddWrite(ConstructClientRstStreamPacket(4));
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/chromium/quic_chromium_client_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698