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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2838113002: Simplify QUIC tests by adding a MakeInitialSettingsPacket method (Closed)
Patch Set: Rebase 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
Download patch
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/quic/chromium/quic_chromium_client_session_test.cc » ('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 5670cc2665e7939eae4389566984cf7e24f0f4d9..c92c380862cb53af67e128f835495859786125b4 100644
--- a/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc
@@ -656,13 +656,10 @@ class BidirectionalStreamQuicImplTest
!kIncludeCongestionFeedback);
}
- std::unique_ptr<QuicReceivedPacket> ConstructSettingsPacket(
+ std::unique_ptr<QuicReceivedPacket> ConstructInitialSettingsPacket(
QuicPacketNumber packet_number,
- SpdySettingsIds id,
- size_t value,
QuicStreamOffset* offset) {
- return client_maker_.MakeSettingsPacket(packet_number, id, value,
- kIncludeVersion, offset);
+ return client_maker_.MakeInitialSettingsPacket(packet_number, offset);
}
void ExpectLoadTimingValid(const LoadTimingInfo& load_timing_info,
@@ -722,9 +719,7 @@ TEST_P(BidirectionalStreamQuicImplTest, GetRequest) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructClientAckPacket(3, 3, 1, 1));
Initialize();
@@ -824,8 +819,7 @@ TEST_P(BidirectionalStreamQuicImplTest, LoadTimingTwoRequests) {
SetRequest("GET", "/", DEFAULT_PRIORITY);
AddWrite(ConstructRequestHeadersPacketInner(
2, kClientDataStreamId2, kFin, DEFAULT_PRIORITY, nullptr, &offset));
- AddWrite(ConstructSettingsPacket(3, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize, &offset));
+ AddWrite(ConstructInitialSettingsPacket(3, &offset));
AddWrite(ConstructClientAckPacket(4, 3, 1, 1));
Initialize();
@@ -887,9 +881,7 @@ TEST_P(BidirectionalStreamQuicImplTest, CoalesceDataBuffersNotHeadersFrame) {
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
- AddWrite(ConstructSettingsPacket(1, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
const char kBody1[] = "here are some data";
const char kBody2[] = "data keep coming";
std::vector<std::string> two_writes = {kBody1, kBody2};
@@ -1001,9 +993,7 @@ TEST_P(BidirectionalStreamQuicImplTest,
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
- AddWrite(ConstructSettingsPacket(1, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
const char kBody1[] = "here are some data";
AddWrite(ConstructRequestHeadersAndMultipleDataFramesPacket(
2, !kFin, DEFAULT_PRIORITY, &header_stream_offset,
@@ -1098,9 +1088,7 @@ TEST_P(BidirectionalStreamQuicImplTest,
SetRequest("POST", "/", DEFAULT_PRIORITY);
size_t spdy_request_headers_frame_length;
QuicStreamOffset header_stream_offset = 0;
- AddWrite(ConstructSettingsPacket(1, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(1, &header_stream_offset));
const char kBody1[] = "here are some data";
const char kBody2[] = "data keep coming";
std::vector<std::string> two_writes = {kBody1, kBody2};
@@ -1206,9 +1194,7 @@ TEST_P(BidirectionalStreamQuicImplTest, PostRequest) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructDataPacket(3, kIncludeVersion, kFin, 0, kUploadData,
&client_maker_));
AddWrite(ConstructClientAckPacket(4, 3, 1, 1));
@@ -1367,9 +1353,7 @@ TEST_P(BidirectionalStreamQuicImplTest, InterleaveReadDataAndSendData) {
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructAckAndDataPacket(3, !kIncludeVersion, 2, 1, 1, !kFin, 0,
kUploadData, &client_maker_));
AddWrite(ConstructAckAndDataPacket(4, !kIncludeVersion, 3, 3, 3, kFin,
@@ -1457,9 +1441,7 @@ TEST_P(BidirectionalStreamQuicImplTest, ServerSendsRstAfterHeaders) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
Initialize();
BidirectionalStreamRequestInfo request;
@@ -1500,9 +1482,7 @@ TEST_P(BidirectionalStreamQuicImplTest, ServerSendsRstAfterReadData) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
// Why does QUIC ack Rst? Is this expected?
AddWrite(ConstructClientAckPacket(3, 3, 1, 1));
@@ -1563,9 +1543,7 @@ TEST_P(BidirectionalStreamQuicImplTest, SessionClosedBeforeReadData) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
Initialize();
BidirectionalStreamRequestInfo request;
@@ -1625,9 +1603,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamAfterReadData) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1));
Initialize();
@@ -1681,9 +1657,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamDuringOnHeadersReceived) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &header_stream_offset));
AddWrite(ConstructClientAckAndRstStreamPacket(3, 2, 1, 1));
Initialize();
@@ -1729,9 +1703,7 @@ TEST_P(BidirectionalStreamQuicImplTest, DeleteStreamDuringOnDataRead) {
AddWrite(ConstructRequestHeadersPacketInner(
1, kClientDataStreamId1, !kFin, DEFAULT_PRIORITY,
&spdy_request_headers_frame_length, &header_stream_offset));
- AddWrite(ConstructSettingsPacket(2, SETTINGS_MAX_HEADER_LIST_SIZE,
- kDefaultMaxUncompressedHeaderSize,
- &header_stream_offset));
+ AddWrite(ConstructInitialSettingsPacket(2, &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_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698