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

Unified Diff: net/spdy/buffered_spdy_framer_spdy2_unittest.cc

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
Index: net/spdy/buffered_spdy_framer_spdy2_unittest.cc
===================================================================
--- net/spdy/buffered_spdy_framer_spdy2_unittest.cc (revision 125802)
+++ net/spdy/buffered_spdy_framer_spdy2_unittest.cc (working copy)
@@ -18,6 +18,7 @@
TestBufferedSpdyVisitor()
: buffered_spdy_framer_(2),
error_count_(0),
+ setting_count_(0),
syn_frame_count_(0),
syn_reply_frame_count_(0),
headers_frame_count_(0),
@@ -66,6 +67,10 @@
LOG(FATAL) << "Unexpected OnStreamFrameData call.";
}
+ void OnSetting(SpdySettingsIds id, uint8 flags, uint32 value) {
+ setting_count_++;
+ }
+
bool OnCredentialFrameData(const char*, size_t) {
LOG(FATAL) << "Unexpected OnCredentialFrameData call.";
return false;
@@ -93,7 +98,6 @@
void OnRstStream(const spdy::SpdyRstStreamControlFrame& frame) {}
void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) {}
void OnPing(const spdy::SpdyPingControlFrame& frame) {}
- void OnSettings(const spdy::SpdySettingsControlFrame& frame) {}
void OnWindowUpdate(const spdy::SpdyWindowUpdateControlFrame& frame) {}
void OnCredential(const spdy::SpdyCredentialControlFrame& frame) {}
@@ -123,6 +127,7 @@
// Counters from the visitor callbacks.
int error_count_;
+ int setting_count_;
int syn_frame_count_;
int syn_reply_frame_count_;
int headers_frame_count_;
@@ -170,6 +175,24 @@
}
};
+TEST_F(BufferedSpdyFramerSpdy2Test, OnSetting) {
+ EnableCompression(false);
+
+ SpdyFramer framer(2);
+ SpdySettings settings;
+ settings.push_back(SpdySetting(SettingsFlagsAndId(0, 1), 0x00000002));
+ settings.push_back(SpdySetting(SettingsFlagsAndId(0, 1), 0x00000003));
+
+ scoped_ptr<SpdyFrame> control_frame(framer.CreateSettings(settings));
+ TestBufferedSpdyVisitor visitor;
+
+ visitor.SimulateInFramer(
+ reinterpret_cast<unsigned char*>(control_frame->data()),
+ control_frame->length() + SpdyControlFrame::kHeaderSize);
+ EXPECT_EQ(1, visitor.error_count_);
+ EXPECT_EQ(1, visitor.setting_count_);
+}
+
TEST_F(BufferedSpdyFramerSpdy2Test, ReadSynStreamHeaderBlock) {
EnableCompression(false);

Powered by Google App Engine
This is Rietveld 408576698