net/websockets/websocket_frame_parser_unittest.cc - Issue 10796107: WebSocketFrameChunk should use IOBuffer to hold data

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: revised 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

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..e911247b964c268d1f9b4b218f5df7b5768a3574 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"

@@ -66,8 +68,8 @@ TEST(WebSocketFrameParserTest, DecodeNormalFrame) {

}

EXPECT_TRUE(frame->final_chunk);

- std::vector<char> expected_data(kHello, kHello + kHelloLength);

- EXPECT_EQ(expected_data, frame->data);

+ EXPECT_EQ(static_cast<int>(kHelloLength), frame->data->size());

mmenke 2012/07/27 14:25:55 Might want to make these ASSERT_EQs instead, since

Takashi Toyoshima 2012/07/27 16:08:30 Done.

+ EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));

}

TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {

@@ -93,8 +95,8 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {

}

EXPECT_TRUE(frame->final_chunk);

- std::vector<char> expected_data(kHello, kHello + kHelloLength);

- EXPECT_EQ(expected_data, frame->data);

+ EXPECT_EQ(static_cast<int>(kHelloLength), frame->data->size());

+ EXPECT_TRUE(std::equal(kHello, kHello + kHelloLength, frame->data->data()));

}

TEST(WebSocketFrameParserTest, DecodeManyFrames) {

@@ -143,10 +145,12 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {

if (!frame)

continue;

EXPECT_TRUE(frame->final_chunk);

- std::vector<char> expected_data(

+ EXPECT_EQ(kInputs[i].expected_payload_length,

+ static_cast<uint64_t>(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 +191,10 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {

if (!frame1)

continue;

EXPECT_FALSE(frame1->final_chunk);

- EXPECT_EQ(expected1, frame1->data);

+ EXPECT_EQ(cutting_pos, static_cast<size_t>(frame1->data->size()));

+ EXPECT_TRUE(std::equal(expected1.data(),

+ expected1.data() + expected1.size(),

+ frame1->data->data()));

const WebSocketFrameHeader* header1 = frame1->header.get();

EXPECT_TRUE(header1 != NULL);

if (!header1)

@@ -211,7 +218,10 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {

if (!frame2)

continue;

EXPECT_TRUE(frame2->final_chunk);

- EXPECT_EQ(expected2, frame2->data);

+ EXPECT_EQ(expected2.size(), static_cast<uint64_t>(frame2->data->size()));

+ EXPECT_TRUE(std::equal(expected2.data(),

+ expected2.data() + expected2.size(),

+ frame2->data->data()));

const WebSocketFrameHeader* header2 = frame2->header.get();

EXPECT_TRUE(header2 == NULL);

}

@@ -243,7 +253,10 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {

if (!frame1)

continue;

EXPECT_FALSE(frame1->final_chunk);

- EXPECT_EQ(expected1, frame1->data);

+ EXPECT_EQ(expected1.size(), static_cast<uint64_t>(frame1->data->size()));

+ EXPECT_TRUE(std::equal(expected1.data(),

+ expected1.data() + expected1.size(),

+ frame1->data->data()));

const WebSocketFrameHeader* header1 = frame1->header.get();

EXPECT_TRUE(header1 != NULL);

if (!header1)

@@ -267,7 +280,10 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {

if (!frame2)

continue;

EXPECT_TRUE(frame2->final_chunk);

- EXPECT_EQ(expected2, frame2->data);

+ EXPECT_EQ(expected2.size(), static_cast<uint64_t>(frame2->data->size()));

+ EXPECT_TRUE(std::equal(expected2.data(),

+ expected2.data() + expected2.size(),

+ frame2->data->data()));

const WebSocketFrameHeader* header2 = frame2->header.get();

EXPECT_TRUE(header2 == NULL);

}

@@ -302,7 +318,12 @@ TEST(WebSocketFrameParserTest, DecodeFramesOfVariousLengths) {

else

EXPECT_FALSE(frame->final_chunk);

std::vector<char> expected_payload(input_payload_size, 'a');

- EXPECT_EQ(expected_payload, frame->data);

+ EXPECT_EQ(expected_payload.size(),

+ static_cast<uint64_t>(frame->data->size()));

+ EXPECT_TRUE(std::equal(

+ expected_payload.data(),

+ expected_payload.data() + expected_payload.size(),

+ frame->data->data()));

const WebSocketFrameHeader* header = frame->header.get();

EXPECT_TRUE(header != NULL);

if (!header)

@@ -346,7 +367,7 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {

EXPECT_TRUE(frame->final_chunk);

else

EXPECT_FALSE(frame->final_chunk);

- EXPECT_EQ(std::vector<char>(), frame->data);

+ EXPECT_EQ(0, frame->data->size());

const WebSocketFrameHeader* header = frame->header.get();

EXPECT_TRUE(header != NULL);

if (!header)

@@ -444,7 +465,7 @@ TEST(WebSocketFrameParserTest, FrameTypes) {

if (!frame)

continue;

EXPECT_TRUE(frame->final_chunk);

- EXPECT_EQ(std::vector<char>(), frame->data);

+ EXPECT_EQ(0, frame->data->size());

const WebSocketFrameHeader* header = frame->header.get();

EXPECT_TRUE(header != NULL);

if (!header)

@@ -500,7 +521,7 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {

if (!frame)

continue;

EXPECT_TRUE(frame->final_chunk);

- EXPECT_EQ(std::vector<char>(), frame->data);

+ EXPECT_EQ(0, frame->data->size());

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 »