From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp') diff --git a/Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp b/Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp index 423a5969f..1d7826a69 100644 --- a/Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp +++ b/Source/WebKit/chromium/tests/WebSocketDeflaterTest.cpp @@ -46,8 +46,8 @@ TEST(WebSocketDeflaterTest, TestCompressHello) ASSERT_TRUE(deflater->addBytes(inputData, inputLength)); ASSERT_TRUE(deflater->finish()); - const char expectedFirst[] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00}; - EXPECT_EQ(sizeof(expectedFirst), deflater->size()); + const char* expectedFirst = "\xf2\x48\xcd\xc9\xc9\x07\x00"; + EXPECT_EQ(7U, deflater->size()); EXPECT_EQ(0, memcmp(expectedFirst, deflater->data(), deflater->size())); ASSERT_TRUE(inflater->addBytes(deflater->data(), deflater->size())); ASSERT_TRUE(inflater->finish()); @@ -59,8 +59,8 @@ TEST(WebSocketDeflaterTest, TestCompressHello) ASSERT_TRUE(deflater->addBytes(inputData, inputLength)); ASSERT_TRUE(deflater->finish()); - const char expectedSecond[] = {0xf2, 0x00, 0x11, 0x00, 0x00}; - EXPECT_EQ(sizeof(expectedSecond), deflater->size()); + const char* expectedSecond = "\xf2\x00\x11\x00\x00"; + EXPECT_EQ(5U, deflater->size()); EXPECT_EQ(0, memcmp(expectedSecond, deflater->data(), deflater->size())); ASSERT_TRUE(inflater->addBytes(deflater->data(), deflater->size())); ASSERT_TRUE(inflater->finish()); @@ -93,7 +93,7 @@ TEST(WebSocketDeflaterTest, TestNoContextTakeOver) ASSERT_TRUE(deflater->initialize()); OwnPtr inflater = WebSocketInflater::create(); ASSERT_TRUE(inflater->initialize()); - const char expected[] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00}; + const char* expected = "\xf2\x48\xcd\xc9\xc9\x07\x00"; const char* inputData = "Hello"; const size_t inputLength = strlen(inputData); @@ -102,7 +102,7 @@ TEST(WebSocketDeflaterTest, TestNoContextTakeOver) for (size_t i = 0; i < 2; ++i) { ASSERT_TRUE(deflater->addBytes(inputData, inputLength)); ASSERT_TRUE(deflater->finish()); - EXPECT_EQ(sizeof(expected), deflater->size()); + EXPECT_EQ(7U, deflater->size()); EXPECT_EQ(0, memcmp(expected, deflater->data(), deflater->size())); ASSERT_TRUE(inflater->addBytes(deflater->data(), deflater->size())); ASSERT_TRUE(inflater->finish()); -- cgit v1.2.1