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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_frame_parser_unittest.cc

Issue 10824081: Add WebSocketError to indicate decoding failure reason (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed, ready for commit Created 8 years, 4 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') | no next file » | 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 7bde1f5ca44bae22c958e9dac2d55e1e7790d7ab..653f66984c987d5787c2f14346c5c7f02acb70a3 100644
--- a/net/websockets/websocket_frame_parser_unittest.cc
+++ b/net/websockets/websocket_frame_parser_unittest.cc
@@ -14,6 +14,8 @@
#include "net/websockets/websocket_frame.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace net {
+
namespace {
const char kHello[] = "Hello, world!";
@@ -29,36 +31,31 @@ struct FrameHeaderTestCase {
const char* frame_header;
size_t frame_header_length;
uint64 frame_length;
- bool failed;
+ WebSocketError error_code;
};
-// TODO(toyoshim): Provide error code and check if the reason is correct.
const FrameHeaderTestCase kFrameHeaderTests[] = {
- { "\x81\x00", 2, GG_UINT64_C(0), false },
- { "\x81\x7D", 2, GG_UINT64_C(125), false },
- { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126), false },
- { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF), false },
+ { "\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\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000),
- false },
+ WEB_SOCKET_OK },
{ "\x81\x7F\x00\x00\x00\x00\x7F\xFF\xFF\xFF", 10, GG_UINT64_C(0x7FFFFFFF),
- false },
+ WEB_SOCKET_OK },
{ "\x81\x7F\x00\x00\x00\x00\x80\x00\x00\x00", 10, GG_UINT64_C(0x80000000),
- true },
+ WEB_SOCKET_ERR_MESSAGE_TOO_BIG },
{ "\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
- GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true }
+ GG_UINT64_C(0x7FFFFFFFFFFFFFFF), WEB_SOCKET_ERR_MESSAGE_TOO_BIG }
};
const int kNumFrameHeaderTests = arraysize(kFrameHeaderTests);
-} // Unnamed namespace
-
-namespace net {
-
TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(kHelloFrame, kHelloFrameLength, &frames));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
ASSERT_EQ(1u, frames.size());
WebSocketFrameChunk* frame = frames[0];
ASSERT_TRUE(frame != NULL);
@@ -85,7 +82,7 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(kMaskedHelloFrame, kMaskedHelloFrameLength,
&frames));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
ASSERT_EQ(1u, frames.size());
WebSocketFrameChunk* frame = frames[0];
ASSERT_TRUE(frame != NULL);
@@ -143,7 +140,7 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(&input.front(), input.size(), &frames));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
ASSERT_EQ(static_cast<size_t>(kNumInputs), frames.size());
for (int i = 0; i < kNumInputs; ++i) {
@@ -189,7 +186,7 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
ScopedVector<WebSocketFrameChunk> frames1;
EXPECT_TRUE(parser.Decode(&input1.front(), input1.size(), &frames1));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames1.size());
if (frames1.size() != 1u)
continue;
@@ -220,7 +217,7 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
ScopedVector<WebSocketFrameChunk> frames2;
EXPECT_TRUE(parser.Decode(&input2.front(), input2.size(), &frames2));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames2.size());
if (frames2.size() != 1u)
continue;
@@ -259,7 +256,7 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames1;
EXPECT_TRUE(parser.Decode(&input1.front(), input1.size(), &frames1));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames1.size());
if (frames1.size() != 1u)
continue;
@@ -290,7 +287,7 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
ScopedVector<WebSocketFrameChunk> frames2;
EXPECT_TRUE(parser.Decode(&input2.front(), input2.size(), &frames2));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames2.size());
if (frames2.size() != 1u)
continue;
@@ -327,10 +324,10 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
- EXPECT_EQ(!kFrameHeaderTests[i].failed,
+ EXPECT_EQ(kFrameHeaderTests[i].error_code == WEB_SOCKET_OK,
parser.Decode(&input.front(), input.size(), &frames));
- EXPECT_EQ(kFrameHeaderTests[i].failed, parser.failed());
- if (kFrameHeaderTests[i].failed) {
+ EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.websocket_error());
+ if (kFrameHeaderTests[i].error_code != WEB_SOCKET_OK) {
EXPECT_EQ(0u, frames.size());
} else {
EXPECT_EQ(1u, frames.size());
@@ -384,13 +381,20 @@ 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].failed && j == last_byte_offset;
+ bool failed = kFrameHeaderTests[i].error_code != WEB_SOCKET_OK &&
+ j == last_byte_offset;
EXPECT_EQ(!failed, parser.Decode(frame_header + j, 1, &frames));
- EXPECT_EQ(failed, parser.failed());
- if (!kFrameHeaderTests[i].failed && j == last_byte_offset)
+ if (failed) {
+ EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.websocket_error());
+ } else {
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
+ }
+ if (kFrameHeaderTests[i].error_code == WEB_SOCKET_OK &&
+ j == last_byte_offset) {
EXPECT_EQ(1u, frames.size());
- else
+ } else {
EXPECT_EQ(0u, frames.size());
+ }
}
if (frames.size() != 1u)
continue;
@@ -442,15 +446,15 @@ TEST(WebSocketFrameParserTest, InvalidLengthEncoding) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_FALSE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_TRUE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_ERR_PROTOCOL_ERROR, 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_TRUE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_ERR_PROTOCOL_ERROR, parser.websocket_error());
EXPECT_EQ(0u, frames.size());
}
}
@@ -492,7 +496,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames.size());
if (frames.size() != 1u)
continue;
@@ -513,7 +517,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
EXPECT_EQ(opcode, header->opcode);
EXPECT_FALSE(header->masked);
EXPECT_EQ(0u, header->payload_length);
- };
+ }
}
TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
@@ -548,7 +552,7 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
ScopedVector<WebSocketFrameChunk> frames;
EXPECT_TRUE(parser.Decode(frame_header, frame_header_length, &frames));
- EXPECT_FALSE(parser.failed());
+ EXPECT_EQ(WEB_SOCKET_OK, parser.websocket_error());
EXPECT_EQ(1u, frames.size());
if (frames.size() != 1u)
continue;
@@ -572,4 +576,6 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
}
}
+} // Unnamed namespace
+
} // namespace net
« no previous file with comments | « net/websockets/websocket_frame_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698