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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_frame_parser_unittest.cc

Issue 10796107: WebSocketFrameChunk should use IOBuffer to hold data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test expectation Created 8 years, 5 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/websockets/websocket_frame_parser.cc ('K') | « 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 9ddffbd2fbd94ac02751710dc51676e78c85d2b8..4e8749510973ef513f9c373672b2d79662a06e64 100644
--- a/net/websockets/websocket_frame_parser_unittest.cc
+++ b/net/websockets/websocket_frame_parser_unittest.cc
@@ -4,11 +4,13 @@
#include "net/websockets/websocket_frame_parser.h"
+#include <algorithm>
#include <vector>
#include "base/basictypes.h"
#include "base/memory/scoped_vector.h"
#include "base/port.h"
+#include "net/base/io_buffer.h"
#include "net/websockets/websocket_frame.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -27,16 +29,23 @@ struct FrameHeaderTestCase {
const char* frame_header;
size_t frame_header_length;
uint64 frame_length;
+ bool failed;
};
+// TODO(toyoshim): Provide error code and check if the reason is correct.
const FrameHeaderTestCase kFrameHeaderTests[] = {
- { "\x81\x00", 2, GG_UINT64_C(0) },
- { "\x81\x7D", 2, GG_UINT64_C(125) },
- { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126) },
- { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF) },
- { "\x81\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000) },
+ { "\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\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000),
+ false },
+ { "\x81\x7F\x00\x00\x00\x00\x7F\xFF\xFF\xFF", 10, GG_UINT64_C(0x7FFFFFFF),
+ false },
+ { "\x81\x7F\x00\x00\x00\x00\x80\x00\x00\x00", 10, GG_UINT64_C(0x80000000),
+ true },
{ "\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
- GG_UINT64_C(0x7FFFFFFFFFFFFFFF) }
+ GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true }
};
const int kNumFrameHeaderTests = arraysize(kFrameHeaderTests);
@@ -66,8 +75,8 @@ TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
}
EXPECT_TRUE(frame->final_chunk);
- std::vector<char> expected_data(kHello, kHello + kHelloLength);
- EXPECT_EQ(expected_data, frame->data);
+ ASSERT_EQ(static_cast<int>(kHelloLength), frame->data->size());
+ EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));
}
TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
@@ -93,8 +102,8 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
}
EXPECT_TRUE(frame->final_chunk);
- std::vector<char> expected_data(kHello, kHello + kHelloLength);
- EXPECT_EQ(expected_data, frame->data);
+ ASSERT_EQ(static_cast<int>(kHelloLength), frame->data->size());
+ EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));
}
TEST(WebSocketFrameParserTest, DecodeManyFrames) {
@@ -143,10 +152,12 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {
if (!frame)
continue;
EXPECT_TRUE(frame->final_chunk);
- std::vector<char> expected_data(
+ ASSERT_EQ(kInputs[i].expected_payload_length,
+ static_cast<uint64>(frame->data->size()));
+ EXPECT_TRUE(std::equal(
kInputs[i].expected_payload,
- kInputs[i].expected_payload + kInputs[i].expected_payload_length);
- EXPECT_EQ(expected_data, frame->data);
+ kInputs[i].expected_payload + kInputs[i].expected_payload_length,
+ frame->data->data()));
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
@@ -187,7 +198,14 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
if (!frame1)
continue;
EXPECT_FALSE(frame1->final_chunk);
- EXPECT_EQ(expected1, frame1->data);
+ if (expected1.size() == 0) {
+ EXPECT_EQ(NULL, frame1->data.get());
+ } else {
+ ASSERT_EQ(cutting_pos, static_cast<size_t>(frame1->data->size()));
+ EXPECT_TRUE(std::equal(expected1.begin(),
+ expected1.end(),
+ frame1->data->data()));
+ }
const WebSocketFrameHeader* header1 = frame1->header.get();
EXPECT_TRUE(header1 != NULL);
if (!header1)
@@ -211,7 +229,14 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
if (!frame2)
continue;
EXPECT_TRUE(frame2->final_chunk);
- EXPECT_EQ(expected2, frame2->data);
+ if (expected2.size() == 0) {
+ EXPECT_EQ(NULL, frame2->data.get());
+ } else {
+ ASSERT_EQ(expected2.size(), static_cast<uint64>(frame2->data->size()));
+ EXPECT_TRUE(std::equal(expected2.begin(),
+ expected2.end(),
+ frame2->data->data()));
+ }
const WebSocketFrameHeader* header2 = frame2->header.get();
EXPECT_TRUE(header2 == NULL);
}
@@ -243,7 +268,14 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
if (!frame1)
continue;
EXPECT_FALSE(frame1->final_chunk);
- EXPECT_EQ(expected1, frame1->data);
+ if (expected1.size() == 0) {
+ EXPECT_EQ(NULL, frame1->data.get());
+ } else {
+ ASSERT_EQ(expected1.size(), static_cast<uint64>(frame1->data->size()));
+ EXPECT_TRUE(std::equal(expected1.begin(),
+ expected1.end(),
+ frame1->data->data()));
+ }
const WebSocketFrameHeader* header1 = frame1->header.get();
EXPECT_TRUE(header1 != NULL);
if (!header1)
@@ -267,7 +299,14 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
if (!frame2)
continue;
EXPECT_TRUE(frame2->final_chunk);
- EXPECT_EQ(expected2, frame2->data);
+ if (expected2.size() == 0) {
+ EXPECT_EQ(NULL, frame2->data.get());
+ } else {
+ ASSERT_EQ(expected2.size(), static_cast<uint64>(frame2->data->size()));
+ EXPECT_TRUE(std::equal(expected2.begin(),
+ expected2.end(),
+ frame2->data->data()));
+ }
const WebSocketFrameHeader* header2 = frame2->header.get();
EXPECT_TRUE(header2 == NULL);
}
@@ -288,9 +327,13 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {
WebSocketFrameParser parser;
ScopedVector<WebSocketFrameChunk> frames;
- EXPECT_TRUE(parser.Decode(&input.front(), input.size(), &frames));
- EXPECT_FALSE(parser.failed());
- EXPECT_EQ(1u, frames.size());
+ EXPECT_EQ(!kFrameHeaderTests[i].failed,
+ parser.Decode(&input.front(), input.size(), &frames));
+ EXPECT_EQ(kFrameHeaderTests[i].failed, parser.failed());
+ if (kFrameHeaderTests[i].failed)
+ EXPECT_EQ(0u, frames.size());
+ else
+ EXPECT_EQ(1u, frames.size());
mmenke 2012/07/31 17:03:49 Suggest you use braces around these code blocks.
Takashi Toyoshima 2012/08/01 07:06:33 Thank you for catching this. I agreed. I fixed thi
if (frames.size() != 1u)
continue;
WebSocketFrameChunk* frame = frames[0];
@@ -302,7 +345,16 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {
else
EXPECT_FALSE(frame->final_chunk);
std::vector<char> expected_payload(input_payload_size, 'a');
- EXPECT_EQ(expected_payload, frame->data);
+ if (expected_payload.size() == 0) {
+ EXPECT_EQ(NULL, frame->data.get());
+ } else {
+ ASSERT_EQ(expected_payload.size(),
+ static_cast<uint64>(frame->data->size()));
+ EXPECT_TRUE(std::equal(
+ expected_payload.begin(),
+ expected_payload.end(),
+ frame->data->data()));
+ }
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
if (!header)
@@ -328,10 +380,12 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {
ScopedVector<WebSocketFrameChunk> frames;
// Feed each byte to the parser to see if the parser behaves correctly
// 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) {
- EXPECT_TRUE(parser.Decode(frame_header + j, 1, &frames));
- EXPECT_FALSE(parser.failed());
- if (j == frame_header_length - 1)
+ bool failed = kFrameHeaderTests[i].failed && 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)
EXPECT_EQ(1u, frames.size());
else
EXPECT_EQ(0u, frames.size());
@@ -346,7 +400,7 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {
EXPECT_TRUE(frame->final_chunk);
else
EXPECT_FALSE(frame->final_chunk);
- EXPECT_EQ(std::vector<char>(), frame->data);
+ EXPECT_EQ(NULL, frame->data.get());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
if (!header)
@@ -444,7 +498,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
if (!frame)
continue;
EXPECT_TRUE(frame->final_chunk);
- EXPECT_EQ(std::vector<char>(), frame->data);
+ EXPECT_EQ(NULL, frame->data.get());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
if (!header)
@@ -500,7 +554,7 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
if (!frame)
continue;
EXPECT_TRUE(frame->final_chunk);
- EXPECT_EQ(std::vector<char>(), frame->data);
+ EXPECT_EQ(NULL, frame->data.get());
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
if (!header)
« net/websockets/websocket_frame_parser.cc ('K') | « net/websockets/websocket_frame_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698