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

Side by Side Diff: net/spdy/buffered_spdy_framer_spdy3_unittest.cc

Issue 10054034: SPDY - replaced SpdySettings (list) with SettingsMap (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « net/spdy/buffered_spdy_framer_spdy2_unittest.cc ('k') | net/spdy/spdy_framer.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/spdy/buffered_spdy_framer.h" 5 #include "net/spdy/buffered_spdy_framer.h"
6 6
7 #include "net/spdy/spdy_test_util_spdy3.h" 7 #include "net/spdy/spdy_test_util_spdy3.h"
8 #include "testing/platform_test.h" 8 #include "testing/platform_test.h"
9 9
10 using namespace net::test_spdy3; 10 using namespace net::test_spdy3;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 return true; 170 return true;
171 } 171 }
172 172
173 private: 173 private:
174 SpdyTestStateHelper spdy_state_; 174 SpdyTestStateHelper spdy_state_;
175 }; 175 };
176 176
177 TEST_F(BufferedSpdyFramerSpdy3Test, OnSetting) { 177 TEST_F(BufferedSpdyFramerSpdy3Test, OnSetting) {
178 SpdyFramer framer(3); 178 SpdyFramer framer(3);
179 SpdySettings settings; 179 SettingsMap settings;
180 settings.push_back(SpdySetting(SettingsFlagsAndId(0, 1), 0x00000002)); 180 settings[SETTINGS_UPLOAD_BANDWIDTH] =
181 settings.push_back(SpdySetting(SettingsFlagsAndId(0, 1), 0x00000003)); 181 SettingsFlagsAndValue(SETTINGS_FLAG_NONE, 0x00000002);
182 settings[SETTINGS_DOWNLOAD_BANDWIDTH] =
183 SettingsFlagsAndValue(SETTINGS_FLAG_NONE, 0x00000003);
182 184
183 scoped_ptr<SpdyFrame> control_frame(framer.CreateSettings(settings)); 185 scoped_ptr<SpdyFrame> control_frame(framer.CreateSettings(settings));
184 TestBufferedSpdyVisitor visitor; 186 TestBufferedSpdyVisitor visitor;
185 187
186 visitor.SimulateInFramer( 188 visitor.SimulateInFramer(
187 reinterpret_cast<unsigned char*>(control_frame->data()), 189 reinterpret_cast<unsigned char*>(control_frame->data()),
188 control_frame->length() + SpdyControlFrame::kHeaderSize); 190 control_frame->length() + SpdyControlFrame::kHeaderSize);
189 EXPECT_EQ(1, visitor.error_count_); 191 EXPECT_EQ(0, visitor.error_count_);
190 EXPECT_EQ(1, visitor.setting_count_); 192 EXPECT_EQ(2, visitor.setting_count_);
191 } 193 }
192 194
193 TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynStreamHeaderBlock) { 195 TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynStreamHeaderBlock) {
194 SpdyHeaderBlock headers; 196 SpdyHeaderBlock headers;
195 headers["aa"] = "vv"; 197 headers["aa"] = "vv";
196 headers["bb"] = "ww"; 198 headers["bb"] = "ww";
197 BufferedSpdyFramer framer(3); 199 BufferedSpdyFramer framer(3);
198 scoped_ptr<SpdySynStreamControlFrame> control_frame( 200 scoped_ptr<SpdySynStreamControlFrame> control_frame(
199 framer.CreateSynStream(1, // stream_id 201 framer.CreateSynStream(1, // stream_id
200 0, // associated_stream_id 202 0, // associated_stream_id
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 visitor.SimulateInFramer( 257 visitor.SimulateInFramer(
256 reinterpret_cast<unsigned char*>(control_frame.get()->data()), 258 reinterpret_cast<unsigned char*>(control_frame.get()->data()),
257 control_frame.get()->length() + SpdyControlFrame::kHeaderSize); 259 control_frame.get()->length() + SpdyControlFrame::kHeaderSize);
258 EXPECT_EQ(0, visitor.error_count_); 260 EXPECT_EQ(0, visitor.error_count_);
259 EXPECT_EQ(0, visitor.syn_frame_count_); 261 EXPECT_EQ(0, visitor.syn_frame_count_);
260 EXPECT_EQ(0, visitor.syn_reply_frame_count_); 262 EXPECT_EQ(0, visitor.syn_reply_frame_count_);
261 EXPECT_EQ(1, visitor.headers_frame_count_); 263 EXPECT_EQ(1, visitor.headers_frame_count_);
262 EXPECT_TRUE(CompareHeaderBlocks(&headers, &visitor.headers_)); 264 EXPECT_TRUE(CompareHeaderBlocks(&headers, &visitor.headers_));
263 } 265 }
264 } // namespace net 266 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/buffered_spdy_framer_spdy2_unittest.cc ('k') | net/spdy/spdy_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698