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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_framer_test.cc

Issue 2675593002: Spdy{RstStream,GoAway}Status -> SpdyErrorCode. (Closed)
Patch Set: Unsigned vs signed int Created 3 years, 11 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
« net/spdy/spdy_framer.cc ('K') | « net/spdy/spdy_framer_decoder_adapter.cc ('k') | net/spdy/spdy_http_stream.cc » ('j') | net/spdy/spdy_protocol.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer_test.cc
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 21bfc3fcbe93945a8d8a38159763f90a973a7b14..9fdcbd4c1f0849dcce7798c64ed2f08255ea0bad 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -149,14 +149,14 @@ class SpdyFramerTestUtil {
}
void OnRstStream(SpdyStreamId stream_id,
- SpdyRstStreamStatus status) override {
+ SpdyErrorCode error_code) override {
LOG(FATAL);
}
void OnSetting(SpdySettingsIds id, uint32_t value) override { LOG(FATAL); }
void OnPing(SpdyPingId unique_id, bool is_ack) override { LOG(FATAL); }
void OnSettingsEnd() override { LOG(FATAL); }
void OnGoAway(SpdyStreamId last_accepted_stream_id,
- SpdyGoAwayStatus status) override {
+ SpdyErrorCode error_code) override {
LOG(FATAL);
}
@@ -358,9 +358,8 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
}
}
- void OnRstStream(SpdyStreamId stream_id,
- SpdyRstStreamStatus status) override {
- VLOG(1) << "OnRstStream(" << stream_id << ", " << status << ")";
+ void OnRstStream(SpdyStreamId stream_id, SpdyErrorCode error_code) override {
+ VLOG(1) << "OnRstStream(" << stream_id << ", " << error_code << ")";
++fin_frame_count_;
}
@@ -384,8 +383,9 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
}
void OnGoAway(SpdyStreamId last_accepted_stream_id,
- SpdyGoAwayStatus status) override {
- VLOG(1) << "OnGoAway(" << last_accepted_stream_id << ", " << status << ")";
+ SpdyErrorCode error_code) override {
+ VLOG(1) << "OnGoAway(" << last_accepted_stream_id << ", " << error_code
+ << ")";
++goaway_count_;
}
@@ -1007,7 +1007,7 @@ TEST_P(SpdyFramerTest, RstStreamWithStreamIdZero) {
SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
framer.set_visitor(&visitor);
- SpdyRstStreamIR rst_stream_ir(0, RST_STREAM_PROTOCOL_ERROR);
+ SpdyRstStreamIR rst_stream_ir(0, ERROR_CODE_PROTOCOL_ERROR);
SpdySerializedFrame frame(framer.SerializeRstStream(rst_stream_ir));
// We shouldn't have to read the whole frame before we signal an error.
@@ -1632,7 +1632,7 @@ TEST_P(SpdyFramerTest, CreateRstStream) {
0x00, 0x00, 0x00, 0x01, // Stream: 1
0x00, 0x00, 0x00, 0x01, // Error: PROTOCOL_ERROR
};
- SpdyRstStreamIR rst_stream(1, RST_STREAM_PROTOCOL_ERROR);
+ SpdyRstStreamIR rst_stream(1, ERROR_CODE_PROTOCOL_ERROR);
SpdySerializedFrame frame(framer.SerializeRstStream(rst_stream));
CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
}
@@ -1646,7 +1646,7 @@ TEST_P(SpdyFramerTest, CreateRstStream) {
0x7f, 0xff, 0xff, 0xff, // Stream: 0x7fffffff
0x00, 0x00, 0x00, 0x01, // Error: PROTOCOL_ERROR
};
- SpdyRstStreamIR rst_stream(0x7FFFFFFF, RST_STREAM_PROTOCOL_ERROR);
+ SpdyRstStreamIR rst_stream(0x7FFFFFFF, ERROR_CODE_PROTOCOL_ERROR);
SpdySerializedFrame frame(framer.SerializeRstStream(rst_stream));
CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
}
@@ -1660,7 +1660,7 @@ TEST_P(SpdyFramerTest, CreateRstStream) {
0x7f, 0xff, 0xff, 0xff, // Stream: 0x7fffffff
0x00, 0x00, 0x00, 0x02, // Error: INTERNAL_ERROR
};
- SpdyRstStreamIR rst_stream(0x7FFFFFFF, RST_STREAM_INTERNAL_ERROR);
+ SpdyRstStreamIR rst_stream(0x7FFFFFFF, ERROR_CODE_INTERNAL_ERROR);
SpdySerializedFrame frame(framer.SerializeRstStream(rst_stream));
CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
}
@@ -1787,7 +1787,7 @@ TEST_P(SpdyFramerTest, CreateGoAway) {
0x00, 0x00, 0x00, 0x00, // Error: NO_ERROR
0x47, 0x41, // Description
};
- SpdyGoAwayIR goaway_ir(0, GOAWAY_NO_ERROR, "GA");
+ SpdyGoAwayIR goaway_ir(0, ERROR_CODE_NO_ERROR, "GA");
SpdySerializedFrame frame(framer.SerializeGoAway(goaway_ir));
CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
}
@@ -1803,7 +1803,7 @@ TEST_P(SpdyFramerTest, CreateGoAway) {
0x00, 0x00, 0x00, 0x02, // Error: INTERNAL_ERROR
0x47, 0x41, // Description
};
- SpdyGoAwayIR goaway_ir(0x7FFFFFFF, GOAWAY_INTERNAL_ERROR, "GA");
+ SpdyGoAwayIR goaway_ir(0x7FFFFFFF, ERROR_CODE_INTERNAL_ERROR, "GA");
SpdySerializedFrame frame(framer.SerializeGoAway(goaway_ir));
CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
}
@@ -3481,32 +3481,32 @@ TEST_P(SpdyFramerTest, ErrorCodeToStringTest) {
}
TEST_P(SpdyFramerTest, StatusCodeToStringTest) {
- EXPECT_STREQ("NO_ERROR", SpdyFramer::StatusCodeToString(RST_STREAM_NO_ERROR));
+ EXPECT_STREQ("NO_ERROR", SpdyFramer::StatusCodeToString(ERROR_CODE_NO_ERROR));
EXPECT_STREQ("PROTOCOL_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_PROTOCOL_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_PROTOCOL_ERROR));
EXPECT_STREQ("INTERNAL_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_INTERNAL_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_INTERNAL_ERROR));
EXPECT_STREQ("FLOW_CONTROL_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_FLOW_CONTROL_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_FLOW_CONTROL_ERROR));
EXPECT_STREQ("SETTINGS_TIMEOUT",
- SpdyFramer::StatusCodeToString(RST_STREAM_SETTINGS_TIMEOUT));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_SETTINGS_TIMEOUT));
EXPECT_STREQ("STREAM_CLOSED",
- SpdyFramer::StatusCodeToString(RST_STREAM_STREAM_CLOSED));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_STREAM_CLOSED));
EXPECT_STREQ("FRAME_SIZE_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_FRAME_SIZE_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_FRAME_SIZE_ERROR));
EXPECT_STREQ("REFUSED_STREAM",
- SpdyFramer::StatusCodeToString(RST_STREAM_REFUSED_STREAM));
- EXPECT_STREQ("CANCEL", SpdyFramer::StatusCodeToString(RST_STREAM_CANCEL));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_REFUSED_STREAM));
+ EXPECT_STREQ("CANCEL", SpdyFramer::StatusCodeToString(ERROR_CODE_CANCEL));
EXPECT_STREQ("COMPRESSION_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_COMPRESSION_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_COMPRESSION_ERROR));
EXPECT_STREQ("CONNECT_ERROR",
- SpdyFramer::StatusCodeToString(RST_STREAM_CONNECT_ERROR));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_CONNECT_ERROR));
EXPECT_STREQ("ENHANCE_YOUR_CALM",
- SpdyFramer::StatusCodeToString(RST_STREAM_ENHANCE_YOUR_CALM));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_ENHANCE_YOUR_CALM));
EXPECT_STREQ("INADEQUATE_SECURITY",
- SpdyFramer::StatusCodeToString(RST_STREAM_INADEQUATE_SECURITY));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_INADEQUATE_SECURITY));
EXPECT_STREQ("HTTP_1_1_REQUIRED",
- SpdyFramer::StatusCodeToString(RST_STREAM_HTTP_1_1_REQUIRED));
+ SpdyFramer::StatusCodeToString(ERROR_CODE_HTTP_1_1_REQUIRED));
}
TEST_P(SpdyFramerTest, FrameTypeToStringTest) {
@@ -3583,11 +3583,11 @@ TEST_P(SpdyFramerTest, RstStreamFrameFlags) {
SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
framer.set_visitor(&visitor);
- SpdyRstStreamIR rst_stream(13, RST_STREAM_CANCEL);
+ SpdyRstStreamIR rst_stream(13, ERROR_CODE_CANCEL);
SpdySerializedFrame frame(framer.SerializeRstStream(rst_stream));
SetFrameFlags(&frame, flags);
- EXPECT_CALL(visitor, OnRstStream(13, RST_STREAM_CANCEL));
+ EXPECT_CALL(visitor, OnRstStream(13, ERROR_CODE_CANCEL));
framer.ProcessInput(frame.data(), frame.size());
@@ -3645,11 +3645,11 @@ TEST_P(SpdyFramerTest, GoawayFrameFlags) {
SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
framer.set_visitor(&visitor);
- SpdyGoAwayIR goaway_ir(97, GOAWAY_NO_ERROR, "test");
+ SpdyGoAwayIR goaway_ir(97, ERROR_CODE_NO_ERROR, "test");
SpdySerializedFrame frame(framer.SerializeGoAway(goaway_ir));
SetFrameFlags(&frame, flags);
- EXPECT_CALL(visitor, OnGoAway(97, GOAWAY_NO_ERROR));
+ EXPECT_CALL(visitor, OnGoAway(97, ERROR_CODE_NO_ERROR));
framer.ProcessInput(frame.data(), frame.size());
EXPECT_EQ(SpdyFramer::SPDY_READY_FOR_FRAME, framer.state());
@@ -3871,7 +3871,7 @@ TEST_P(SpdyFramerTest, RstStreamStatusBounds) {
SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
framer.set_visitor(&visitor);
- EXPECT_CALL(visitor, OnRstStream(1, RST_STREAM_NO_ERROR));
+ EXPECT_CALL(visitor, OnRstStream(1, ERROR_CODE_NO_ERROR));
framer.ProcessInput(reinterpret_cast<const char*>(kH2RstStreamInvalid),
arraysize(kH2RstStreamInvalid));
EXPECT_EQ(SpdyFramer::SPDY_READY_FOR_FRAME, framer.state());
@@ -3880,7 +3880,7 @@ TEST_P(SpdyFramerTest, RstStreamStatusBounds) {
framer.Reset();
- EXPECT_CALL(visitor, OnRstStream(1, RST_STREAM_INTERNAL_ERROR));
+ EXPECT_CALL(visitor, OnRstStream(1, ERROR_CODE_INTERNAL_ERROR));
framer.ProcessInput(reinterpret_cast<const char*>(kH2RstStreamNumStatusCodes),
arraysize(kH2RstStreamNumStatusCodes));
EXPECT_EQ(SpdyFramer::SPDY_READY_FOR_FRAME, framer.state());
@@ -3903,7 +3903,7 @@ TEST_P(SpdyFramerTest, GoAwayStatusBounds) {
testing::StrictMock<test::MockSpdyFramerVisitor> visitor;
framer.set_visitor(&visitor);
- EXPECT_CALL(visitor, OnGoAway(1, GOAWAY_INTERNAL_ERROR));
+ EXPECT_CALL(visitor, OnGoAway(1, ERROR_CODE_INTERNAL_ERROR));
framer.ProcessInput(reinterpret_cast<const char*>(kH2FrameData),
arraysize(kH2FrameData));
EXPECT_EQ(SpdyFramer::SPDY_READY_FOR_FRAME, framer.state());
@@ -3926,7 +3926,7 @@ TEST_P(SpdyFramerTest, GoAwayStreamIdBounds) {
SpdyFramer framer(SpdyFramer::ENABLE_COMPRESSION);
framer.set_visitor(&visitor);
- EXPECT_CALL(visitor, OnGoAway(0x7fffffff, GOAWAY_NO_ERROR));
+ EXPECT_CALL(visitor, OnGoAway(0x7fffffff, ERROR_CODE_NO_ERROR));
framer.ProcessInput(reinterpret_cast<const char*>(kH2FrameData),
arraysize(kH2FrameData));
EXPECT_EQ(SpdyFramer::SPDY_READY_FOR_FRAME, framer.state());
« net/spdy/spdy_framer.cc ('K') | « net/spdy/spdy_framer_decoder_adapter.cc ('k') | net/spdy/spdy_http_stream.cc » ('j') | net/spdy/spdy_protocol.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698