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

Side by Side Diff: net/websockets/websocket_deflate_stream_test.cc

Issue 39193005: Introduce WebSocketDeflatePredictor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
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/websockets/websocket_deflate_stream.h" 5 #include "net/websockets/websocket_deflate_stream.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <deque>
8 #include <string> 9 #include <string>
9 10
10 #include "base/basictypes.h" 11 #include "base/basictypes.h"
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
15 #include "net/base/completion_callback.h" 16 #include "net/base/completion_callback.h"
16 #include "net/base/io_buffer.h" 17 #include "net/base/io_buffer.h"
17 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/websockets/websocket_deflate_predictor.h"
18 #include "net/websockets/websocket_deflater.h" 20 #include "net/websockets/websocket_deflater.h"
19 #include "net/websockets/websocket_frame.h" 21 #include "net/websockets/websocket_frame.h"
20 #include "net/websockets/websocket_inflater.h" 22 #include "net/websockets/websocket_inflater.h"
21 #include "net/websockets/websocket_stream.h" 23 #include "net/websockets/websocket_stream.h"
22 #include "net/websockets/websocket_test_util.h" 24 #include "net/websockets/websocket_test_util.h"
23 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
25 27
26 namespace net { 28 namespace net {
27 namespace { 29 namespace {
(...skipping 30 matching lines...) Expand all
58 } 60 }
59 61
60 std::string ToString(IOBuffer* buffer, size_t size) { 62 std::string ToString(IOBuffer* buffer, size_t size) {
61 return std::string(buffer->data(), size); 63 return std::string(buffer->data(), size);
62 } 64 }
63 65
64 std::string ToString(const scoped_refptr<IOBuffer>& buffer, size_t size) { 66 std::string ToString(const scoped_refptr<IOBuffer>& buffer, size_t size) {
65 return ToString(buffer.get(), size); 67 return ToString(buffer.get(), size);
66 } 68 }
67 69
68 std::string ToString(WebSocketFrame* frame) { 70 std::string ToString(const WebSocketFrame* frame) {
69 return frame->data ? ToString(frame->data, frame->header.payload_length) : ""; 71 return frame->data ? ToString(frame->data, frame->header.payload_length) : "";
70 } 72 }
71 73
72 void AppendTo(ScopedVector<WebSocketFrame>* frames, 74 void AppendTo(ScopedVector<WebSocketFrame>* frames,
73 WebSocketFrameHeader::OpCode opcode, 75 WebSocketFrameHeader::OpCode opcode,
74 FrameFlag flag, 76 FrameFlag flag,
75 const std::string& data) { 77 const std::string& data) {
76 scoped_ptr<WebSocketFrame> frame(new WebSocketFrame(opcode)); 78 scoped_ptr<WebSocketFrame> frame(new WebSocketFrame(opcode));
77 frame->header.final = (flag & kFinal); 79 frame->header.final = (flag & kFinal);
78 frame->header.reserved1 = (flag & kReserved1); 80 frame->header.reserved1 = (flag & kReserved1);
(...skipping 15 matching lines...) Expand all
94 public: 96 public:
95 MOCK_METHOD2(ReadFrames, int(ScopedVector<WebSocketFrame>*, 97 MOCK_METHOD2(ReadFrames, int(ScopedVector<WebSocketFrame>*,
96 const CompletionCallback&)); 98 const CompletionCallback&));
97 MOCK_METHOD2(WriteFrames, int(ScopedVector<WebSocketFrame>*, 99 MOCK_METHOD2(WriteFrames, int(ScopedVector<WebSocketFrame>*,
98 const CompletionCallback&)); 100 const CompletionCallback&));
99 MOCK_METHOD0(Close, void()); 101 MOCK_METHOD0(Close, void());
100 MOCK_CONST_METHOD0(GetSubProtocol, std::string()); 102 MOCK_CONST_METHOD0(GetSubProtocol, std::string());
101 MOCK_CONST_METHOD0(GetExtensions, std::string()); 103 MOCK_CONST_METHOD0(GetExtensions, std::string());
102 }; 104 };
103 105
106 // This mock class relies on some assumptions.
107 // - RecordInputDataFrame is called after the corresponding WriteFrames
108 // call.
109 // - RecordWrittenDataFrame is called before writing the frame.
110 class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor {
111 public:
112 WebSocketDeflatePredictorMock() : result_(DEFLATE) {}
113 virtual ~WebSocketDeflatePredictorMock() {
114 // Verify whether all expectaions are consumed.
115 DCHECK(frames_to_be_input_.empty());
116 DCHECK(frames_written_.empty());
117 }
118
119 // WebSocketDeflatePredictor functions.
120 virtual Result Predict(const ScopedVector<WebSocketFrame>& frames,
121 size_t frame_index) OVERRIDE {
122 return result_;
123 }
124 virtual void RecordInputDataFrame(const WebSocketFrame* frame) OVERRIDE {
125 DCHECK(WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode));
126 DCHECK(!frame->header.reserved1);
127 DCHECK(!frames_to_be_input_.empty());
128 DCHECK_EQ(frame, frames_to_be_input_.front());
129 frames_to_be_input_.pop_front();
130 }
131 virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) OVERRIDE {
132 DCHECK(WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode));
133 frames_written_.push_back(frame);
134 }
135
136 // Sets |result_| for the |Predict| return value.
137 void set_result(Result result) { result_ = result; }
138
139 // Adds |frame| as an expectation of future |RecordInputDataFrame| call.
140 void AddFrameToBeInput(const WebSocketFrame* frame) {
141 if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode))
142 return;
143 frames_to_be_input_.push_back(frame);
144 }
145 // Verifies that |frame| is recorded in order.
146 void VerifySentFrame(const WebSocketFrame* frame) {
147 if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode))
148 return;
149 DCHECK(!frames_written_.empty());
150 DCHECK_EQ(frame, frames_written_.front());
151 frames_written_.pop_front();
152 }
153 void AddFramesToBeInput(const ScopedVector<WebSocketFrame>& frames) {
154 for (size_t i = 0; i < frames.size(); ++i)
155 AddFrameToBeInput(frames[i]);
156 }
157 void VerifySentFrames(const ScopedVector<WebSocketFrame>& frames) {
158 for (size_t i = 0; i < frames.size(); ++i)
159 VerifySentFrame(frames[i]);
160 }
161 // Call this method in order to disable checks in the destructor when
162 // WriteFrames fails.
163 void Clear() {
164 frames_to_be_input_.clear();
165 frames_written_.clear();
166 }
167
168 private:
169 Result result_;
170 // Data frames which will be recorded by |RecordInputFrames|.
171 // Pushed by |AddFrameToBeInput| and popped and verified by
172 // |RecordInputFrames|.
173 std::deque<const WebSocketFrame*> frames_to_be_input_;
174 // Data frames recorded by |RecordWrittenFrames|.
175 // Pushed by |RecordWrittenFrames| and popped and verified by
176 // |VerifySentFrame|.
177 std::deque<const WebSocketFrame*> frames_written_;
178 };
179
104 class WebSocketDeflateStreamTest : public ::testing::Test { 180 class WebSocketDeflateStreamTest : public ::testing::Test {
105 public: 181 public:
106 WebSocketDeflateStreamTest() 182 WebSocketDeflateStreamTest()
107 : mock_stream_(NULL) { 183 : mock_stream_(NULL) {
108 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; 184 mock_stream_ = new testing::StrictMock<MockWebSocketStream>;
185 predictor_ = new WebSocketDeflatePredictorMock;
109 deflate_stream_.reset(new WebSocketDeflateStream( 186 deflate_stream_.reset(new WebSocketDeflateStream(
110 scoped_ptr<WebSocketStream>(mock_stream_), 187 scoped_ptr<WebSocketStream>(mock_stream_),
111 WebSocketDeflater::TAKE_OVER_CONTEXT)); 188 WebSocketDeflater::TAKE_OVER_CONTEXT,
189 scoped_ptr<WebSocketDeflatePredictor>(predictor_)));
112 } 190 }
113 virtual ~WebSocketDeflateStreamTest() {} 191 virtual ~WebSocketDeflateStreamTest() {}
114 192
115 protected: 193 protected:
116 scoped_ptr<WebSocketDeflateStream> deflate_stream_; 194 scoped_ptr<WebSocketDeflateStream> deflate_stream_;
117 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. 195 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed.
118 MockWebSocketStream* mock_stream_; 196 MockWebSocketStream* mock_stream_;
197 // |predictor_| will be deleted when |deflate_stream_| is destroyed.
198 WebSocketDeflatePredictorMock* predictor_;
119 }; 199 };
120 200
121 // Since WebSocketDeflater with DoNotTakeOverContext is well tested at 201 // Since WebSocketDeflater with DoNotTakeOverContext is well tested at
122 // websocket_deflater_test.cc, we have only one test for this configuration 202 // websocket_deflater_test.cc, we have only a few tests for this configuration
123 // here. 203 // here.
124 class WebSocketDeflateStreamWithDoNotTakeOverContextTest 204 class WebSocketDeflateStreamWithDoNotTakeOverContextTest
125 : public ::testing::Test { 205 : public ::testing::Test {
126 public: 206 public:
127 WebSocketDeflateStreamWithDoNotTakeOverContextTest() 207 WebSocketDeflateStreamWithDoNotTakeOverContextTest()
128 : mock_stream_(NULL) { 208 : mock_stream_(NULL) {
129 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; 209 mock_stream_ = new testing::StrictMock<MockWebSocketStream>;
210 predictor_ = new WebSocketDeflatePredictorMock;
130 deflate_stream_.reset(new WebSocketDeflateStream( 211 deflate_stream_.reset(new WebSocketDeflateStream(
131 scoped_ptr<WebSocketStream>(mock_stream_), 212 scoped_ptr<WebSocketStream>(mock_stream_),
132 WebSocketDeflater::DO_NOT_TAKE_OVER_CONTEXT)); 213 WebSocketDeflater::DO_NOT_TAKE_OVER_CONTEXT,
214 scoped_ptr<WebSocketDeflatePredictor>(predictor_)));
133 } 215 }
134 virtual ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() {} 216 virtual ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() {}
135 217
136 protected: 218 protected:
137 scoped_ptr<WebSocketDeflateStream> deflate_stream_; 219 scoped_ptr<WebSocketDeflateStream> deflate_stream_;
138 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. 220 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed.
139 MockWebSocketStream* mock_stream_; 221 MockWebSocketStream* mock_stream_;
222 // |predictor_| will be deleted when |deflate_stream_| is destroyed.
223 WebSocketDeflatePredictorMock* predictor_;
140 }; 224 };
141 225
142 // ReadFrameStub is a stub for WebSocketStream::ReadFrames. 226 // ReadFrameStub is a stub for WebSocketStream::ReadFrames.
143 // It returns |result_| and |frames_to_output_| to the caller and 227 // It returns |result_| and |frames_to_output_| to the caller and
144 // saves parameters to |frames_passed_| and |callback_|. 228 // saves parameters to |frames_passed_| and |callback_|.
145 class ReadFramesStub { 229 class ReadFramesStub {
146 public: 230 public:
147 explicit ReadFramesStub(int result) : result_(result) {} 231 explicit ReadFramesStub(int result) : result_(result) {}
148 232
149 ReadFramesStub(int result, ScopedVector<WebSocketFrame>* frames_to_output) 233 ReadFramesStub(int result, ScopedVector<WebSocketFrame>* frames_to_output)
(...skipping 16 matching lines...) Expand all
166 return frames_passed_; 250 return frames_passed_;
167 } 251 }
168 252
169 private: 253 private:
170 int result_; 254 int result_;
171 CompletionCallback callback_; 255 CompletionCallback callback_;
172 ScopedVector<WebSocketFrame> frames_to_output_; 256 ScopedVector<WebSocketFrame> frames_to_output_;
173 ScopedVector<WebSocketFrame>* frames_passed_; 257 ScopedVector<WebSocketFrame>* frames_passed_;
174 }; 258 };
175 259
176 // WriteFrameStub is a stub for WebSocketStream::WriteFrames. 260 // WriteFramesStub is a stub for WebSocketStream::WriteFrames.
177 // It returns |result_| and |frames_| to the caller and 261 // It returns |result_| and |frames_| to the caller and
178 // saves |callback| parameter to |callback_|. 262 // saves |callback| parameter to |callback_|.
179 class WriteFramesStub { 263 class WriteFramesStub {
180 public: 264 public:
181 explicit WriteFramesStub(int result) : result_(result) {} 265 explicit WriteFramesStub(WebSocketDeflatePredictorMock* predictor,
266 int result)
267 : result_(result), predictor_(predictor) {}
182 268
183 int Call(ScopedVector<WebSocketFrame>* frames, 269 int Call(ScopedVector<WebSocketFrame>* frames,
184 const CompletionCallback& callback) { 270 const CompletionCallback& callback) {
185 for (size_t i = 0; i < frames->size(); ++i) { 271 frames_.insert(frames_.end(), frames->begin(), frames->end());
186 frames_.push_back((*frames)[i]);
187 }
188 frames->weak_clear(); 272 frames->weak_clear();
189 callback_ = callback; 273 callback_ = callback;
274 predictor_->VerifySentFrames(frames_);
190 return result_; 275 return result_;
191 } 276 }
192 277
193 int result() const { return result_; } 278 int result() const { return result_; }
194 const CompletionCallback callback() const { return callback_; } 279 const CompletionCallback callback() const { return callback_; }
195 ScopedVector<WebSocketFrame>* frames() { return &frames_; } 280 ScopedVector<WebSocketFrame>* frames() { return &frames_; }
196 281
197 private: 282 private:
198 int result_; 283 int result_;
199 CompletionCallback callback_; 284 CompletionCallback callback_;
200 ScopedVector<WebSocketFrame> frames_; 285 ScopedVector<WebSocketFrame> frames_;
286 WebSocketDeflatePredictorMock* predictor_;
201 }; 287 };
202 288
203 TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) { 289 TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) {
204 ScopedVector<WebSocketFrame> frames; 290 ScopedVector<WebSocketFrame> frames;
205 CompletionCallback callback; 291 CompletionCallback callback;
206 { 292 {
207 InSequence s; 293 InSequence s;
208 EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _)) 294 EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
209 .WillOnce(Return(ERR_FAILED)); 295 .WillOnce(Return(ERR_FAILED));
210 } 296 }
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) { 870 TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) {
785 ScopedVector<WebSocketFrame> frames; 871 ScopedVector<WebSocketFrame> frames;
786 CompletionCallback callback; 872 CompletionCallback callback;
787 { 873 {
788 InSequence s; 874 InSequence s;
789 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 875 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
790 .WillOnce(Return(ERR_FAILED)); 876 .WillOnce(Return(ERR_FAILED));
791 } 877 }
792 878
793 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "hello"); 879 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "hello");
880 predictor_->AddFramesToBeInput(frames);
794 EXPECT_EQ(ERR_FAILED, deflate_stream_->WriteFrames(&frames, callback)); 881 EXPECT_EQ(ERR_FAILED, deflate_stream_->WriteFrames(&frames, callback));
882 predictor_->Clear();
795 } 883 }
796 884
797 TEST_F(WebSocketDeflateStreamTest, WriteFrameImmediately) { 885 TEST_F(WebSocketDeflateStreamTest, WriteFrameImmediately) {
798 ScopedVector<WebSocketFrame> frames; 886 ScopedVector<WebSocketFrame> frames;
799 CompletionCallback callback; 887 CompletionCallback callback;
800 WriteFramesStub stub(OK); 888 WriteFramesStub stub(predictor_, OK);
801 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 889 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
890 predictor_->AddFramesToBeInput(frames);
802 { 891 {
803 InSequence s; 892 InSequence s;
804 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) 893 EXPECT_CALL(*mock_stream_, WriteFrames(_, _))
805 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 894 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
806 } 895 }
807 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 896 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
808 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 897 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
809 ASSERT_EQ(1u, frames_passed.size()); 898 ASSERT_EQ(1u, frames_passed.size());
810 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); 899 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
811 EXPECT_TRUE(frames_passed[0]->header.final); 900 EXPECT_TRUE(frames_passed[0]->header.final);
812 EXPECT_TRUE(frames_passed[0]->header.reserved1); 901 EXPECT_TRUE(frames_passed[0]->header.reserved1);
813 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 902 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
814 ToString(frames_passed[0])); 903 ToString(frames_passed[0]));
815 } 904 }
816 905
817 TEST_F(WebSocketDeflateStreamTest, WriteFrameAsync) { 906 TEST_F(WebSocketDeflateStreamTest, WriteFrameAsync) {
818 WriteFramesStub stub(ERR_IO_PENDING); 907 WriteFramesStub stub(predictor_, ERR_IO_PENDING);
819 MockCallback mock_callback, checkpoint; 908 MockCallback mock_callback, checkpoint;
820 CompletionCallback callback = 909 CompletionCallback callback =
821 base::Bind(&MockCallback::Call, base::Unretained(&mock_callback)); 910 base::Bind(&MockCallback::Call, base::Unretained(&mock_callback));
822 ScopedVector<WebSocketFrame> frames; 911 ScopedVector<WebSocketFrame> frames;
823 { 912 {
824 InSequence s; 913 InSequence s;
825 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 914 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
826 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 915 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
827 EXPECT_CALL(checkpoint, Call(0)); 916 EXPECT_CALL(checkpoint, Call(0));
828 EXPECT_CALL(mock_callback, Call(OK)); 917 EXPECT_CALL(mock_callback, Call(OK));
829 } 918 }
830 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 919 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
920 predictor_->AddFramesToBeInput(frames);
831 ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->WriteFrames(&frames, callback)); 921 ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->WriteFrames(&frames, callback));
832 922
833 checkpoint.Call(0); 923 checkpoint.Call(0);
834 stub.callback().Run(OK); 924 stub.callback().Run(OK);
835 925
836 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 926 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
837 ASSERT_EQ(1u, frames_passed.size()); 927 ASSERT_EQ(1u, frames_passed.size());
838 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); 928 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
839 EXPECT_TRUE(frames_passed[0]->header.final); 929 EXPECT_TRUE(frames_passed[0]->header.final);
840 EXPECT_TRUE(frames_passed[0]->header.reserved1); 930 EXPECT_TRUE(frames_passed[0]->header.reserved1);
841 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 931 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
842 ToString(frames_passed[0])); 932 ToString(frames_passed[0]));
843 } 933 }
844 934
845 TEST_F(WebSocketDeflateStreamTest, WriteControlFrameBetweenDataFrames) { 935 TEST_F(WebSocketDeflateStreamTest, WriteControlFrameBetweenDataFrames) {
846 ScopedVector<WebSocketFrame> frames; 936 ScopedVector<WebSocketFrame> frames;
847 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "Hel"); 937 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "Hel");
848 AppendTo(&frames, WebSocketFrameHeader::kOpCodePing, kFinal); 938 AppendTo(&frames, WebSocketFrameHeader::kOpCodePing, kFinal);
849 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "lo"); 939 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "lo");
850 WriteFramesStub stub(OK); 940 predictor_->AddFramesToBeInput(frames);
941 WriteFramesStub stub(predictor_, OK);
851 CompletionCallback callback; 942 CompletionCallback callback;
852 943
853 { 944 {
854 InSequence s; 945 InSequence s;
855 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 946 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
856 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 947 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
857 } 948 }
858 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 949 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
859 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 950 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
860 ASSERT_EQ(2u, frames_passed.size()); 951 ASSERT_EQ(2u, frames_passed.size());
861 EXPECT_EQ(WebSocketFrameHeader::kOpCodePing, frames_passed[0]->header.opcode); 952 EXPECT_EQ(WebSocketFrameHeader::kOpCodePing, frames_passed[0]->header.opcode);
862 EXPECT_TRUE(frames_passed[0]->header.final); 953 EXPECT_TRUE(frames_passed[0]->header.final);
863 EXPECT_FALSE(frames_passed[0]->header.reserved1); 954 EXPECT_FALSE(frames_passed[0]->header.reserved1);
864 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); 955 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode);
865 EXPECT_TRUE(frames_passed[1]->header.final); 956 EXPECT_TRUE(frames_passed[1]->header.final);
866 EXPECT_TRUE(frames_passed[1]->header.reserved1); 957 EXPECT_TRUE(frames_passed[1]->header.reserved1);
867 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 958 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
868 ToString(frames_passed[1])); 959 ToString(frames_passed[1]));
869 } 960 }
870 961
871 TEST_F(WebSocketDeflateStreamTest, WriteEmptyMessage) { 962 TEST_F(WebSocketDeflateStreamTest, WriteEmptyMessage) {
872 ScopedVector<WebSocketFrame> frames; 963 ScopedVector<WebSocketFrame> frames;
873 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal); 964 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal);
874 WriteFramesStub stub(OK); 965 predictor_->AddFramesToBeInput(frames);
966 WriteFramesStub stub(predictor_, OK);
875 CompletionCallback callback; 967 CompletionCallback callback;
876 968
877 { 969 {
878 InSequence s; 970 InSequence s;
879 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 971 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
880 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 972 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
881 } 973 }
882 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 974 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
883 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 975 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
884 ASSERT_EQ(1u, frames_passed.size()); 976 ASSERT_EQ(1u, frames_passed.size());
885 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); 977 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
886 EXPECT_TRUE(frames_passed[0]->header.final); 978 EXPECT_TRUE(frames_passed[0]->header.final);
887 EXPECT_TRUE(frames_passed[0]->header.reserved1); 979 EXPECT_TRUE(frames_passed[0]->header.reserved1);
888 EXPECT_EQ(std::string("\x02\x00", 2), ToString(frames_passed[0])); 980 EXPECT_EQ(std::string("\x02\x00", 2), ToString(frames_passed[0]));
889 } 981 }
890 982
983 TEST_F(WebSocketDeflateStreamTest, WriteUncompressedMessage) {
984 ScopedVector<WebSocketFrame> frames;
985 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "AAAA");
986 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "AAA");
987 predictor_->AddFramesToBeInput(frames);
988 WriteFramesStub stub(predictor_, OK);
989 CompletionCallback callback;
990
991 predictor_->set_result(WebSocketDeflatePredictor::DO_NOT_DEFLATE);
992
993 {
994 InSequence s;
995 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
996 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
997 }
998 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
999 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
1000 ASSERT_EQ(2u, frames_passed.size());
1001 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
1002 EXPECT_FALSE(frames_passed[0]->header.final);
1003 EXPECT_FALSE(frames_passed[0]->header.reserved1);
1004 EXPECT_EQ("AAAA", ToString(frames_passed[0]));
1005 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation,
1006 frames_passed[1]->header.opcode);
1007 EXPECT_TRUE(frames_passed[1]->header.final);
1008 EXPECT_FALSE(frames_passed[1]->header.reserved1);
1009 EXPECT_EQ("AAA", ToString(frames_passed[1]));
1010 }
1011
891 TEST_F(WebSocketDeflateStreamTest, LargeDeflatedFramesShouldBeSplit) { 1012 TEST_F(WebSocketDeflateStreamTest, LargeDeflatedFramesShouldBeSplit) {
892 WebSocketDeflater deflater(WebSocketDeflater::TAKE_OVER_CONTEXT); 1013 WebSocketDeflater deflater(WebSocketDeflater::TAKE_OVER_CONTEXT);
893 LinearCongruentialGenerator lcg(133); 1014 LinearCongruentialGenerator lcg(133);
894 WriteFramesStub stub(OK); 1015 WriteFramesStub stub(predictor_, OK);
895 CompletionCallback callback; 1016 CompletionCallback callback;
896 const size_t size = 1024; 1017 const size_t size = 1024;
897 1018
898 { 1019 {
899 InSequence s; 1020 InSequence s;
900 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) 1021 EXPECT_CALL(*mock_stream_, WriteFrames(_, _))
901 .WillRepeatedly(Invoke(&stub, &WriteFramesStub::Call)); 1022 .WillRepeatedly(Invoke(&stub, &WriteFramesStub::Call));
902 } 1023 }
903 ScopedVector<WebSocketFrame> total_compressed_frames; 1024 ScopedVector<WebSocketFrame> total_compressed_frames;
904 1025
905 deflater.Initialize(kWindowBits); 1026 deflater.Initialize(kWindowBits);
906 while (true) { 1027 while (true) {
907 bool is_final = (total_compressed_frames.size() >= 2); 1028 bool is_final = (total_compressed_frames.size() >= 2);
908 ScopedVector<WebSocketFrame> frames; 1029 ScopedVector<WebSocketFrame> frames;
909 std::string data; 1030 std::string data;
910 for (size_t i = 0; i < size; ++i) 1031 for (size_t i = 0; i < size; ++i)
911 data += static_cast<char>(lcg.Generate()); 1032 data += static_cast<char>(lcg.Generate());
912 deflater.AddBytes(data.data(), data.size()); 1033 deflater.AddBytes(data.data(), data.size());
913 FrameFlag flag = is_final ? kFinal : kNoFlag; 1034 FrameFlag flag = is_final ? kFinal : kNoFlag;
914 AppendTo(&frames, WebSocketFrameHeader::kOpCodeBinary, flag, data); 1035 AppendTo(&frames, WebSocketFrameHeader::kOpCodeBinary, flag, data);
1036 predictor_->AddFramesToBeInput(frames);
915 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 1037 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
916 for (size_t i = 0; i < stub.frames()->size(); ++i) 1038 total_compressed_frames.insert(total_compressed_frames.end(),
917 total_compressed_frames.push_back((*stub.frames())[i]); 1039 stub.frames()->begin(),
1040 stub.frames()->end());
918 stub.frames()->weak_clear(); 1041 stub.frames()->weak_clear();
919 if (is_final) 1042 if (is_final)
920 break; 1043 break;
921 } 1044 }
922 deflater.Finish(); 1045 deflater.Finish();
923 std::string total_deflated; 1046 std::string total_deflated;
924 for (size_t i = 0; i < total_compressed_frames.size(); ++i) { 1047 for (size_t i = 0; i < total_compressed_frames.size(); ++i) {
925 WebSocketFrame* frame = total_compressed_frames[i]; 1048 WebSocketFrame* frame = total_compressed_frames[i];
926 const WebSocketFrameHeader& header = frame->header; 1049 const WebSocketFrameHeader& header = frame->header;
927 if (i > 0) { 1050 if (i > 0) {
(...skipping 10 matching lines...) Expand all
938 total_deflated += ToString(frame); 1061 total_deflated += ToString(frame);
939 } 1062 }
940 EXPECT_EQ(total_deflated, 1063 EXPECT_EQ(total_deflated,
941 ToString(deflater.GetOutput(deflater.CurrentOutputSize()))); 1064 ToString(deflater.GetOutput(deflater.CurrentOutputSize())));
942 } 1065 }
943 1066
944 TEST_F(WebSocketDeflateStreamTest, WriteMultipleMessages) { 1067 TEST_F(WebSocketDeflateStreamTest, WriteMultipleMessages) {
945 ScopedVector<WebSocketFrame> frames; 1068 ScopedVector<WebSocketFrame> frames;
946 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 1069 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
947 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 1070 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
948 WriteFramesStub stub(OK); 1071 predictor_->AddFramesToBeInput(frames);
1072 WriteFramesStub stub(predictor_, OK);
949 CompletionCallback callback; 1073 CompletionCallback callback;
950 1074
951 { 1075 {
952 InSequence s; 1076 InSequence s;
953 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 1077 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
954 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 1078 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
955 } 1079 }
956 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 1080 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
957 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 1081 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
958 ASSERT_EQ(2u, frames_passed.size()); 1082 ASSERT_EQ(2u, frames_passed.size());
959 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); 1083 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
960 EXPECT_TRUE(frames_passed[0]->header.final); 1084 EXPECT_TRUE(frames_passed[0]->header.final);
961 EXPECT_TRUE(frames_passed[0]->header.reserved1); 1085 EXPECT_TRUE(frames_passed[0]->header.reserved1);
962 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 1086 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
963 ToString(frames_passed[0])); 1087 ToString(frames_passed[0]));
964 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); 1088 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode);
965 EXPECT_TRUE(frames_passed[1]->header.final); 1089 EXPECT_TRUE(frames_passed[1]->header.final);
966 EXPECT_TRUE(frames_passed[1]->header.reserved1); 1090 EXPECT_TRUE(frames_passed[1]->header.reserved1);
967 EXPECT_EQ(std::string("\xf2\x00\x11\x00\x00", 5), ToString(frames_passed[1])); 1091 EXPECT_EQ(std::string("\xf2\x00\x11\x00\x00", 5), ToString(frames_passed[1]));
968 } 1092 }
969 1093
970 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest, 1094 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest,
971 WriteMultipleMessages) { 1095 WriteMultipleMessages) {
972 ScopedVector<WebSocketFrame> frames; 1096 ScopedVector<WebSocketFrame> frames;
973 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 1097 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
974 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); 1098 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
975 WriteFramesStub stub(OK); 1099 predictor_->AddFramesToBeInput(frames);
1100 WriteFramesStub stub(predictor_, OK);
976 CompletionCallback callback; 1101 CompletionCallback callback;
977 1102
978 { 1103 {
979 InSequence s; 1104 InSequence s;
980 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) 1105 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
981 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); 1106 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
982 } 1107 }
983 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); 1108 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
984 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); 1109 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
985 ASSERT_EQ(2u, frames_passed.size()); 1110 ASSERT_EQ(2u, frames_passed.size());
986 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); 1111 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
987 EXPECT_TRUE(frames_passed[0]->header.final); 1112 EXPECT_TRUE(frames_passed[0]->header.final);
988 EXPECT_TRUE(frames_passed[0]->header.reserved1); 1113 EXPECT_TRUE(frames_passed[0]->header.reserved1);
989 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 1114 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
990 ToString(frames_passed[0])); 1115 ToString(frames_passed[0]));
991 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); 1116 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode);
992 EXPECT_TRUE(frames_passed[1]->header.final); 1117 EXPECT_TRUE(frames_passed[1]->header.final);
993 EXPECT_TRUE(frames_passed[1]->header.reserved1); 1118 EXPECT_TRUE(frames_passed[1]->header.reserved1);
994 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), 1119 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7),
995 ToString(frames_passed[1])); 1120 ToString(frames_passed[1]));
996 } 1121 }
997 1122
1123 // In order to check the stream works correctly for multiple
1124 // "PossiblyCompressedMessage"s, we test various messages at one test case.
1125 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest,
1126 WritePossiblyCompressMessages) {
1127 ScopedVector<WebSocketFrame> frames;
1128 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "He");
1129 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "llo");
1130 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "AAAAAAAAAA");
1131 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "AA");
1132 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "XX");
1133 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "YY");
1134 predictor_->AddFramesToBeInput(frames);
1135 WriteFramesStub stub(predictor_, OK);
1136 CompletionCallback callback;
1137 predictor_->set_result(WebSocketDeflatePredictor::TRY_DEFLATE);
1138
1139 {
1140 InSequence s;
1141 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
1142 .WillOnce(Invoke(&stub, &WriteFramesStub::Call));
1143 }
1144 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
1145 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
1146 ASSERT_EQ(5u, frames_passed.size());
1147
1148 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode);
1149 EXPECT_FALSE(frames_passed[0]->header.final);
1150 EXPECT_FALSE(frames_passed[0]->header.reserved1);
1151 EXPECT_EQ("He", ToString(frames_passed[0]));
1152 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation,
1153 frames_passed[1]->header.opcode);
1154 EXPECT_TRUE(frames_passed[1]->header.final);
1155 EXPECT_FALSE(frames_passed[1]->header.reserved1);
1156 EXPECT_EQ("llo", ToString(frames_passed[1]));
1157
1158 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[2]->header.opcode);
1159 EXPECT_TRUE(frames_passed[2]->header.final);
1160 EXPECT_TRUE(frames_passed[2]->header.reserved1);
1161 EXPECT_EQ(std::string("\x72\x74\x44\x00\x00\x00", 6),
1162 ToString(frames_passed[2]));
1163
1164 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[3]->header.opcode);
1165 EXPECT_FALSE(frames_passed[3]->header.final);
1166 EXPECT_FALSE(frames_passed[3]->header.reserved1);
1167 EXPECT_EQ("XX", ToString(frames_passed[3]));
1168 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation,
1169 frames_passed[4]->header.opcode);
1170 EXPECT_TRUE(frames_passed[4]->header.final);
1171 EXPECT_FALSE(frames_passed[4]->header.reserved1);
1172 EXPECT_EQ("YY", ToString(frames_passed[4]));
1173 }
1174
998 } // namespace 1175 } // namespace
999 1176
1000 } // namespace net 1177 } // namespace net
OLDNEW
« net/websockets/websocket_deflate_stream.h ('K') | « net/websockets/websocket_deflate_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698