summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_data_stream_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/quic/quic_data_stream_test.cc')
-rw-r--r--net/quic/quic_data_stream_test.cc76
1 files changed, 38 insertions, 38 deletions
diff --git a/net/quic/quic_data_stream_test.cc b/net/quic/quic_data_stream_test.cc
index 164e7e4..a899853 100644
--- a/net/quic/quic_data_stream_test.cc
+++ b/net/quic/quic_data_stream_test.cc
@@ -30,9 +30,6 @@ namespace net {
namespace test {
namespace {
-// First non-reserved client stream ID.
-const QuicStreamId kStreamId = 5;
-
const bool kIsServer = true;
const bool kShouldProcessData = true;
@@ -98,10 +95,10 @@ class QuicDataStreamTest : public ::testing::TestWithParam<QuicVersion> {
connection_ = new testing::StrictMock<MockConnection>(
kIsServer, SupportedVersions(GetParam()));
session_.reset(new testing::StrictMock<MockSession>(connection_));
- stream_.reset(new TestStream(kStreamId, session_.get(),
- stream_should_process_data));
- stream2_.reset(new TestStream(kStreamId + 2, session_.get(),
+ stream_.reset(new TestStream(kClientDataStreamId1, session_.get(),
stream_should_process_data));
+ stream2_.reset(new TestStream(kClientDataStreamId2, session_.get(),
+ stream_should_process_data));
write_blocked_list_ =
QuicSessionPeer::GetWriteblockedStreams(session_.get());
}
@@ -140,7 +137,7 @@ TEST_P(QuicDataStreamTest, ProcessHeadersAndBody) {
stream_->OnStreamHeaders(headers);
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame);
EXPECT_EQ(headers + body, stream_->data());
@@ -165,7 +162,8 @@ TEST_P(QuicDataStreamTest, ProcessHeadersAndBodyFragments) {
size_t remaining_data = body.size() - offset;
StringPiece fragment(body.data() + offset,
min(fragment_size, remaining_data));
- QuicStreamFrame frame(kStreamId, false, offset, MakeIOVector(fragment));
+ QuicStreamFrame frame(kClientDataStreamId1, false, offset,
+ MakeIOVector(fragment));
stream_->OnStreamFrame(frame);
}
ASSERT_EQ(headers + body,
@@ -188,13 +186,14 @@ TEST_P(QuicDataStreamTest, ProcessHeadersAndBodyFragmentsSplit) {
stream_->OnStreamHeadersComplete(false, headers.size());
StringPiece fragment1(body.data(), split_point);
- QuicStreamFrame frame1(kStreamId, false, 0, MakeIOVector(fragment1));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0,
+ MakeIOVector(fragment1));
stream_->OnStreamFrame(frame1);
StringPiece fragment2(body.data() + split_point,
body.size() - split_point);
- QuicStreamFrame frame2(
- kStreamId, false, split_point, MakeIOVector(fragment2));
+ QuicStreamFrame frame2(kClientDataStreamId1, false, split_point,
+ MakeIOVector(fragment2));
stream_->OnStreamFrame(frame2);
ASSERT_EQ(headers + body,
@@ -211,7 +210,7 @@ TEST_P(QuicDataStreamTest, ProcessHeadersAndBodyReadv) {
stream_->OnStreamHeaders(headers);
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame);
char buffer[2048];
@@ -237,10 +236,9 @@ TEST_P(QuicDataStreamTest, ProcessHeadersAndBodyIncrementalReadv) {
stream_->OnStreamHeaders(headers);
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame);
-
char buffer[1];
struct iovec vec;
vec.iov_base = buffer;
@@ -262,10 +260,9 @@ TEST_P(QuicDataStreamTest, ProcessHeadersUsingReadvWithMultipleIovecs) {
stream_->OnStreamHeaders(headers);
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame);
-
char buffer1[1];
char buffer2[1];
struct iovec vec[2];
@@ -305,9 +302,9 @@ TEST_P(QuicDataStreamTest, StreamFlowControlBlocked) {
const uint64 kOverflow = 15;
GenerateBody(&body, kWindow + kOverflow);
- EXPECT_CALL(*connection_, SendBlocked(kStreamId));
- EXPECT_CALL(*session_, WritevData(kStreamId, _, _, _, _)).WillOnce(
- Return(QuicConsumedData(kWindow, true)));
+ EXPECT_CALL(*connection_, SendBlocked(kClientDataStreamId1));
+ EXPECT_CALL(*session_, WritevData(kClientDataStreamId1, _, _, _, _))
+ .WillOnce(Return(QuicConsumedData(kWindow, true)));
stream_->WriteOrBufferData(body, false, NULL);
// Should have sent as much as possible, resulting in no send window left.
@@ -352,7 +349,7 @@ TEST_P(QuicDataStreamTest, StreamFlowControlNoWindowUpdateIfNotConsumed) {
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame1(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame1);
EXPECT_EQ(kWindow - (kWindow / 3), QuicFlowControllerPeer::ReceiveWindowSize(
stream_->flow_controller()));
@@ -360,7 +357,8 @@ TEST_P(QuicDataStreamTest, StreamFlowControlNoWindowUpdateIfNotConsumed) {
// Now receive another frame which results in the receive window being over
// half full. This should all be buffered, decreasing the receive window but
// not sending WINDOW_UPDATE.
- QuicStreamFrame frame2(kStreamId, false, kWindow / 3, MakeIOVector(body));
+ QuicStreamFrame frame2(kClientDataStreamId1, false, kWindow / 3,
+ MakeIOVector(body));
stream_->OnStreamFrame(frame2);
EXPECT_EQ(
kWindow - (2 * kWindow / 3),
@@ -395,7 +393,7 @@ TEST_P(QuicDataStreamTest, StreamFlowControlWindowUpdate) {
EXPECT_EQ(headers, stream_->data());
stream_->OnStreamHeadersComplete(false, headers.size());
- QuicStreamFrame frame1(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame1);
EXPECT_EQ(kWindow - (kWindow / 3), QuicFlowControllerPeer::ReceiveWindowSize(
stream_->flow_controller()));
@@ -404,12 +402,13 @@ TEST_P(QuicDataStreamTest, StreamFlowControlWindowUpdate) {
// half full. This will trigger the stream to increase its receive window
// offset and send a WINDOW_UPDATE. The result will be again an available
// window of kWindow bytes.
- QuicStreamFrame frame2(kStreamId, false, kWindow / 3, MakeIOVector(body));
- EXPECT_CALL(
- *connection_,
- SendWindowUpdate(kStreamId, QuicFlowControllerPeer::ReceiveWindowOffset(
- stream_->flow_controller()) +
- 2 * kWindow / 3));
+ QuicStreamFrame frame2(kClientDataStreamId1, false, kWindow / 3,
+ MakeIOVector(body));
+ EXPECT_CALL(*connection_,
+ SendWindowUpdate(kClientDataStreamId1,
+ QuicFlowControllerPeer::ReceiveWindowOffset(
+ stream_->flow_controller()) +
+ 2 * kWindow / 3));
stream_->OnStreamFrame(frame2);
EXPECT_EQ(kWindow, QuicFlowControllerPeer::ReceiveWindowSize(
stream_->flow_controller()));
@@ -453,21 +452,22 @@ TEST_P(QuicDataStreamTest, ConnectionFlowControlWindowUpdate) {
// WINDOW_UPDATE for either stream, nor for the connection.
string body;
GenerateBody(&body, kWindow / 4);
- QuicStreamFrame frame1(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame1(kClientDataStreamId1, false, 0, MakeIOVector(body));
stream_->OnStreamFrame(frame1);
- QuicStreamFrame frame2(kStreamId + 2, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame2(kClientDataStreamId2, false, 0, MakeIOVector(body));
stream2_->OnStreamFrame(frame2);
// Now receive a further single byte on one stream - again this does not
// trigger a stream WINDOW_UPDATE, but now the connection flow control window
// is over half full and thus a connection WINDOW_UPDATE is sent.
- EXPECT_CALL(*connection_, SendWindowUpdate(kStreamId, _)).Times(0);
- EXPECT_CALL(*connection_, SendWindowUpdate(kStreamId + 2, _)).Times(0);
+ EXPECT_CALL(*connection_, SendWindowUpdate(kClientDataStreamId1, _)).Times(0);
+ EXPECT_CALL(*connection_, SendWindowUpdate(kClientDataStreamId2, _)).Times(0);
EXPECT_CALL(*connection_,
SendWindowUpdate(0, QuicFlowControllerPeer::ReceiveWindowOffset(
session_->flow_controller()) +
1 + kWindow / 2));
- QuicStreamFrame frame3(kStreamId, false, (kWindow / 4), MakeIOVector("a"));
+ QuicStreamFrame frame3(kClientDataStreamId1, false, (kWindow / 4),
+ MakeIOVector("a"));
stream_->OnStreamFrame(frame3);
}
@@ -496,7 +496,7 @@ TEST_P(QuicDataStreamTest, StreamFlowControlViolation) {
// Receive data to overflow the window, violating flow control.
string body;
GenerateBody(&body, kWindow + 1);
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
EXPECT_CALL(*connection_, SendConnectionClose(QUIC_FLOW_CONTROL_ERROR));
stream_->OnStreamFrame(frame);
}
@@ -532,7 +532,7 @@ TEST_P(QuicDataStreamTest, ConnectionFlowControlViolation) {
string body;
GenerateBody(&body, kConnectionWindow + 1);
EXPECT_LT(body.size(), kStreamWindow);
- QuicStreamFrame frame(kStreamId, false, 0, MakeIOVector(body));
+ QuicStreamFrame frame(kClientDataStreamId1, false, 0, MakeIOVector(body));
EXPECT_CALL(*connection_, SendConnectionClose(QUIC_FLOW_CONTROL_ERROR));
stream_->OnStreamFrame(frame);
@@ -557,9 +557,9 @@ TEST_P(QuicDataStreamTest, StreamFlowControlFinNotBlocked) {
string body = "";
bool fin = true;
- EXPECT_CALL(*connection_, SendBlocked(kStreamId)).Times(0);
- EXPECT_CALL(*session_, WritevData(kStreamId, _, _, _, _)).WillOnce(
- Return(QuicConsumedData(0, fin)));
+ EXPECT_CALL(*connection_, SendBlocked(kClientDataStreamId1)).Times(0);
+ EXPECT_CALL(*session_, WritevData(kClientDataStreamId1, _, _, _, _))
+ .WillOnce(Return(QuicConsumedData(0, fin)));
stream_->WriteOrBufferData(body, fin, NULL);
}
generated by cgit v1.1 at 2025-04-01 13:58:37 +0000