WebSocketFrameChunk should use IOBuffer to hold data

net/websockets/websocket_frame_parser_unittest.cc

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..4b8cdc674ce6ce2f06d9f2bdef948ae2ab599aa0 100644
--- a/net/websockets/websocket_frame_parser_unittest.cc
+++ b/net/websockets/websocket_frame_parser_unittest.cc
@@ -9,6 +9,7 @@
 #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 +67,7 @@ TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
   }
   EXPECT_TRUE(frame->final_chunk);
 
-  std::vector<char> expected_data(kHello, kHello + kHelloLength);
-  EXPECT_EQ(expected_data, frame->data);
+  EXPECT_TRUE(!memcmp(kHello, frame->data->data(), kHelloLength));

[Yuta Kitamura, 2012/07/26 09:48:48]

EXPECT_EQ(0, memcmp(...)) might be slightly better (it prints the result of
memcmp on failure).

(I'd use std::equal instead of memcmp but I'm probably too picky about using C
functions)

It's kind of sad about losing the ability of dumping every char on failure.
There's no easy way to do the same on IOBuffer, though.

[Takashi Toyoshima, 2012/07/26 12:39:05]

Thanks.

std::equal seems to work better. I'd use it.
So can I still use EXPECT_TRUE for std::equal?
Failure results of EXPECT_TRUE and EXPECT_EQ seems to be the same one to
std::equal.

[Yuta Kitamura, 2012/07/27 08:01:08]

If you use std::equal, using EXPECT_TRUE is just fine (return value of
std::equal is a bool, nothing more).

[Takashi Toyoshima, 2012/07/27 10:28:43]

OK. I use  EXPECT_TRUE.

 }
 
 TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
@@ -93,8 +93,7 @@ TEST(WebSocketFrameParserTest, DecodeMaskedFrame) {
   }
   EXPECT_TRUE(frame->final_chunk);
 
-  std::vector<char> expected_data(kHello, kHello + kHelloLength);
-  EXPECT_EQ(expected_data, frame->data);
+  EXPECT_TRUE(!memcmp(kHello, frame->data->data(), kHelloLength));
 }
 
 TEST(WebSocketFrameParserTest, DecodeManyFrames) {
@@ -143,10 +142,9 @@ TEST(WebSocketFrameParserTest, DecodeManyFrames) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    std::vector<char> expected_data(
-        kInputs[i].expected_payload,
-        kInputs[i].expected_payload + kInputs[i].expected_payload_length);
-    EXPECT_EQ(expected_data, frame->data);
+    EXPECT_TRUE(!memcmp(kInputs[i].expected_payload,
+                        frame->data->data(),
+                        kInputs[i].expected_payload_length));
 
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
@@ -187,7 +185,9 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
     if (!frame1)
       continue;
     EXPECT_FALSE(frame1->final_chunk);
-    EXPECT_EQ(expected1, frame1->data);
+    EXPECT_TRUE(!memcmp(expected1.data(),
+                        frame1->data->data(),
+                        expected1.size()));
     const WebSocketFrameHeader* header1 = frame1->header.get();
     EXPECT_TRUE(header1 != NULL);
     if (!header1)
@@ -211,7 +211,9 @@ TEST(WebSocketFrameParserTest, DecodePartialFrame) {
     if (!frame2)
       continue;
     EXPECT_TRUE(frame2->final_chunk);
-    EXPECT_EQ(expected2, frame2->data);
+    EXPECT_TRUE(!memcmp(expected2.data(),
+                        frame2->data->data(),
+                        expected2.size()));
     const WebSocketFrameHeader* header2 = frame2->header.get();
     EXPECT_TRUE(header2 == NULL);
   }
@@ -243,7 +245,9 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
     if (!frame1)
       continue;
     EXPECT_FALSE(frame1->final_chunk);
-    EXPECT_EQ(expected1, frame1->data);
+    EXPECT_TRUE(!memcmp(expected1.data(),
+                        frame1->data->data(),
+                        expected1.size()));
     const WebSocketFrameHeader* header1 = frame1->header.get();
     EXPECT_TRUE(header1 != NULL);
     if (!header1)
@@ -267,7 +271,9 @@ TEST(WebSocketFrameParserTest, DecodePartialMaskedFrame) {
     if (!frame2)
       continue;
     EXPECT_TRUE(frame2->final_chunk);
-    EXPECT_EQ(expected2, frame2->data);
+    EXPECT_TRUE(!memcmp(expected2.data(),
+                        frame2->data->data(),
+                        expected2.size()));
     const WebSocketFrameHeader* header2 = frame2->header.get();
     EXPECT_TRUE(header2 == NULL);
   }
@@ -302,7 +308,9 @@ 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_TRUE(!memcmp(expected_payload.data(),
+                        frame->data->data(),
+                        expected_payload.size()));
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -346,7 +354,6 @@ TEST(WebSocketFrameParserTest, DecodePartialHeader) {
       EXPECT_TRUE(frame->final_chunk);
     else
       EXPECT_FALSE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);

[Yuta Kitamura, 2012/07/26 09:48:48]

Why did you remove this?

[Takashi Toyoshima, 2012/07/26 12:39:05]

I removed it because it didn't have buffer size information.
Now, I revive it as a size check.

     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -444,7 +451,6 @@ TEST(WebSocketFrameParserTest, FrameTypes) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)
@@ -500,7 +506,6 @@ TEST(WebSocketFrameParserTest, FinalBitAndReservedBits) {
     if (!frame)
       continue;
     EXPECT_TRUE(frame->final_chunk);
-    EXPECT_EQ(std::vector<char>(), frame->data);
     const WebSocketFrameHeader* header = frame->header.get();
     EXPECT_TRUE(header != NULL);
     if (!header)