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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/spdy/spdy_session.cc ('k') | net/spdy/spdy_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session_unittest.cc
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index 6ec3383b2b83ac6c68bb423ee69c8f1738066ef3..ce537111a0b38e7d37a914011af335f57eda742d 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -1235,7 +1235,7 @@ TEST_P(SpdySessionTest, DeleteExpiredPushStreams) {
if (session->flow_control_state_ ==
SpdySession::FLOW_CONTROL_STREAM_AND_SESSION) {
// Unclaimed push body consumed bytes from the session window.
- EXPECT_EQ(kSpdySessionInitialWindowSize - kUploadDataSize,
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()) - kUploadDataSize,
session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
}
@@ -1254,7 +1254,7 @@ TEST_P(SpdySessionTest, DeleteExpiredPushStreams) {
if (session->flow_control_state_ ==
SpdySession::FLOW_CONTROL_STREAM_AND_SESSION) {
// Verify that the session window reclaimed the evicted stream body.
- EXPECT_EQ(kSpdySessionInitialWindowSize,
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()),
session->session_recv_window_size_);
EXPECT_EQ(kUploadDataSize, session->session_unacked_recv_window_bytes_);
}
@@ -1553,7 +1553,8 @@ TEST_P(SpdySessionTest, SendInitialDataOnNewSession) {
scoped_ptr<SpdyFrame> initial_window_update(
spdy_util_.ConstructSpdyWindowUpdate(
kSessionFlowControlStreamId,
- kDefaultInitialRecvWindowSize - kSpdySessionInitialWindowSize));
+ kDefaultInitialRecvWindowSize -
+ SpdySession::GetInitialWindowSize(GetParam())));
std::vector<MockWrite> writes;
if ((GetParam() >= kProtoSPDY4MinimumVersion) &&
(GetParam() <= kProtoSPDY4MaximumVersion)) {
@@ -3081,9 +3082,9 @@ TEST_P(SpdySessionTest, ProtocolNegotiation) {
session->buffered_spdy_framer_->protocol_version());
EXPECT_EQ(SpdySession::FLOW_CONTROL_STREAM_AND_SESSION,
session->flow_control_state());
- EXPECT_EQ(kSpdySessionInitialWindowSize,
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()),
session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize,
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()),
session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
}
@@ -3510,16 +3511,16 @@ TEST_P(SpdySessionTest, AdjustRecvWindowSize) {
session_deps_.host_resolver->set_synchronous_mode(true);
+ const int32 initial_window_size =
+ SpdySession::GetInitialWindowSize(GetParam());
const int32 delta_window_size = 100;
MockConnect connect_data(SYNCHRONOUS, OK);
MockRead reads[] = {
MockRead(ASYNC, 0, 1) // EOF
};
- scoped_ptr<SpdyFrame> window_update(
- spdy_util_.ConstructSpdyWindowUpdate(
- kSessionFlowControlStreamId,
- kSpdySessionInitialWindowSize + delta_window_size));
+ scoped_ptr<SpdyFrame> window_update(spdy_util_.ConstructSpdyWindowUpdate(
+ kSessionFlowControlStreamId, initial_window_size + delta_window_size));
MockWrite writes[] = {
CreateMockWrite(*window_update, 0),
};
@@ -3534,18 +3535,17 @@ TEST_P(SpdySessionTest, AdjustRecvWindowSize) {
EXPECT_EQ(SpdySession::FLOW_CONTROL_STREAM_AND_SESSION,
session->flow_control_state());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
session->IncreaseRecvWindowSize(delta_window_size);
- EXPECT_EQ(kSpdySessionInitialWindowSize + delta_window_size,
+ EXPECT_EQ(initial_window_size + delta_window_size,
session->session_recv_window_size_);
EXPECT_EQ(delta_window_size, session->session_unacked_recv_window_bytes_);
// Should trigger sending a WINDOW_UPDATE frame.
- session->IncreaseRecvWindowSize(kSpdySessionInitialWindowSize);
- EXPECT_EQ(kSpdySessionInitialWindowSize + delta_window_size +
- kSpdySessionInitialWindowSize,
+ session->IncreaseRecvWindowSize(initial_window_size);
+ EXPECT_EQ(initial_window_size + delta_window_size + initial_window_size,
session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
@@ -3553,9 +3553,8 @@ TEST_P(SpdySessionTest, AdjustRecvWindowSize) {
// DecreaseRecvWindowSize() expects |in_io_loop_| to be true.
session->in_io_loop_ = true;
- session->DecreaseRecvWindowSize(
- kSpdySessionInitialWindowSize + delta_window_size +
- kSpdySessionInitialWindowSize);
+ session->DecreaseRecvWindowSize(initial_window_size + delta_window_size +
+ initial_window_size);
session->in_io_loop_ = false;
EXPECT_EQ(0, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
@@ -3584,16 +3583,18 @@ TEST_P(SpdySessionTest, AdjustSendWindowSize) {
EXPECT_EQ(SpdySession::FLOW_CONTROL_STREAM_AND_SESSION,
session->flow_control_state());
+ const int32 initial_window_size =
+ SpdySession::GetInitialWindowSize(GetParam());
const int32 delta_window_size = 100;
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
session->IncreaseSendWindowSize(delta_window_size);
- EXPECT_EQ(kSpdySessionInitialWindowSize + delta_window_size,
+ EXPECT_EQ(initial_window_size + delta_window_size,
session->session_send_window_size_);
session->DecreaseSendWindowSize(delta_window_size);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
}
// Incoming data for an inactive stream should not cause the session
@@ -3621,12 +3622,14 @@ TEST_P(SpdySessionTest, SessionFlowControlInactiveStream) {
EXPECT_EQ(SpdySession::FLOW_CONTROL_STREAM_AND_SESSION,
session->flow_control_state());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()),
+ session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(SpdySession::GetInitialWindowSize(GetParam()),
+ session->session_recv_window_size_);
EXPECT_EQ(kUploadDataSize, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
@@ -3711,7 +3714,9 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) {
stream->SendRequestHeaders(headers.Pass(), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ const int32 initial_window_size =
+ SpdySession::GetInitialWindowSize(GetParam());
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(4);
@@ -3719,7 +3724,7 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) {
EXPECT_TRUE(data.at_write_eof());
EXPECT_TRUE(data.at_read_eof());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(msg_data_size, session->session_unacked_recv_window_bytes_);
stream->Close();
@@ -3727,7 +3732,7 @@ TEST_P(SpdySessionTest, SessionFlowControlNoReceiveLeaks) {
EXPECT_EQ(OK, delegate.WaitForClose());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(msg_data_size, session->session_unacked_recv_window_bytes_);
}
@@ -3786,25 +3791,27 @@ TEST_P(SpdySessionTest, SessionFlowControlNoSendLeaks) {
stream->SendRequestHeaders(headers.Pass(), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
+ const int32 initial_window_size =
+ SpdySession::GetInitialWindowSize(GetParam());
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
data.RunFor(1);
EXPECT_TRUE(data.at_write_eof());
EXPECT_TRUE(data.at_read_eof());
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_send_window_size_);
// Closing the stream should increase the session's send window.
stream->Close();
EXPECT_EQ(NULL, stream.get());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
EXPECT_EQ(OK, delegate.WaitForClose());
}
@@ -3875,42 +3882,44 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) {
stream->SendRequestHeaders(headers.Pass(), MORE_DATA_TO_SEND));
EXPECT_TRUE(stream->HasUrlFromHeaders());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ const int32 initial_window_size =
+ SpdySession::GetInitialWindowSize(GetParam());
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
data.RunFor(1);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize - msg_data_size,
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size - msg_data_size,
session->session_recv_window_size_);
EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
@@ -3921,8 +3930,8 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) {
// Draining the delegate's read queue should increase the session's
// receive window.
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(msg_data_size, session->session_unacked_recv_window_bytes_);
stream->Close();
@@ -3930,8 +3939,8 @@ TEST_P(SpdySessionTest, SessionFlowControlEndToEnd) {
EXPECT_EQ(OK, delegate.WaitForClose());
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_send_window_size_);
- EXPECT_EQ(kSpdySessionInitialWindowSize, session->session_recv_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_send_window_size_);
+ EXPECT_EQ(initial_window_size, session->session_recv_window_size_);
EXPECT_EQ(msg_data_size, session->session_unacked_recv_window_bytes_);
}
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/spdy/spdy_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698