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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/tools/quic/quic_simple_server_stream_test.cc

Issue 1983183002: Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "first try to fix link error for win_clang build" Created 4 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/tools/quic/quic_server_session_base_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_simple_server_stream_test.cc
diff --git a/net/tools/quic/quic_simple_server_stream_test.cc b/net/tools/quic/quic_simple_server_stream_test.cc
index af6f9915b1dc68a9ae02afe7168b7b85cbb1211a..f3a7533407c9da53cb1311b7adfa5e3dfd8ce2ae 100644
--- a/net/tools/quic/quic_simple_server_stream_test.cc
+++ b/net/tools/quic/quic_simple_server_stream_test.cc
@@ -42,8 +42,6 @@ using testing::Return;
using testing::StrictMock;
using testing::WithArgs;
-DECLARE_bool(quic_always_log_bugs_for_tests);
-
namespace net {
namespace test {
@@ -96,7 +94,7 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {
compressed_certs_cache) {
set_max_open_incoming_streams(kMaxStreamsForTest);
set_max_open_outgoing_streams(kMaxStreamsForTest);
- ON_CALL(*this, WritevData(_, _, _, _, _))
+ ON_CALL(*this, WritevData(_, _, _, _, _, _))
.WillByDefault(testing::Return(QuicConsumedData(0, false)));
}
@@ -107,8 +105,9 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {
const string& error_details,
ConnectionCloseSource source));
MOCK_METHOD1(CreateIncomingDynamicStream, QuicSpdyStream*(QuicStreamId id));
- MOCK_METHOD5(WritevData,
- QuicConsumedData(QuicStreamId id,
+ MOCK_METHOD6(WritevData,
+ QuicConsumedData(ReliableQuicStream* stream,
+ QuicStreamId id,
QuicIOVector data,
QuicStreamOffset offset,
bool fin,
@@ -132,7 +131,7 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {
MOCK_METHOD1(OnHeadersHeadOfLineBlocking, void(QuicTime::Delta delta));
MOCK_METHOD4(PromisePushResources,
void(const string&,
- const list<QuicInMemoryCache::ServerPushInfo>&,
+ const std::list<QuicInMemoryCache::ServerPushInfo>&,
QuicStreamId,
const SpdyHeaderBlock&));
@@ -153,7 +152,6 @@ class QuicSimpleServerStreamTest
&alarm_factory_,
Perspective::IS_SERVER,
SupportedVersions(GetParam()))),
- session_owner_(new StrictMock<MockQuicServerSessionVisitor>()),
crypto_config_(new QuicCryptoServerConfig(
QuicCryptoServerConfig::TESTING,
QuicRandom::GetInstance(),
@@ -161,7 +159,7 @@ class QuicSimpleServerStreamTest
compressed_certs_cache_(
QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
session_(connection_,
- session_owner_,
+ &session_owner_,
crypto_config_.get(),
&compressed_certs_cache_),
body_("hello world") {
@@ -207,7 +205,7 @@ class QuicSimpleServerStreamTest
MockQuicConnectionHelper helper_;
MockAlarmFactory alarm_factory_;
StrictMock<MockQuicConnection>* connection_;
- StrictMock<MockQuicServerSessionVisitor>* session_owner_;
+ StrictMock<MockQuicServerSessionVisitor> session_owner_;
std::unique_ptr<QuicCryptoServerConfig> crypto_config_;
QuicCompressedCertsCache compressed_certs_cache_;
StrictMock<MockQuicSimpleServerSession> session_;
@@ -221,7 +219,7 @@ INSTANTIATE_TEST_CASE_P(Tests,
::testing::ValuesIn(QuicSupportedVersions()));
TEST_P(QuicSimpleServerStreamTest, TestFraming) {
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(AnyNumber())
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData));
stream_->OnStreamHeaders(headers_string_);
@@ -235,7 +233,7 @@ TEST_P(QuicSimpleServerStreamTest, TestFraming) {
}
TEST_P(QuicSimpleServerStreamTest, TestFramingOnePacket) {
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(AnyNumber())
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData));
@@ -250,7 +248,7 @@ TEST_P(QuicSimpleServerStreamTest, TestFramingOnePacket) {
}
TEST_P(QuicSimpleServerStreamTest, SendQuicRstStreamNoErrorInStopReading) {
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(AnyNumber())
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData));
@@ -273,7 +271,7 @@ TEST_P(QuicSimpleServerStreamTest, TestFramingExtraData) {
// We'll automatically write out an error (headers + body)
EXPECT_CALL(session_, WriteHeaders(_, _, _, _, _));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.WillOnce(Invoke(MockQuicSession::ConsumeAllData));
EXPECT_CALL(session_, SendRstStream(_, QUIC_STREAM_NO_ERROR, _)).Times(0);
@@ -310,7 +308,7 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus) {
InSequence s;
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(
strlen(QuicSimpleServerStream::kErrorResponseBody), true)));
@@ -341,7 +339,7 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus2) {
InSequence s;
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(
strlen(QuicSimpleServerStream::kErrorResponseBody), true)));
@@ -398,7 +396,7 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithValidHeaders) {
InSequence s;
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(body.length(), true)));
@@ -420,7 +418,7 @@ TEST_P(QuicSimpleServerStreamTest, SendReponseWithPushResources) {
string url = host + "/bar";
QuicInMemoryCache::ServerPushInfo push_info(GURL(url), response_headers,
kDefaultPriority, "Push body");
- list<QuicInMemoryCache::ServerPushInfo> push_resources;
+ std::list<QuicInMemoryCache::ServerPushInfo> push_resources;
push_resources.push_back(push_info);
QuicInMemoryCache::GetInstance()->AddSimpleResponseWithServerPushResources(
host, request_path, 200, body, push_resources);
@@ -437,7 +435,7 @@ TEST_P(QuicSimpleServerStreamTest, SendReponseWithPushResources) {
::net::test::kClientDataStreamId1,
*request_headers));
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, false, _, nullptr));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(body.length(), true)));
QuicSimpleServerStreamPeer::SendResponse(stream_);
@@ -483,7 +481,7 @@ TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) {
EXPECT_CALL(session_,
WriteHeaders(kServerInitiatedStreamId, _, false,
server_initiated_stream->priority(), nullptr));
- EXPECT_CALL(session_, WritevData(kServerInitiatedStreamId, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, kServerInitiatedStreamId, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(kBody.size(), true)));
server_initiated_stream->PushResponse(headers);
@@ -505,7 +503,7 @@ TEST_P(QuicSimpleServerStreamTest, TestSendErrorResponse) {
InSequence s;
EXPECT_CALL(session_, WriteHeaders(_, _, _, _, _));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(3, true)));
@@ -525,7 +523,7 @@ TEST_P(QuicSimpleServerStreamTest, InvalidMultipleContentLength) {
headers_string_ = SpdyUtils::SerializeUncompressedHeaders(request_headers);
EXPECT_CALL(session_, WriteHeaders(_, _, _, _, _));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(AnyNumber())
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData));
stream_->OnStreamHeaders(headers_string_);
@@ -546,7 +544,7 @@ TEST_P(QuicSimpleServerStreamTest, InvalidLeadingNullContentLength) {
headers_string_ = SpdyUtils::SerializeUncompressedHeaders(request_headers);
EXPECT_CALL(session_, WriteHeaders(_, _, _, _, _));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(AnyNumber())
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData));
stream_->OnStreamHeaders(headers_string_);
@@ -580,7 +578,7 @@ TEST_P(QuicSimpleServerStreamTest, SendQuicRstStreamNoErrorWithEarlyResponse) {
InSequence s;
EXPECT_CALL(session_, WriteHeaders(stream_->id(), _, _, _, _));
- EXPECT_CALL(session_, WritevData(_, _, _, _, _))
+ EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
.Times(1)
.WillOnce(Return(QuicConsumedData(3, true)));
if (GetParam() > QUIC_VERSION_28) {
« no previous file with comments | « net/tools/quic/quic_server_session_base_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698