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

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: s/uint64_t/uint64/g 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..921b8f379a525fdb8fe6bff74c1b3111e619e7de 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);
+ ASSERT_EQ(static_cast<int>(kHelloLength), frame->data->size());
+ 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);
+ ASSERT_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(
+ 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 +191,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.data(),
+ expected1.data() + expected1.size(),
+ frame1->data->data()));
+ }
const WebSocketFrameHeader* header1 = frame1->header.get();
EXPECT_TRUE(header1 != NULL);
if (!header1)
@@ -211,7 +222,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.data(),
+ expected2.data() + expected2.size(),
+ frame2->data->data()));
+ }
const WebSocketFrameHeader* header2 = frame2->header.get();
EXPECT_TRUE(header2 == NULL);
}
@@ -243,7 +261,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.data(),
+ expected1.data() + expected1.size(),
+ frame1->data->data()));
+ }
const WebSocketFrameHeader* header1 = frame1->header.get();
EXPECT_TRUE(header1 != NULL);
if (!header1)
@@ -267,7 +292,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.data(),
+ expected2.data() + expected2.size(),
+ frame2->data->data()));
+ }
const WebSocketFrameHeader* header2 = frame2->header.get();
EXPECT_TRUE(header2 == NULL);
}
@@ -302,7 +334,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.data(),
+ expected_payload.data() + expected_payload.size(),
+ frame->data->data()));
+ }
const WebSocketFrameHeader* header = frame->header.get();
EXPECT_TRUE(header != NULL);
if (!header)
@@ -346,7 +387,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 +485,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 +541,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