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

Side by Side Diff: net/quic/quic_headers_stream_test.cc

Issue 851323005: Fix bugs in QuicHeadersStreamTest in which client-mode was not being (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@quic_client_bin_cc_secure_QUIC_83647038
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_headers_stream.h" 5 #include "net/quic/quic_headers_stream.h"
6 6
7 #include "net/quic/quic_utils.h" 7 #include "net/quic/quic_utils.h"
8 #include "net/quic/spdy_utils.h" 8 #include "net/quic/spdy_utils.h"
9 #include "net/quic/test_tools/quic_connection_peer.h" 9 #include "net/quic/test_tools/quic_connection_peer.h"
10 #include "net/quic/test_tools/quic_session_peer.h" 10 #include "net/quic/test_tools/quic_session_peer.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 MOCK_METHOD2(OnUnknownFrame, bool(SpdyStreamId stream_id, int frame_type)); 74 MOCK_METHOD2(OnUnknownFrame, bool(SpdyStreamId stream_id, int frame_type));
75 }; 75 };
76 76
77 // Run all tests with each version, and client or server 77 // Run all tests with each version, and client or server
78 struct TestParams { 78 struct TestParams {
79 TestParams(QuicVersion version, bool is_server) 79 TestParams(QuicVersion version, bool is_server)
80 : version(version), is_server(is_server) {} 80 : version(version), is_server(is_server) {}
81 81
82 friend ostream& operator<<(ostream& os, const TestParams& p) { 82 friend ostream& operator<<(ostream& os, const TestParams& p) {
83 os << "{ version: " << QuicVersionToString(p.version); 83 os << "{ version: " << QuicVersionToString(p.version);
84 os << " is_server: " << p.is_server << " }"; 84 os << ", is_server: " << p.is_server << " }";
85 return os; 85 return os;
86 } 86 }
87 87
88 QuicVersion version; 88 QuicVersion version;
89 bool is_server; 89 bool is_server;
90 }; 90 };
91 91
92 // Constructs various test permutations. 92 // Constructs various test permutations.
93 vector<TestParams> GetTestParams() { 93 vector<TestParams> GetTestParams() {
94 vector<TestParams> params; 94 vector<TestParams> params;
95 QuicVersionVector all_supported_versions = QuicSupportedVersions(); 95 QuicVersionVector all_supported_versions = QuicSupportedVersions();
96 for (const QuicVersion version : all_supported_versions) { 96 for (const QuicVersion version : all_supported_versions) {
97 params.push_back(TestParams(version, true)); 97 params.push_back(TestParams(version, false));
98 params.push_back(TestParams(version, true)); 98 params.push_back(TestParams(version, true));
99 } 99 }
100 return params; 100 return params;
101 } 101 }
102 102
103 class QuicHeadersStreamTest : public ::testing::TestWithParam<TestParams> { 103 class QuicHeadersStreamTest : public ::testing::TestWithParam<TestParams> {
104 public: 104 public:
105 QuicHeadersStreamTest() 105 QuicHeadersStreamTest()
106 : connection_(new StrictMock<MockConnection>(is_server(), GetVersion())), 106 : connection_(new StrictMock<MockConnection>(is_server(), GetVersion())),
107 session_(connection_), 107 session_(connection_),
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 TEST_P(QuicHeadersStreamTest, WriteHeaders) { 241 TEST_P(QuicHeadersStreamTest, WriteHeaders) {
242 for (QuicStreamId stream_id = kClientDataStreamId1; 242 for (QuicStreamId stream_id = kClientDataStreamId1;
243 stream_id < kClientDataStreamId3; stream_id += 2) { 243 stream_id < kClientDataStreamId3; stream_id += 2) {
244 for (int count = 0; count < 2; ++count) { 244 for (int count = 0; count < 2; ++count) {
245 bool fin = (count == 0); 245 bool fin = (count == 0);
246 if (is_server()) { 246 if (is_server()) {
247 WriteHeadersAndExpectSynReply(stream_id, fin); 247 WriteHeadersAndExpectSynReply(stream_id, fin);
248 } else { 248 } else {
249 for (QuicPriority priority = 0; priority < 7; ++priority) { 249 for (QuicPriority priority = 0; priority < 7; ++priority) {
250 WriteHeadersAndExpectSynStream(stream_id, fin, priority); 250 // TODO(rch): implement priorities correctly.
251 WriteHeadersAndExpectSynStream(stream_id, fin, 0);
251 } 252 }
252 } 253 }
253 } 254 }
254 } 255 }
255 } 256 }
256 257
257 TEST_P(QuicHeadersStreamTest, ProcessRawData) { 258 TEST_P(QuicHeadersStreamTest, ProcessRawData) {
258 for (QuicStreamId stream_id = kClientDataStreamId1; 259 for (QuicStreamId stream_id = kClientDataStreamId1;
259 stream_id < kClientDataStreamId3; stream_id += 2) { 260 stream_id < kClientDataStreamId3; stream_id += 2) {
260 for (int count = 0; count < 2; ++count) { 261 for (int count = 0; count < 2; ++count) {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 405
405 TEST_P(QuicHeadersStreamTest, NoConnectionLevelFlowControl) { 406 TEST_P(QuicHeadersStreamTest, NoConnectionLevelFlowControl) {
406 EXPECT_TRUE(headers_stream_->flow_controller()->IsEnabled()); 407 EXPECT_TRUE(headers_stream_->flow_controller()->IsEnabled());
407 EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl( 408 EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl(
408 headers_stream_)); 409 headers_stream_));
409 } 410 }
410 411
411 } // namespace 412 } // namespace
412 } // namespace test 413 } // namespace test
413 } // namespace net 414 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698