OLD | NEW |
---|---|
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 Loading... | |
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 Loading... | |
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 DCHECK(frames_to_be_input_.empty()); | |
115 DCHECK(frames_to_be_written_.empty()); | |
116 } | |
117 | |
Adam Rice
2013/10/30 00:28:07
Please add a comment that these implement the WebS
yhirano
2013/10/30 02:20:33
Done.
| |
118 virtual Result Predict(const ScopedVector<WebSocketFrame>& frames, | |
119 size_t frame_index) OVERRIDE { | |
120 return result_; | |
121 } | |
122 virtual void RecordInputDataFrame(const WebSocketFrame* frame) OVERRIDE { | |
123 DCHECK(WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)); | |
124 DCHECK(!frame->header.reserved1); | |
125 DCHECK(!frames_to_be_input_.empty()); | |
126 DCHECK_EQ(frame, frames_to_be_input_.front()); | |
127 frames_to_be_input_.pop_front(); | |
128 } | |
129 virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) OVERRIDE { | |
130 DCHECK(WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)); | |
131 frames_to_be_written_.push_back(frame); | |
132 } | |
133 | |
Adam Rice
2013/10/30 00:28:07
Please insert a comment here that the following me
yhirano
2013/10/30 02:20:33
Done.
| |
134 void set_result(Result result) { result_ = result; } | |
135 void AddFrameToBeInput(const WebSocketFrame* frame) { | |
136 if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) | |
137 return; | |
138 frames_to_be_input_.push_back(frame); | |
139 } | |
140 void AddFramesToBeInput(const ScopedVector<WebSocketFrame>& frames) { | |
141 for (size_t i = 0; i < frames.size(); ++i) | |
142 AddFrameToBeInput(frames[i]); | |
143 } | |
144 void VerifySentFrame(const WebSocketFrame* frame) { | |
145 if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) | |
146 return; | |
147 DCHECK(!frames_to_be_written_.empty()); | |
148 DCHECK_EQ(frame, frames_to_be_written_.front()); | |
149 frames_to_be_written_.pop_front(); | |
150 } | |
151 void VerifySentFrames(const ScopedVector<WebSocketFrame>& frames) { | |
152 for (size_t i = 0; i < frames.size(); ++i) | |
153 VerifySentFrame(frames[i]); | |
154 } | |
155 // Call this method in order to disable checks in the destructor when | |
156 // WriteFrames fails. | |
157 void Clear() { | |
158 frames_to_be_input_.clear(); | |
159 frames_to_be_written_.clear(); | |
160 } | |
161 | |
162 private: | |
163 Result result_; | |
164 std::deque<const WebSocketFrame*> frames_to_be_input_; | |
Adam Rice
2013/10/30 00:28:07
If I understand correctly, these member variables
yhirano
2013/10/30 02:20:33
Done.
| |
165 std::deque<const WebSocketFrame*> frames_to_be_written_; | |
166 }; | |
167 | |
104 class WebSocketDeflateStreamTest : public ::testing::Test { | 168 class WebSocketDeflateStreamTest : public ::testing::Test { |
105 public: | 169 public: |
106 WebSocketDeflateStreamTest() | 170 WebSocketDeflateStreamTest() |
107 : mock_stream_(NULL) { | 171 : mock_stream_(NULL) { |
108 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; | 172 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; |
173 predictor_ = new WebSocketDeflatePredictorMock; | |
109 deflate_stream_.reset(new WebSocketDeflateStream( | 174 deflate_stream_.reset(new WebSocketDeflateStream( |
110 scoped_ptr<WebSocketStream>(mock_stream_), | 175 scoped_ptr<WebSocketStream>(mock_stream_), |
111 WebSocketDeflater::TAKE_OVER_CONTEXT)); | 176 WebSocketDeflater::TAKE_OVER_CONTEXT, |
177 scoped_ptr<WebSocketDeflatePredictor>(predictor_))); | |
112 } | 178 } |
113 virtual ~WebSocketDeflateStreamTest() {} | 179 virtual ~WebSocketDeflateStreamTest() {} |
114 | 180 |
115 protected: | 181 protected: |
116 scoped_ptr<WebSocketDeflateStream> deflate_stream_; | 182 scoped_ptr<WebSocketDeflateStream> deflate_stream_; |
117 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. | 183 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. |
118 MockWebSocketStream* mock_stream_; | 184 MockWebSocketStream* mock_stream_; |
185 // |predictor_| will be deleted when |deflate_stream_| is destroyed. | |
186 WebSocketDeflatePredictorMock* predictor_; | |
119 }; | 187 }; |
120 | 188 |
121 // Since WebSocketDeflater with DoNotTakeOverContext is well tested at | 189 // Since WebSocketDeflater with DoNotTakeOverContext is well tested at |
122 // websocket_deflater_test.cc, we have only one test for this configuration | 190 // websocket_deflater_test.cc, we have only a few tests for this configuration |
123 // here. | 191 // here. |
124 class WebSocketDeflateStreamWithDoNotTakeOverContextTest | 192 class WebSocketDeflateStreamWithDoNotTakeOverContextTest |
125 : public ::testing::Test { | 193 : public ::testing::Test { |
126 public: | 194 public: |
127 WebSocketDeflateStreamWithDoNotTakeOverContextTest() | 195 WebSocketDeflateStreamWithDoNotTakeOverContextTest() |
128 : mock_stream_(NULL) { | 196 : mock_stream_(NULL) { |
129 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; | 197 mock_stream_ = new testing::StrictMock<MockWebSocketStream>; |
198 predictor_ = new WebSocketDeflatePredictorMock; | |
130 deflate_stream_.reset(new WebSocketDeflateStream( | 199 deflate_stream_.reset(new WebSocketDeflateStream( |
131 scoped_ptr<WebSocketStream>(mock_stream_), | 200 scoped_ptr<WebSocketStream>(mock_stream_), |
132 WebSocketDeflater::DO_NOT_TAKE_OVER_CONTEXT)); | 201 WebSocketDeflater::DO_NOT_TAKE_OVER_CONTEXT, |
202 scoped_ptr<WebSocketDeflatePredictor>(predictor_))); | |
133 } | 203 } |
134 virtual ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() {} | 204 virtual ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() {} |
135 | 205 |
136 protected: | 206 protected: |
137 scoped_ptr<WebSocketDeflateStream> deflate_stream_; | 207 scoped_ptr<WebSocketDeflateStream> deflate_stream_; |
138 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. | 208 // |mock_stream_| will be deleted when |deflate_stream_| is destroyed. |
139 MockWebSocketStream* mock_stream_; | 209 MockWebSocketStream* mock_stream_; |
210 // |predictor_| will be deleted when |deflate_stream_| is destroyed. | |
211 WebSocketDeflatePredictorMock* predictor_; | |
140 }; | 212 }; |
141 | 213 |
142 // ReadFrameStub is a stub for WebSocketStream::ReadFrames. | 214 // ReadFrameStub is a stub for WebSocketStream::ReadFrames. |
143 // It returns |result_| and |frames_to_output_| to the caller and | 215 // It returns |result_| and |frames_to_output_| to the caller and |
144 // saves parameters to |frames_passed_| and |callback_|. | 216 // saves parameters to |frames_passed_| and |callback_|. |
145 class ReadFramesStub { | 217 class ReadFramesStub { |
146 public: | 218 public: |
147 explicit ReadFramesStub(int result) : result_(result) {} | 219 explicit ReadFramesStub(int result) : result_(result) {} |
148 | 220 |
149 ReadFramesStub(int result, ScopedVector<WebSocketFrame>* frames_to_output) | 221 ReadFramesStub(int result, ScopedVector<WebSocketFrame>* frames_to_output) |
(...skipping 16 matching lines...) Expand all Loading... | |
166 return frames_passed_; | 238 return frames_passed_; |
167 } | 239 } |
168 | 240 |
169 private: | 241 private: |
170 int result_; | 242 int result_; |
171 CompletionCallback callback_; | 243 CompletionCallback callback_; |
172 ScopedVector<WebSocketFrame> frames_to_output_; | 244 ScopedVector<WebSocketFrame> frames_to_output_; |
173 ScopedVector<WebSocketFrame>* frames_passed_; | 245 ScopedVector<WebSocketFrame>* frames_passed_; |
174 }; | 246 }; |
175 | 247 |
176 // WriteFrameStub is a stub for WebSocketStream::WriteFrames. | 248 // WriteFramesStub is a stub for WebSocketStream::WriteFrames. |
177 // It returns |result_| and |frames_| to the caller and | 249 // It returns |result_| and |frames_| to the caller and |
178 // saves |callback| parameter to |callback_|. | 250 // saves |callback| parameter to |callback_|. |
179 class WriteFramesStub { | 251 class WriteFramesStub { |
180 public: | 252 public: |
181 explicit WriteFramesStub(int result) : result_(result) {} | 253 explicit WriteFramesStub(WebSocketDeflatePredictorMock* predictor, |
254 int result) | |
255 : result_(result), predictor_(predictor) {} | |
182 | 256 |
183 int Call(ScopedVector<WebSocketFrame>* frames, | 257 int Call(ScopedVector<WebSocketFrame>* frames, |
184 const CompletionCallback& callback) { | 258 const CompletionCallback& callback) { |
185 for (size_t i = 0; i < frames->size(); ++i) { | 259 frames_.insert(frames_.end(), frames->begin(), frames->end()); |
186 frames_.push_back((*frames)[i]); | |
187 } | |
188 frames->weak_clear(); | 260 frames->weak_clear(); |
189 callback_ = callback; | 261 callback_ = callback; |
262 predictor_->VerifySentFrames(frames_); | |
190 return result_; | 263 return result_; |
191 } | 264 } |
192 | 265 |
193 int result() const { return result_; } | 266 int result() const { return result_; } |
194 const CompletionCallback callback() const { return callback_; } | 267 const CompletionCallback callback() const { return callback_; } |
195 ScopedVector<WebSocketFrame>* frames() { return &frames_; } | 268 ScopedVector<WebSocketFrame>* frames() { return &frames_; } |
196 | 269 |
197 private: | 270 private: |
198 int result_; | 271 int result_; |
199 CompletionCallback callback_; | 272 CompletionCallback callback_; |
200 ScopedVector<WebSocketFrame> frames_; | 273 ScopedVector<WebSocketFrame> frames_; |
274 WebSocketDeflatePredictorMock* predictor_; | |
201 }; | 275 }; |
202 | 276 |
203 TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) { | 277 TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) { |
204 ScopedVector<WebSocketFrame> frames; | 278 ScopedVector<WebSocketFrame> frames; |
205 CompletionCallback callback; | 279 CompletionCallback callback; |
206 { | 280 { |
207 InSequence s; | 281 InSequence s; |
208 EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _)) | 282 EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _)) |
209 .WillOnce(Return(ERR_FAILED)); | 283 .WillOnce(Return(ERR_FAILED)); |
210 } | 284 } |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
784 TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) { | 858 TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) { |
785 ScopedVector<WebSocketFrame> frames; | 859 ScopedVector<WebSocketFrame> frames; |
786 CompletionCallback callback; | 860 CompletionCallback callback; |
787 { | 861 { |
788 InSequence s; | 862 InSequence s; |
789 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 863 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
790 .WillOnce(Return(ERR_FAILED)); | 864 .WillOnce(Return(ERR_FAILED)); |
791 } | 865 } |
792 | 866 |
793 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "hello"); | 867 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "hello"); |
868 predictor_->AddFramesToBeInput(frames); | |
794 EXPECT_EQ(ERR_FAILED, deflate_stream_->WriteFrames(&frames, callback)); | 869 EXPECT_EQ(ERR_FAILED, deflate_stream_->WriteFrames(&frames, callback)); |
870 predictor_->Clear(); | |
795 } | 871 } |
796 | 872 |
797 TEST_F(WebSocketDeflateStreamTest, WriteFrameImmediately) { | 873 TEST_F(WebSocketDeflateStreamTest, WriteFrameImmediately) { |
798 ScopedVector<WebSocketFrame> frames; | 874 ScopedVector<WebSocketFrame> frames; |
799 CompletionCallback callback; | 875 CompletionCallback callback; |
800 WriteFramesStub stub(OK); | 876 WriteFramesStub stub(predictor_, OK); |
801 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 877 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
878 predictor_->AddFramesToBeInput(frames); | |
802 { | 879 { |
803 InSequence s; | 880 InSequence s; |
804 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) | 881 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) |
805 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 882 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
806 } | 883 } |
807 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 884 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
808 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 885 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
809 ASSERT_EQ(1u, frames_passed.size()); | 886 ASSERT_EQ(1u, frames_passed.size()); |
810 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | 887 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); |
811 EXPECT_TRUE(frames_passed[0]->header.final); | 888 EXPECT_TRUE(frames_passed[0]->header.final); |
812 EXPECT_TRUE(frames_passed[0]->header.reserved1); | 889 EXPECT_TRUE(frames_passed[0]->header.reserved1); |
813 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 890 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
814 ToString(frames_passed[0])); | 891 ToString(frames_passed[0])); |
815 } | 892 } |
816 | 893 |
817 TEST_F(WebSocketDeflateStreamTest, WriteFrameAsync) { | 894 TEST_F(WebSocketDeflateStreamTest, WriteFrameAsync) { |
818 WriteFramesStub stub(ERR_IO_PENDING); | 895 WriteFramesStub stub(predictor_, ERR_IO_PENDING); |
819 MockCallback mock_callback, checkpoint; | 896 MockCallback mock_callback, checkpoint; |
820 CompletionCallback callback = | 897 CompletionCallback callback = |
821 base::Bind(&MockCallback::Call, base::Unretained(&mock_callback)); | 898 base::Bind(&MockCallback::Call, base::Unretained(&mock_callback)); |
822 ScopedVector<WebSocketFrame> frames; | 899 ScopedVector<WebSocketFrame> frames; |
823 { | 900 { |
824 InSequence s; | 901 InSequence s; |
825 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 902 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
826 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 903 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
827 EXPECT_CALL(checkpoint, Call(0)); | 904 EXPECT_CALL(checkpoint, Call(0)); |
828 EXPECT_CALL(mock_callback, Call(OK)); | 905 EXPECT_CALL(mock_callback, Call(OK)); |
829 } | 906 } |
830 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 907 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
908 predictor_->AddFramesToBeInput(frames); | |
831 ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->WriteFrames(&frames, callback)); | 909 ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->WriteFrames(&frames, callback)); |
832 | 910 |
833 checkpoint.Call(0); | 911 checkpoint.Call(0); |
834 stub.callback().Run(OK); | 912 stub.callback().Run(OK); |
835 | 913 |
836 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 914 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
837 ASSERT_EQ(1u, frames_passed.size()); | 915 ASSERT_EQ(1u, frames_passed.size()); |
838 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | 916 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); |
839 EXPECT_TRUE(frames_passed[0]->header.final); | 917 EXPECT_TRUE(frames_passed[0]->header.final); |
840 EXPECT_TRUE(frames_passed[0]->header.reserved1); | 918 EXPECT_TRUE(frames_passed[0]->header.reserved1); |
841 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 919 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
842 ToString(frames_passed[0])); | 920 ToString(frames_passed[0])); |
843 } | 921 } |
844 | 922 |
845 TEST_F(WebSocketDeflateStreamTest, WriteControlFrameBetweenDataFrames) { | 923 TEST_F(WebSocketDeflateStreamTest, WriteControlFrameBetweenDataFrames) { |
846 ScopedVector<WebSocketFrame> frames; | 924 ScopedVector<WebSocketFrame> frames; |
847 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "Hel"); | 925 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "Hel"); |
848 AppendTo(&frames, WebSocketFrameHeader::kOpCodePing, kFinal); | 926 AppendTo(&frames, WebSocketFrameHeader::kOpCodePing, kFinal); |
849 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "lo"); | 927 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "lo"); |
850 WriteFramesStub stub(OK); | 928 predictor_->AddFramesToBeInput(frames); |
929 WriteFramesStub stub(predictor_, OK); | |
851 CompletionCallback callback; | 930 CompletionCallback callback; |
852 | 931 |
853 { | 932 { |
854 InSequence s; | 933 InSequence s; |
855 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 934 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
856 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 935 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
857 } | 936 } |
858 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 937 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
859 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 938 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
860 ASSERT_EQ(2u, frames_passed.size()); | 939 ASSERT_EQ(2u, frames_passed.size()); |
861 EXPECT_EQ(WebSocketFrameHeader::kOpCodePing, frames_passed[0]->header.opcode); | 940 EXPECT_EQ(WebSocketFrameHeader::kOpCodePing, frames_passed[0]->header.opcode); |
862 EXPECT_TRUE(frames_passed[0]->header.final); | 941 EXPECT_TRUE(frames_passed[0]->header.final); |
863 EXPECT_FALSE(frames_passed[0]->header.reserved1); | 942 EXPECT_FALSE(frames_passed[0]->header.reserved1); |
864 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); | 943 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); |
865 EXPECT_TRUE(frames_passed[1]->header.final); | 944 EXPECT_TRUE(frames_passed[1]->header.final); |
866 EXPECT_TRUE(frames_passed[1]->header.reserved1); | 945 EXPECT_TRUE(frames_passed[1]->header.reserved1); |
867 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 946 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
868 ToString(frames_passed[1])); | 947 ToString(frames_passed[1])); |
869 } | 948 } |
870 | 949 |
871 TEST_F(WebSocketDeflateStreamTest, WriteEmptyMessage) { | 950 TEST_F(WebSocketDeflateStreamTest, WriteEmptyMessage) { |
872 ScopedVector<WebSocketFrame> frames; | 951 ScopedVector<WebSocketFrame> frames; |
873 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal); | 952 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal); |
874 WriteFramesStub stub(OK); | 953 predictor_->AddFramesToBeInput(frames); |
954 WriteFramesStub stub(predictor_, OK); | |
875 CompletionCallback callback; | 955 CompletionCallback callback; |
876 | 956 |
877 { | 957 { |
878 InSequence s; | 958 InSequence s; |
879 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 959 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
880 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 960 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
881 } | 961 } |
882 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 962 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
883 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 963 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
884 ASSERT_EQ(1u, frames_passed.size()); | 964 ASSERT_EQ(1u, frames_passed.size()); |
885 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | 965 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); |
886 EXPECT_TRUE(frames_passed[0]->header.final); | 966 EXPECT_TRUE(frames_passed[0]->header.final); |
887 EXPECT_TRUE(frames_passed[0]->header.reserved1); | 967 EXPECT_TRUE(frames_passed[0]->header.reserved1); |
888 EXPECT_EQ(std::string("\x02\x00", 2), ToString(frames_passed[0])); | 968 EXPECT_EQ(std::string("\x02\x00", 2), ToString(frames_passed[0])); |
889 } | 969 } |
890 | 970 |
971 TEST_F(WebSocketDeflateStreamTest, WriteUncompressedMessage) { | |
972 ScopedVector<WebSocketFrame> frames; | |
973 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "AAAA"); | |
974 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "AAA"); | |
975 predictor_->AddFramesToBeInput(frames); | |
976 WriteFramesStub stub(predictor_, OK); | |
977 CompletionCallback callback; | |
978 | |
979 predictor_->set_result(WebSocketDeflatePredictor::DO_NOT_DEFLATE); | |
980 | |
981 { | |
982 InSequence s; | |
983 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | |
984 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | |
985 } | |
986 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | |
987 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | |
988 ASSERT_EQ(2u, frames_passed.size()); | |
989 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | |
990 EXPECT_FALSE(frames_passed[0]->header.final); | |
991 EXPECT_FALSE(frames_passed[0]->header.reserved1); | |
992 EXPECT_EQ("AAAA", ToString(frames_passed[0])); | |
993 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation, | |
994 frames_passed[1]->header.opcode); | |
995 EXPECT_TRUE(frames_passed[1]->header.final); | |
996 EXPECT_FALSE(frames_passed[1]->header.reserved1); | |
997 EXPECT_EQ("AAA", ToString(frames_passed[1])); | |
998 } | |
999 | |
891 TEST_F(WebSocketDeflateStreamTest, LargeDeflatedFramesShouldBeSplit) { | 1000 TEST_F(WebSocketDeflateStreamTest, LargeDeflatedFramesShouldBeSplit) { |
892 WebSocketDeflater deflater(WebSocketDeflater::TAKE_OVER_CONTEXT); | 1001 WebSocketDeflater deflater(WebSocketDeflater::TAKE_OVER_CONTEXT); |
893 LinearCongruentialGenerator lcg(133); | 1002 LinearCongruentialGenerator lcg(133); |
894 WriteFramesStub stub(OK); | 1003 WriteFramesStub stub(predictor_, OK); |
895 CompletionCallback callback; | 1004 CompletionCallback callback; |
896 const size_t size = 1024; | 1005 const size_t size = 1024; |
897 | 1006 |
898 { | 1007 { |
899 InSequence s; | 1008 InSequence s; |
900 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) | 1009 EXPECT_CALL(*mock_stream_, WriteFrames(_, _)) |
901 .WillRepeatedly(Invoke(&stub, &WriteFramesStub::Call)); | 1010 .WillRepeatedly(Invoke(&stub, &WriteFramesStub::Call)); |
902 } | 1011 } |
903 ScopedVector<WebSocketFrame> total_compressed_frames; | 1012 ScopedVector<WebSocketFrame> total_compressed_frames; |
904 | 1013 |
905 deflater.Initialize(kWindowBits); | 1014 deflater.Initialize(kWindowBits); |
906 while (true) { | 1015 while (true) { |
907 bool is_final = (total_compressed_frames.size() >= 2); | 1016 bool is_final = (total_compressed_frames.size() >= 2); |
908 ScopedVector<WebSocketFrame> frames; | 1017 ScopedVector<WebSocketFrame> frames; |
909 std::string data; | 1018 std::string data; |
910 for (size_t i = 0; i < size; ++i) | 1019 for (size_t i = 0; i < size; ++i) |
911 data += static_cast<char>(lcg.Generate()); | 1020 data += static_cast<char>(lcg.Generate()); |
912 deflater.AddBytes(data.data(), data.size()); | 1021 deflater.AddBytes(data.data(), data.size()); |
913 FrameFlag flag = is_final ? kFinal : kNoFlag; | 1022 FrameFlag flag = is_final ? kFinal : kNoFlag; |
914 AppendTo(&frames, WebSocketFrameHeader::kOpCodeBinary, flag, data); | 1023 AppendTo(&frames, WebSocketFrameHeader::kOpCodeBinary, flag, data); |
1024 predictor_->AddFramesToBeInput(frames); | |
915 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 1025 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
916 for (size_t i = 0; i < stub.frames()->size(); ++i) | 1026 total_compressed_frames.insert(total_compressed_frames.end(), |
917 total_compressed_frames.push_back((*stub.frames())[i]); | 1027 stub.frames()->begin(), |
1028 stub.frames()->end()); | |
918 stub.frames()->weak_clear(); | 1029 stub.frames()->weak_clear(); |
919 if (is_final) | 1030 if (is_final) |
920 break; | 1031 break; |
921 } | 1032 } |
922 deflater.Finish(); | 1033 deflater.Finish(); |
923 std::string total_deflated; | 1034 std::string total_deflated; |
924 for (size_t i = 0; i < total_compressed_frames.size(); ++i) { | 1035 for (size_t i = 0; i < total_compressed_frames.size(); ++i) { |
925 WebSocketFrame* frame = total_compressed_frames[i]; | 1036 WebSocketFrame* frame = total_compressed_frames[i]; |
926 const WebSocketFrameHeader& header = frame->header; | 1037 const WebSocketFrameHeader& header = frame->header; |
927 if (i > 0) { | 1038 if (i > 0) { |
(...skipping 10 matching lines...) Expand all Loading... | |
938 total_deflated += ToString(frame); | 1049 total_deflated += ToString(frame); |
939 } | 1050 } |
940 EXPECT_EQ(total_deflated, | 1051 EXPECT_EQ(total_deflated, |
941 ToString(deflater.GetOutput(deflater.CurrentOutputSize()))); | 1052 ToString(deflater.GetOutput(deflater.CurrentOutputSize()))); |
942 } | 1053 } |
943 | 1054 |
944 TEST_F(WebSocketDeflateStreamTest, WriteMultipleMessages) { | 1055 TEST_F(WebSocketDeflateStreamTest, WriteMultipleMessages) { |
945 ScopedVector<WebSocketFrame> frames; | 1056 ScopedVector<WebSocketFrame> frames; |
946 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 1057 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
947 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 1058 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
948 WriteFramesStub stub(OK); | 1059 predictor_->AddFramesToBeInput(frames); |
1060 WriteFramesStub stub(predictor_, OK); | |
949 CompletionCallback callback; | 1061 CompletionCallback callback; |
950 | 1062 |
951 { | 1063 { |
952 InSequence s; | 1064 InSequence s; |
953 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 1065 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
954 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 1066 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
955 } | 1067 } |
956 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 1068 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
957 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 1069 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
958 ASSERT_EQ(2u, frames_passed.size()); | 1070 ASSERT_EQ(2u, frames_passed.size()); |
959 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | 1071 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); |
960 EXPECT_TRUE(frames_passed[0]->header.final); | 1072 EXPECT_TRUE(frames_passed[0]->header.final); |
961 EXPECT_TRUE(frames_passed[0]->header.reserved1); | 1073 EXPECT_TRUE(frames_passed[0]->header.reserved1); |
962 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 1074 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
963 ToString(frames_passed[0])); | 1075 ToString(frames_passed[0])); |
964 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); | 1076 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); |
965 EXPECT_TRUE(frames_passed[1]->header.final); | 1077 EXPECT_TRUE(frames_passed[1]->header.final); |
966 EXPECT_TRUE(frames_passed[1]->header.reserved1); | 1078 EXPECT_TRUE(frames_passed[1]->header.reserved1); |
967 EXPECT_EQ(std::string("\xf2\x00\x11\x00\x00", 5), ToString(frames_passed[1])); | 1079 EXPECT_EQ(std::string("\xf2\x00\x11\x00\x00", 5), ToString(frames_passed[1])); |
968 } | 1080 } |
969 | 1081 |
970 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest, | 1082 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest, |
971 WriteMultipleMessages) { | 1083 WriteMultipleMessages) { |
972 ScopedVector<WebSocketFrame> frames; | 1084 ScopedVector<WebSocketFrame> frames; |
973 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 1085 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
974 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); | 1086 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello"); |
975 WriteFramesStub stub(OK); | 1087 predictor_->AddFramesToBeInput(frames); |
1088 WriteFramesStub stub(predictor_, OK); | |
976 CompletionCallback callback; | 1089 CompletionCallback callback; |
977 | 1090 |
978 { | 1091 { |
979 InSequence s; | 1092 InSequence s; |
980 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | 1093 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) |
981 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | 1094 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); |
982 } | 1095 } |
983 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | 1096 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); |
984 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | 1097 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); |
985 ASSERT_EQ(2u, frames_passed.size()); | 1098 ASSERT_EQ(2u, frames_passed.size()); |
986 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | 1099 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); |
987 EXPECT_TRUE(frames_passed[0]->header.final); | 1100 EXPECT_TRUE(frames_passed[0]->header.final); |
988 EXPECT_TRUE(frames_passed[0]->header.reserved1); | 1101 EXPECT_TRUE(frames_passed[0]->header.reserved1); |
989 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 1102 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
990 ToString(frames_passed[0])); | 1103 ToString(frames_passed[0])); |
991 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); | 1104 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[1]->header.opcode); |
992 EXPECT_TRUE(frames_passed[1]->header.final); | 1105 EXPECT_TRUE(frames_passed[1]->header.final); |
993 EXPECT_TRUE(frames_passed[1]->header.reserved1); | 1106 EXPECT_TRUE(frames_passed[1]->header.reserved1); |
994 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), | 1107 EXPECT_EQ(std::string("\xf2\x48\xcd\xc9\xc9\x07\x00", 7), |
995 ToString(frames_passed[1])); | 1108 ToString(frames_passed[1])); |
996 } | 1109 } |
997 | 1110 |
1111 // In order to check the stream works correctly for multiple | |
1112 // "PossiblyCompressedMessage"s, we test various messages at one test case. | |
1113 TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest, | |
1114 WritePossiblyCompressMessages) { | |
1115 ScopedVector<WebSocketFrame> frames; | |
1116 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "He"); | |
1117 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "llo"); | |
1118 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "AAAAAAAAAA"); | |
1119 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "AA"); | |
1120 AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kNoFlag, "XX"); | |
1121 AppendTo(&frames, WebSocketFrameHeader::kOpCodeContinuation, kFinal, "YY"); | |
1122 predictor_->AddFramesToBeInput(frames); | |
1123 WriteFramesStub stub(predictor_, OK); | |
1124 CompletionCallback callback; | |
1125 predictor_->set_result(WebSocketDeflatePredictor::TRY_DEFLATE); | |
1126 | |
1127 { | |
1128 InSequence s; | |
1129 EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)) | |
1130 .WillOnce(Invoke(&stub, &WriteFramesStub::Call)); | |
1131 } | |
1132 ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback)); | |
1133 const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames(); | |
1134 ASSERT_EQ(5u, frames_passed.size()); | |
1135 | |
1136 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[0]->header.opcode); | |
1137 EXPECT_FALSE(frames_passed[0]->header.final); | |
1138 EXPECT_FALSE(frames_passed[0]->header.reserved1); | |
1139 EXPECT_EQ("He", ToString(frames_passed[0])); | |
1140 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation, | |
1141 frames_passed[1]->header.opcode); | |
1142 EXPECT_TRUE(frames_passed[1]->header.final); | |
1143 EXPECT_FALSE(frames_passed[1]->header.reserved1); | |
1144 EXPECT_EQ("llo", ToString(frames_passed[1])); | |
1145 | |
1146 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[2]->header.opcode); | |
1147 EXPECT_TRUE(frames_passed[2]->header.final); | |
1148 EXPECT_TRUE(frames_passed[2]->header.reserved1); | |
1149 EXPECT_EQ(std::string("\x72\x74\x44\x00\x00\x00", 6), | |
1150 ToString(frames_passed[2])); | |
1151 | |
1152 EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames_passed[3]->header.opcode); | |
1153 EXPECT_FALSE(frames_passed[3]->header.final); | |
1154 EXPECT_FALSE(frames_passed[3]->header.reserved1); | |
1155 EXPECT_EQ("XX", ToString(frames_passed[3])); | |
1156 EXPECT_EQ(WebSocketFrameHeader::kOpCodeContinuation, | |
1157 frames_passed[4]->header.opcode); | |
1158 EXPECT_TRUE(frames_passed[4]->header.final); | |
1159 EXPECT_FALSE(frames_passed[4]->header.reserved1); | |
1160 EXPECT_EQ("YY", ToString(frames_passed[4])); | |
1161 } | |
1162 | |
998 } // namespace | 1163 } // namespace |
999 | 1164 |
1000 } // namespace net | 1165 } // namespace net |
OLD | NEW |