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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_frame_test.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/base/mime_util_unittest.cc ('K') | « net/websockets/websocket_frame_parser_test.cc ('k') | net/websockets/websocket_handshake_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_frame_test.cc
diff --git a/net/websockets/websocket_frame_test.cc b/net/websockets/websocket_frame_test.cc
index cd6567ffc714809bdc367eb34ee3fd979eb26363..55e9dd59f3bd39fe8787bb1098412cda565cfb3f 100644
--- a/net/websockets/websocket_frame_test.cc
+++ b/net/websockets/websocket_frame_test.cc
@@ -35,14 +35,13 @@ TEST(WebSocketFrameHeaderTest, FrameLengths) {
uint64 frame_length;
};
static const TestCase kTests[] = {
- { "\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\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
- GG_UINT64_C(0x7FFFFFFFFFFFFFFF) }
- };
+ {"\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\x7F\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 10,
+ GG_UINT64_C(0x7FFFFFFFFFFFFFFF)}};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
for (int i = 0; i < kNumTests; ++i) {
@@ -73,15 +72,14 @@ TEST(WebSocketFrameHeaderTest, FrameLengthsWithMasking) {
uint64 frame_length;
};
static const TestCase kTests[] = {
- { "\x81\x80\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(0) },
- { "\x81\xFD\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(125) },
- { "\x81\xFE\x00\x7E\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(126) },
- { "\x81\xFE\xFF\xFF\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(0xFFFF) },
- { "\x81\xFF\x00\x00\x00\x00\x00\x01\x00\x00\xDE\xAD\xBE\xEF", 14,
- GG_UINT64_C(0x10000) },
- { "\x81\xFF\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xDE\xAD\xBE\xEF", 14,
- GG_UINT64_C(0x7FFFFFFFFFFFFFFF) }
- };
+ {"\x81\x80\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(0)},
+ {"\x81\xFD\xDE\xAD\xBE\xEF", 6, GG_UINT64_C(125)},
+ {"\x81\xFE\x00\x7E\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(126)},
+ {"\x81\xFE\xFF\xFF\xDE\xAD\xBE\xEF", 8, GG_UINT64_C(0xFFFF)},
+ {"\x81\xFF\x00\x00\x00\x00\x00\x01\x00\x00\xDE\xAD\xBE\xEF", 14,
+ GG_UINT64_C(0x10000)},
+ {"\x81\xFF\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xDE\xAD\xBE\xEF", 14,
+ GG_UINT64_C(0x7FFFFFFFFFFFFFFF)}};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
WebSocketMaskingKey masking_key;
@@ -113,24 +111,23 @@ TEST(WebSocketFrameHeaderTest, FrameOpCodes) {
WebSocketFrameHeader::OpCode opcode;
};
static const TestCase kTests[] = {
- { "\x80\x00", 2, WebSocketFrameHeader::kOpCodeContinuation },
- { "\x81\x00", 2, WebSocketFrameHeader::kOpCodeText },
- { "\x82\x00", 2, WebSocketFrameHeader::kOpCodeBinary },
- { "\x88\x00", 2, WebSocketFrameHeader::kOpCodeClose },
- { "\x89\x00", 2, WebSocketFrameHeader::kOpCodePing },
- { "\x8A\x00", 2, WebSocketFrameHeader::kOpCodePong },
- // These are undefined opcodes, but the builder should accept them anyway.
- { "\x83\x00", 2, 0x3 },
- { "\x84\x00", 2, 0x4 },
- { "\x85\x00", 2, 0x5 },
- { "\x86\x00", 2, 0x6 },
- { "\x87\x00", 2, 0x7 },
- { "\x8B\x00", 2, 0xB },
- { "\x8C\x00", 2, 0xC },
- { "\x8D\x00", 2, 0xD },
- { "\x8E\x00", 2, 0xE },
- { "\x8F\x00", 2, 0xF }
- };
+ {"\x80\x00", 2, WebSocketFrameHeader::kOpCodeContinuation},
+ {"\x81\x00", 2, WebSocketFrameHeader::kOpCodeText},
+ {"\x82\x00", 2, WebSocketFrameHeader::kOpCodeBinary},
+ {"\x88\x00", 2, WebSocketFrameHeader::kOpCodeClose},
+ {"\x89\x00", 2, WebSocketFrameHeader::kOpCodePing},
+ {"\x8A\x00", 2, WebSocketFrameHeader::kOpCodePong},
+ // These are undefined opcodes, but the builder should accept them anyway.
+ {"\x83\x00", 2, 0x3},
+ {"\x84\x00", 2, 0x4},
+ {"\x85\x00", 2, 0x5},
+ {"\x86\x00", 2, 0x6},
+ {"\x87\x00", 2, 0x7},
+ {"\x8B\x00", 2, 0xB},
+ {"\x8C\x00", 2, 0xC},
+ {"\x8D\x00", 2, 0xD},
+ {"\x8E\x00", 2, 0xE},
+ {"\x8F\x00", 2, 0xF}};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
for (int i = 0; i < kNumTests; ++i) {
@@ -158,15 +155,13 @@ TEST(WebSocketFrameHeaderTest, FinalBitAndReservedBits) {
bool reserved2;
bool reserved3;
};
- static const TestCase kTests[] = {
- { "\x81\x00", 2, true, false, false, false },
- { "\x01\x00", 2, false, false, false, false },
- { "\xC1\x00", 2, true, true, false, false },
- { "\xA1\x00", 2, true, false, true, false },
- { "\x91\x00", 2, true, false, false, true },
- { "\x71\x00", 2, false, true, true, true },
- { "\xF1\x00", 2, true, true, true, true }
- };
+ static const TestCase kTests[] = {{"\x81\x00", 2, true, false, false, false},
+ {"\x01\x00", 2, false, false, false, false},
+ {"\xC1\x00", 2, true, true, false, false},
+ {"\xA1\x00", 2, true, false, true, false},
+ {"\x91\x00", 2, true, false, false, true},
+ {"\x71\x00", 2, false, true, true, true},
+ {"\xF1\x00", 2, true, true, true, true}};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
for (int i = 0; i < kNumTests; ++i) {
@@ -195,19 +190,18 @@ TEST(WebSocketFrameHeaderTest, InsufficientBufferSize) {
size_t expected_header_size;
};
static const TestCase kTests[] = {
- { GG_UINT64_C(0), false, 2u },
- { GG_UINT64_C(125), false, 2u },
- { GG_UINT64_C(126), false, 4u },
- { GG_UINT64_C(0xFFFF), false, 4u },
- { GG_UINT64_C(0x10000), false, 10u },
- { GG_UINT64_C(0x7FFFFFFFFFFFFFFF), false, 10u },
- { GG_UINT64_C(0), true, 6u },
- { GG_UINT64_C(125), true, 6u },
- { GG_UINT64_C(126), true, 8u },
- { GG_UINT64_C(0xFFFF), true, 8u },
- { GG_UINT64_C(0x10000), true, 14u },
- { GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true, 14u }
- };
+ {GG_UINT64_C(0), false, 2u},
+ {GG_UINT64_C(125), false, 2u},
+ {GG_UINT64_C(126), false, 4u},
+ {GG_UINT64_C(0xFFFF), false, 4u},
+ {GG_UINT64_C(0x10000), false, 10u},
+ {GG_UINT64_C(0x7FFFFFFFFFFFFFFF), false, 10u},
+ {GG_UINT64_C(0), true, 6u},
+ {GG_UINT64_C(125), true, 6u},
+ {GG_UINT64_C(126), true, 8u},
+ {GG_UINT64_C(0xFFFF), true, 8u},
+ {GG_UINT64_C(0x10000), true, 14u},
+ {GG_UINT64_C(0x7FFFFFFFFFFFFFFF), true, 14u}};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
for (int i = 0; i < kNumTests; ++i) {
@@ -235,17 +229,17 @@ TEST(WebSocketFrameTest, MaskPayload) {
size_t data_length;
};
static const TestCase kTests[] = {
- { "\xDE\xAD\xBE\xEF", 0, "FooBar", "\x98\xC2\xD1\xAD\xBF\xDF", 6 },
- { "\xDE\xAD\xBE\xEF", 1, "FooBar", "\xEB\xD1\x80\x9C\xCC\xCC", 6 },
- { "\xDE\xAD\xBE\xEF", 2, "FooBar", "\xF8\x80\xB1\xEF\xDF\x9D", 6 },
- { "\xDE\xAD\xBE\xEF", 3, "FooBar", "\xA9\xB1\xC2\xFC\x8E\xAC", 6 },
- { "\xDE\xAD\xBE\xEF", 4, "FooBar", "\x98\xC2\xD1\xAD\xBF\xDF", 6 },
- { "\xDE\xAD\xBE\xEF", 42, "FooBar", "\xF8\x80\xB1\xEF\xDF\x9D", 6 },
- { "\xDE\xAD\xBE\xEF", 0, "", "", 0 },
- { "\xDE\xAD\xBE\xEF", 0, "\xDE\xAD\xBE\xEF", "\x00\x00\x00\x00", 4 },
- { "\xDE\xAD\xBE\xEF", 0, "\x00\x00\x00\x00", "\xDE\xAD\xBE\xEF", 4 },
- { "\x00\x00\x00\x00", 0, "FooBar", "FooBar", 6 },
- { "\xFF\xFF\xFF\xFF", 0, "FooBar", "\xB9\x90\x90\xBD\x9E\x8D", 6 },
+ {"\xDE\xAD\xBE\xEF", 0, "FooBar", "\x98\xC2\xD1\xAD\xBF\xDF", 6},
+ {"\xDE\xAD\xBE\xEF", 1, "FooBar", "\xEB\xD1\x80\x9C\xCC\xCC", 6},
+ {"\xDE\xAD\xBE\xEF", 2, "FooBar", "\xF8\x80\xB1\xEF\xDF\x9D", 6},
+ {"\xDE\xAD\xBE\xEF", 3, "FooBar", "\xA9\xB1\xC2\xFC\x8E\xAC", 6},
+ {"\xDE\xAD\xBE\xEF", 4, "FooBar", "\x98\xC2\xD1\xAD\xBF\xDF", 6},
+ {"\xDE\xAD\xBE\xEF", 42, "FooBar", "\xF8\x80\xB1\xEF\xDF\x9D", 6},
+ {"\xDE\xAD\xBE\xEF", 0, "", "", 0},
+ {"\xDE\xAD\xBE\xEF", 0, "\xDE\xAD\xBE\xEF", "\x00\x00\x00\x00", 4},
+ {"\xDE\xAD\xBE\xEF", 0, "\x00\x00\x00\x00", "\xDE\xAD\xBE\xEF", 4},
+ {"\x00\x00\x00\x00", 0, "FooBar", "FooBar", 6},
+ {"\xFF\xFF\xFF\xFF", 0, "FooBar", "\xB9\x90\x90\xBD\x9E\x8D", 6},
};
static const int kNumTests = ARRAYSIZE_UNSAFE(kTests);
@@ -290,27 +284,24 @@ TEST(WebSocketFrameTest, MaskPayloadAlignment) {
static const char kTestMask[] = "\xd2\xba\x5a\xbe";
// We use 786 bits of random input to reduce the risk of correlated errors.
static const char kTestInput[] = {
- "\x3d\x77\x1d\x1b\x19\x8c\x48\xa3\x19\x6d\xf7\xcc\x39\xe7\x57\x0b"
- "\x69\x8c\xda\x4b\xfc\xac\x2c\xd3\x49\x96\x6e\x8a\x7b\x5a\x32\x76"
- "\xd0\x11\x43\xa0\x89\xfc\x76\x2b\x10\x2f\x4c\x7b\x4f\xa6\xdd\xe4"
- "\xfc\x8e\xd8\x72\xcf\x7e\x37\xcd\x31\xcd\xc1\xc0\x89\x0c\xa7\x4c"
- "\xda\xa8\x4b\x75\xa1\xcb\xa9\x77\x19\x4d\x6e\xdf\xc8\x08\x1c\xb6"
- "\x6d\xfb\x38\x04\x44\xd5\xba\x57\x9f\x76\xb0\x2e\x07\x91\xe6\xa8"
- };
+ "\x3d\x77\x1d\x1b\x19\x8c\x48\xa3\x19\x6d\xf7\xcc\x39\xe7\x57\x0b"
+ "\x69\x8c\xda\x4b\xfc\xac\x2c\xd3\x49\x96\x6e\x8a\x7b\x5a\x32\x76"
+ "\xd0\x11\x43\xa0\x89\xfc\x76\x2b\x10\x2f\x4c\x7b\x4f\xa6\xdd\xe4"
+ "\xfc\x8e\xd8\x72\xcf\x7e\x37\xcd\x31\xcd\xc1\xc0\x89\x0c\xa7\x4c"
+ "\xda\xa8\x4b\x75\xa1\xcb\xa9\x77\x19\x4d\x6e\xdf\xc8\x08\x1c\xb6"
+ "\x6d\xfb\x38\x04\x44\xd5\xba\x57\x9f\x76\xb0\x2e\x07\x91\xe6\xa8"};
static const size_t kTestInputSize = arraysize(kTestInput) - 1;
static const char kTestOutput[] = {
- "\xef\xcd\x47\xa5\xcb\x36\x12\x1d\xcb\xd7\xad\x72\xeb\x5d\x0d\xb5"
- "\xbb\x36\x80\xf5\x2e\x16\x76\x6d\x9b\x2c\x34\x34\xa9\xe0\x68\xc8"
- "\x02\xab\x19\x1e\x5b\x46\x2c\x95\xc2\x95\x16\xc5\x9d\x1c\x87\x5a"
- "\x2e\x34\x82\xcc\x1d\xc4\x6d\x73\xe3\x77\x9b\x7e\x5b\xb6\xfd\xf2"
- "\x08\x12\x11\xcb\x73\x71\xf3\xc9\xcb\xf7\x34\x61\x1a\xb2\x46\x08"
- "\xbf\x41\x62\xba\x96\x6f\xe0\xe9\x4d\xcc\xea\x90\xd5\x2b\xbc\x16"
- };
+ "\xef\xcd\x47\xa5\xcb\x36\x12\x1d\xcb\xd7\xad\x72\xeb\x5d\x0d\xb5"
+ "\xbb\x36\x80\xf5\x2e\x16\x76\x6d\x9b\x2c\x34\x34\xa9\xe0\x68\xc8"
+ "\x02\xab\x19\x1e\x5b\x46\x2c\x95\xc2\x95\x16\xc5\x9d\x1c\x87\x5a"
+ "\x2e\x34\x82\xcc\x1d\xc4\x6d\x73\xe3\x77\x9b\x7e\x5b\xb6\xfd\xf2"
+ "\x08\x12\x11\xcb\x73\x71\xf3\xc9\xcb\xf7\x34\x61\x1a\xb2\x46\x08"
+ "\xbf\x41\x62\xba\x96\x6f\xe0\xe9\x4d\xcc\xea\x90\xd5\x2b\xbc\x16"};
COMPILE_ASSERT(arraysize(kTestInput) == arraysize(kTestOutput),
output_and_input_arrays_have_the_same_length);
- scoped_ptr<char, base::AlignedFreeDeleter> scratch(
- static_cast<char*>(
- base::AlignedAlloc(kScratchBufferSize, kMaxVectorAlignment)));
+ scoped_ptr<char, base::AlignedFreeDeleter> scratch(static_cast<char*>(
+ base::AlignedAlloc(kScratchBufferSize, kMaxVectorAlignment)));
WebSocketMaskingKey masking_key;
std::copy(kTestMask, kTestMask + kMaskingKeyLength, masking_key.key);
for (size_t frame_offset = 0; frame_offset < kMaskingKeyLength;
@@ -375,9 +366,9 @@ class WebSocketFrameTestMaskBenchmark : public testing::Test {
MaskWebSocketFramePayload(
masking_key, x % size, &scratch.front(), scratch.size());
}
- double total_time_ms =
- 1000 * (TimeTicks::HighResNow() - start).InMillisecondsF() /
- iterations_;
+ double total_time_ms = 1000 *
+ (TimeTicks::HighResNow() - start).InMillisecondsF() /
+ iterations_;
LOG(INFO) << "Payload size " << size
<< base::StringPrintf(" took %.03f microseconds per iteration",
total_time_ms);
« net/base/mime_util_unittest.cc ('K') | « net/websockets/websocket_frame_parser_test.cc ('k') | net/websockets/websocket_handshake_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698