Add WebSocketError to indicate decoding failure reason

net/websockets/websocket_frame_parser_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_frame_parser.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
 const char kMaskedHelloFrame[] =
     "\x81\x8D\xDE\xAD\xBE\xEF"
     "\x96\xC8\xD2\x83\xB1\x81\x9E\x98\xB1\xDF\xD2\x8B\xFF";
 const uint64 kMaskedHelloFrameLength = arraysize(kMaskedHelloFrame) - 1;
 
 struct FrameHeaderTestCase {
   const char* frame_header;
   size_t frame_header_length;
   uint64 frame_length;
   bool failed;
+  net::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), false, net::WS_OK },
+  { "\x81\x7D", 2, GG_UINT64_C(125), false, net::WS_OK },
+  { "\x81\x7E\x00\x7E", 4, GG_UINT64_C(126), false, net::WS_OK },
+  { "\x81\x7E\xFF\xFF", 4, GG_UINT64_C(0xFFFF), false, net::WS_OK },
   { "\x81\x7F\x00\x00\x00\x00\x00\x01\x00\x00", 10, GG_UINT64_C(0x10000),
-    false },
+    false, net::WS_OK },
   { "\x81\x7F\x00\x00\x00\x00\x7F\xFF\xFF\xFF", 10, GG_UINT64_C(0x7FFFFFFF),
-    false },
+    false, net::WS_OK },
   { "\x81\x7F\x00\x00\x00\x00\x80\x00\x00\x00", 10, GG_UINT64_C(0x80000000),
-    true },
+    true, net::WS_ERR_MESSAGE_TOO_BIG },
   { "\x81\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
-    GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true }
+    GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true, net::WS_ERR_MESSAGE_TOO_BIG }

[mmenke, 2012/08/01 14:44:59]

How about just moving this unnamed namespace into the net namespace below?

[Takashi Toyoshima, 2012/08/02 08:11:35]

Done.

 };
 const int kNumFrameHeaderTests = arraysize(kFrameHeaderTests);
 
 }  // Unnamed namespace
 
 namespace net {
 
 TEST(WebSocketFrameParserTest, DecodeNormalFrame) {
   WebSocketFrameParser parser;
 
@@ skipping 264 matching lines @@
     static const uint64 kMaxPayloadSize = 200;
     uint64 input_payload_size = std::min(frame_length, kMaxPayloadSize);
     input.insert(input.end(), input_payload_size, 'a');
 
     WebSocketFrameParser parser;
 
     ScopedVector<WebSocketFrameChunk> frames;
     EXPECT_EQ(!kFrameHeaderTests[i].failed,
         parser.Decode(&input.front(), input.size(), &frames));
     EXPECT_EQ(kFrameHeaderTests[i].failed, parser.failed());
+    EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.error_code());
     if (kFrameHeaderTests[i].failed) {
       EXPECT_EQ(0u, frames.size());
     } else {
       EXPECT_EQ(1u, frames.size());
     }
     if (frames.size() != 1u)
       continue;
     WebSocketFrameChunk* frame = frames[0];
     EXPECT_TRUE(frame != NULL);
     if (!frame)
@@ skipping 37 matching lines @@
     WebSocketFrameParser parser;
 
     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) {
       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 (failed)
+        EXPECT_EQ(kFrameHeaderTests[i].error_code, parser.error_code());
+      else
+        EXPECT_EQ(net::WS_OK, parser.error_code());

[mmenke, 2012/08/01 14:44:59]

nit:  Use braces here (And please add them just below as well)

[Takashi Toyoshima, 2012/08/02 08:11:35]

Done.

       if (!kFrameHeaderTests[i].failed && j == last_byte_offset)
         EXPECT_EQ(1u, frames.size());
       else
         EXPECT_EQ(0u, frames.size());
     }
     if (frames.size() != 1u)
       continue;
     WebSocketFrameChunk* frame = frames[0];
     EXPECT_TRUE(frame != NULL);
     if (!frame)
@@ skipping 38 matching lines @@
   for (int i = 0; i < kNumTests; ++i) {
     const char* frame_header = kTests[i].frame_header;
     size_t frame_header_length = kTests[i].frame_header_length;
 
     WebSocketFrameParser parser;
 
     ScopedVector<WebSocketFrameChunk> frames;
     EXPECT_FALSE(parser.failed());
     EXPECT_FALSE(parser.Decode(frame_header, frame_header_length, &frames));
     EXPECT_TRUE(parser.failed());
+    EXPECT_EQ(net::WS_ERR_PROTOCOL_ERROR, parser.error_code());
     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(net::WS_ERR_PROTOCOL_ERROR, parser.error_code());
     EXPECT_EQ(0u, frames.size());
   }
 }
 
 TEST(WebSocketFrameParserTest, FrameTypes) {
   struct TestCase {
     const char* frame_header;
     size_t frame_header_length;
     WebSocketFrameHeader::OpCode opcode;
   };
@@ skipping 102 matching lines @@
     EXPECT_EQ(reserved1, header->reserved1);
     EXPECT_EQ(reserved2, header->reserved2);
     EXPECT_EQ(reserved3, header->reserved3);
     EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, header->opcode);
     EXPECT_FALSE(header->masked);
     EXPECT_EQ(0u, header->payload_length);
   }
 }
 
 }  // namespace net