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

Unified Diff: net/spdy/spdy_protocol_test.cc

Issue 12262004: Remove SpdyRstStreamControlFrame struct. Useful for SPDY 4 development. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « net/spdy/spdy_protocol.h ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_protocol_test.cc
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index aa4b345e9107170d37d2c8a9f627e1f38a222f38..9c1de18e45fe9544823196c5246078316cae2e51 100644
--- a/net/spdy/spdy_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -44,7 +44,6 @@ TEST_P(SpdyProtocolTest, ProtocolConstants) {
EXPECT_EQ(8u, SpdyDataFrame::size());
EXPECT_EQ(8u, SpdyControlFrame::kHeaderSize);
EXPECT_EQ(18u, SpdySynStreamControlFrame::size());
- EXPECT_EQ(16u, SpdyRstStreamControlFrame::size());
EXPECT_EQ(12u, SpdySettingsControlFrame::size());
EXPECT_EQ(12u, SpdyHeadersControlFrame::size());
EXPECT_EQ(4u, sizeof(FlagsAndLength));
@@ -102,17 +101,6 @@ TEST_P(SpdyProtocolTest, ControlFrameStructs) {
EXPECT_EQ(123u, syn_frame->stream_id());
EXPECT_EQ(999u, syn_frame->associated_stream_id());
- scoped_ptr<SpdyRstStreamControlFrame> rst_frame(
- framer.CreateRstStream(123, net::RST_STREAM_PROTOCOL_ERROR));
- EXPECT_EQ(framer.protocol_version(), rst_frame->version());
- EXPECT_TRUE(rst_frame->is_control_frame());
- EXPECT_EQ(RST_STREAM, rst_frame->type());
- EXPECT_EQ(123u, rst_frame->stream_id());
- EXPECT_EQ(net::RST_STREAM_PROTOCOL_ERROR, rst_frame->status());
- rst_frame->set_status(net::RST_STREAM_INVALID_STREAM);
- EXPECT_EQ(net::RST_STREAM_INVALID_STREAM, rst_frame->status());
- EXPECT_EQ(0, rst_frame->flags());
-
scoped_ptr<SpdyHeadersControlFrame> headers_frame(
framer.CreateHeaders(123, CONTROL_FLAG_NONE, false, &headers));
EXPECT_EQ(framer.protocol_version(), headers_frame->version());
@@ -326,23 +314,4 @@ TEST_P(SpdyProtocolDeathTest, TestSpdyControlFrameType) {
}
}
-TEST_P(SpdyProtocolDeathTest, TestRstStreamStatusBounds) {
- SpdyFramer framer(spdy_version_);
- scoped_ptr<SpdyRstStreamControlFrame> rst_frame;
-
- rst_frame.reset(framer.CreateRstStream(
- 123, RST_STREAM_PROTOCOL_ERROR));
- EXPECT_EQ(RST_STREAM_PROTOCOL_ERROR, rst_frame->status());
-
- rst_frame->set_status(RST_STREAM_INVALID);
- EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-
- rst_frame->set_status(static_cast<SpdyRstStreamStatus>(
- RST_STREAM_INVALID - 1));
- EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-
- rst_frame->set_status(RST_STREAM_NUM_STATUS_CODES);
- EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-}
-
} // namespace net
« no previous file with comments | « net/spdy/spdy_protocol.h ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698