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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_frame_parser_unittest.cc

Issue 14850012: Add missing status codes to WebSocketError enum. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove other mux status codes. Created 7 years, 7 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/websockets/websocket_frame_parser.cc ('k') | net/websockets/websocket_frame_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_frame_parser_unittest.cc
diff --git a/net/websockets/websocket_frame_parser_unittest.cc b/net/websockets/websocket_frame_parser_unittest.cc
index 653f66984c987d5787c2f14346c5c7f02acb70a3..d59f9fa42254b371b528f5690cee41104a9d9572 100644
--- a/net/websockets/websocket_frame_parser_unittest.cc
+++ b/net/websockets/websocket_frame_parser_unittest.cc
@@ -35,18 +35,18 @@ struct FrameHeaderTestCase {
};
const FrameHeaderTestCase kFrameHeaderTests[] = {
- { "\x81\x00", 2, GG_UINT64_C(0), WEB_SOCKET_OK },
- { "\x81\x7D", 2, GG_UINT64_C(125), WEB_SOCKET_OK },
- { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126), WEB_SOCKET_OK },
- { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF), WEB_SOCKET_OK },
+ { "\x81\x00", 2, GG_UINT64_C(0), kWebSocketNormalClosure },
+ { "\x81\x7D", 2, GG_UINT64_C(125), kWebSocketNormalClosure },
+ { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126), kWebSocketNormalClosure },
+ { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF), kWebSocketNormalClosure },
{ "\x81\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000),
- WEB_SOCKET_OK },
+ kWebSocketNormalClosure },
{ "\x81\x7F\x00\x00\x00\x00\x7F\xFF\xFF\xFF", 10, GG_UINT64_C(0x7FFFFFFF),
- WEB_SOCKET_OK },
+ kWebSocketNormalClosure },
{ "\x81\x7F\x00\x00\x00\x00\x80\x00\x00\x00", 10, GG_UINT64_C(0x80000000),
- WEB_SOCKET_ERR_MESSAGE_TOO_BIG },
+ kWebSocketErrorMessageTooBig },
{ "\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
- GG_UINT64_C(0x7FFFFFFFFFFFFFFF), WEB_SOCKET_ERR_MESSAGE_TOO_BIG }
+ GG_UINT64_C(0x7FFFFFFFFFFFFFFF), kWebSocketErrorMessageTooBig }
};
const int kNumFrameHeaderTests = arraysize(kFrameHeaderTests);
@@ -55,7 +55,7 @@ TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(kHelloFrame, kHelloFrameLength, &frames));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
ASSERT_EQ(1u, frames.size());
WebSocketFrameChunk* frame = frames[0];
ASSERT_TRUE(frame != NULL);
@@ -82,7 +82,7 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(kMaskedHelloFrame, kMaskedHelloFrameLength,
&frames));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
ASSERT_EQ(1u, frames.size());
WebSocketFrameChunk* frame = frames[0];
ASSERT_TRUE(frame != NULL);
@@ -140,7 +140,7 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(&input.front(), input.size(), &frames));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
ASSERT_EQ(static_cast<size_t>(kNumInputs), frames.size());
for (int i = 0; i < kNumInputs; ++i) {
@@ -186,7 +186,7 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
ScopedVector<WebSocketFrameChunk> frames1;
EXPECT_TRUE(parser.Decode(&input1.front(), input1.size(), &frames1));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames1.size());
if (frames1.size() != 1u)
continue;
@@ -217,7 +217,7 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
ScopedVector<WebSocketFrameChunk> frames2;
EXPECT_TRUE(parser.Decode(&input2.front(), input2.size(), &frames2));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames2.size());
if (frames2.size() != 1u)
continue;
@@ -256,7 +256,7 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames1;
EXPECT_TRUE(parser.Decode(&input1.front(), input1.size(), &frames1));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames1.size());
if (frames1.size() != 1u)
continue;
@@ -287,7 +287,7 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames2;
EXPECT_TRUE(parser.Decode(&input2.front(), input2.size(), &frames2));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames2.size());
if (frames2.size() != 1u)
continue;
@@ -324,10 +324,10 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
- EXPECT_EQ(kFrameHeaderTests[i].error_code == WEB_SOCKET_OK,
+ EXPECT_EQ(kFrameHeaderTests[i].error_code == kWebSocketNormalClosure,
parser.Decode(&input.front(), input.size(), &frames));
EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.websocket_error());
- if (kFrameHeaderTests[i].error_code != WEB_SOCKET_OK) {
+ if (kFrameHeaderTests[i].error_code != kWebSocketNormalClosure) {
EXPECT_EQ(0u, frames.size());
} else {
EXPECT_EQ(1u, frames.size());
@@ -381,15 +381,16 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {
// when it receives partial frame header.
size_t last_byte_offset = frame_header_length - 1;
for (size_t j = 0; j < frame_header_length; ++j) {
- bool failed = kFrameHeaderTests[i].error_code != WEB_SOCKET_OK &&
+ bool failed =
+ kFrameHeaderTests[i].error_code != kWebSocketNormalClosure &&
j == last_byte_offset;
EXPECT_EQ(!failed, parser.Decode(frame_header + j, 1, &frames));
if (failed) {
EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.websocket_error());
} else {
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
}
- if (kFrameHeaderTests[i].error_code == WEB_SOCKET_OK &&
+ if (kFrameHeaderTests[i].error_code == kWebSocketNormalClosure &&
j == last_byte_offset) {
EXPECT_EQ(1u, frames.size());
} else {
@@ -446,15 +447,15 @@ TEST(WebSocketFrameParserTest, InvalidLengthEncoding) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_FALSE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_EQ(WEB_SOCKET_ERR_PROTOCOL_ERROR, parser.websocket_error());
+ EXPECT_EQ(kWebSocketErrorProtocolError, parser.websocket_error());
EXPECT_EQ(0u, frames.size());
// Once the parser has failed, it no longer accepts any input (even if
// the input is empty).
EXPECT_FALSE(parser.Decode("", 0, &frames));
- EXPECT_EQ(WEB_SOCKET_ERR_PROTOCOL_ERROR, parser.websocket_error());
+ EXPECT_EQ(kWebSocketErrorProtocolError, parser.websocket_error());
EXPECT_EQ(0u, frames.size());
}
}
@@ -496,7 +497,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames.size());
if (frames.size() != 1u)
continue;
@@ -552,7 +553,7 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ EXPECT_EQ(kWebSocketNormalClosure, parser.websocket_error());
EXPECT_EQ(1u, frames.size());
if (frames.size() != 1u)
continue;
« no previous file with comments | « net/websockets/websocket_frame_parser.cc ('k') | net/websockets/websocket_frame_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698