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

Side by Side Diff: net/tools/quic/quic_spdy_client_stream_test.cc

Issue 1908103002: Landing Recent QUIC changes until 4/15/2016 17:20 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 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 unified diff | Download patch
« no previous file with comments | « net/tools/quic/quic_spdy_client_stream.cc ('k') | net/tools/quic/quic_time_wait_list_manager.h » ('j') | 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/tools/quic/quic_spdy_client_stream.h" 5 #include "net/tools/quic/quic_spdy_client_stream.h"
6 6
7 #include <memory>
8
7 #include "base/macros.h" 9 #include "base/macros.h"
8 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
9 #include "net/quic/quic_utils.h" 11 #include "net/quic/quic_utils.h"
10 #include "net/quic/spdy_utils.h" 12 #include "net/quic/spdy_utils.h"
11 #include "net/quic/test_tools/crypto_test_utils.h" 13 #include "net/quic/test_tools/crypto_test_utils.h"
12 #include "net/quic/test_tools/quic_test_utils.h" 14 #include "net/quic/test_tools/quic_test_utils.h"
13 #include "net/tools/quic/quic_client_session.h" 15 #include "net/tools/quic/quic_client_session.h"
14 #include "net/tools/quic/spdy_balsa_utils.h" 16 #include "net/tools/quic/spdy_balsa_utils.h"
15 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 QuicCryptoClientConfig crypto_config_; 56 QuicCryptoClientConfig crypto_config_;
55 57
56 DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession); 58 DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession);
57 }; 59 };
58 60
59 class QuicSpdyClientStreamTest : public ::testing::Test { 61 class QuicSpdyClientStreamTest : public ::testing::Test {
60 public: 62 public:
61 class StreamVisitor; 63 class StreamVisitor;
62 64
63 QuicSpdyClientStreamTest() 65 QuicSpdyClientStreamTest()
64 : connection_( 66 : connection_(new StrictMock<MockConnection>(&helper_,
65 new StrictMock<MockConnection>(&helper_, Perspective::IS_CLIENT)), 67 &alarm_factory_,
68 Perspective::IS_CLIENT)),
66 session_(connection_, &push_promise_index_), 69 session_(connection_, &push_promise_index_),
67 body_("hello world") { 70 body_("hello world") {
68 session_.Initialize(); 71 session_.Initialize();
69 72
70 headers_.SetResponseFirstlineFromStringPieces("HTTP/1.1", "200", "Ok"); 73 headers_.SetResponseFirstlineFromStringPieces("HTTP/1.1", "200", "Ok");
71 headers_.ReplaceOrAppendHeader("content-length", "11"); 74 headers_.ReplaceOrAppendHeader("content-length", "11");
72 75
73 headers_string_ = net::SpdyBalsaUtils::SerializeResponseHeaders(headers_); 76 headers_string_ = net::SpdyBalsaUtils::SerializeResponseHeaders(headers_);
74 77
75 stream_.reset(new QuicSpdyClientStream(kClientDataStreamId1, &session_)); 78 stream_.reset(new QuicSpdyClientStream(kClientDataStreamId1, &session_));
76 stream_visitor_.reset(new StreamVisitor()); 79 stream_visitor_.reset(new StreamVisitor());
77 stream_->set_visitor(stream_visitor_.get()); 80 stream_->set_visitor(stream_visitor_.get());
78 } 81 }
79 82
80 class StreamVisitor : public QuicSpdyClientStream::Visitor { 83 class StreamVisitor : public QuicSpdyClientStream::Visitor {
81 void OnClose(QuicSpdyStream* stream) override { 84 void OnClose(QuicSpdyStream* stream) override {
82 DVLOG(1) << "stream " << stream->id(); 85 DVLOG(1) << "stream " << stream->id();
83 } 86 }
84 }; 87 };
85 88
86 MockConnectionHelper helper_; 89 MockConnectionHelper helper_;
90 MockAlarmFactory alarm_factory_;
87 StrictMock<MockConnection>* connection_; 91 StrictMock<MockConnection>* connection_;
88 QuicClientPushPromiseIndex push_promise_index_; 92 QuicClientPushPromiseIndex push_promise_index_;
89 93
90 MockQuicClientSession session_; 94 MockQuicClientSession session_;
91 std::unique_ptr<QuicSpdyClientStream> stream_; 95 std::unique_ptr<QuicSpdyClientStream> stream_;
92 std::unique_ptr<StreamVisitor> stream_visitor_; 96 std::unique_ptr<StreamVisitor> stream_visitor_;
93 BalsaHeaders headers_; 97 BalsaHeaders headers_;
94 string headers_string_; 98 string headers_string_;
95 string body_; 99 string body_;
96 }; 100 };
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // Now send the body, which should close the stream as the FIN has been 176 // Now send the body, which should close the stream as the FIN has been
173 // received, as well as all data. 177 // received, as well as all data.
174 EXPECT_CALL(session_, CloseStream(stream_->id())); 178 EXPECT_CALL(session_, CloseStream(stream_->id()));
175 stream_->OnStreamFrame( 179 stream_->OnStreamFrame(
176 QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, body_)); 180 QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, body_));
177 } 181 }
178 182
179 } // namespace 183 } // namespace
180 } // namespace test 184 } // namespace test
181 } // namespace net 185 } // namespace net
OLDNEW
« no previous file with comments | « net/tools/quic/quic_spdy_client_stream.cc ('k') | net/tools/quic/quic_time_wait_list_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698