diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:55:36 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:55:36 +0000 |
| commit | f6ad5c0d828d3fcb99b01fc603bc47b23237fec7 (patch) | |
| tree | 8743da2b9ba321eb02859c6bc7050bfa3160cbac /net | |
| parent | 2cd1b419704881832767acda830bd817fcaa5fad (diff) | |
| download | chromium_src-f6ad5c0d828d3fcb99b01fc603bc47b23237fec7.zip chromium_src-f6ad5c0d828d3fcb99b01fc603bc47b23237fec7.tar.gz chromium_src-f6ad5c0d828d3fcb99b01fc603bc47b23237fec7.tar.bz2 | |
Enable the FlipProtocolTests.
BUG=none
TEST=FlipProtocolTest
Review URL: http://codereview.chromium.org/449065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/flip/flip_protocol_test.cc | 24 | ||||
| -rw-r--r-- | net/net.gyp | 1 |
2 files changed, 11 insertions, 14 deletions
diff --git a/net/flip/flip_protocol_test.cc b/net/flip/flip_protocol_test.cc index fb78b63..9a29149 100644 --- a/net/flip/flip_protocol_test.cc +++ b/net/flip/flip_protocol_test.cc @@ -5,13 +5,9 @@ #include "flip_protocol.h" #include "base/scoped_ptr.h" -#include "flip_bitmasks.h" // shared with server. -#include "flip_framer.h" -#ifdef _WIN32 +#include "net/flip/flip_bitmasks.h" +#include "net/flip/flip_framer.h" #include "testing/platform_test.h" -#else -#include "testing/base/public/gunit.h" -#endif using flip::FlipDataFrame; using flip::FlipFrame; @@ -109,7 +105,7 @@ TEST(FlipProtocolTest, TestDataFrame) { // Set the stream ID to various values. frame.set_stream_id(0); - EXPECT_EQ(0, frame.stream_id()); + EXPECT_EQ(0u, frame.stream_id()); EXPECT_FALSE(frame.is_control_frame()); frame.set_stream_id(~0 & kStreamIdMask); EXPECT_EQ(~0 & kStreamIdMask, frame.stream_id()); @@ -120,13 +116,13 @@ TEST(FlipProtocolTest, TestDataFrame) { memset(frame.data(), '1', FlipDataFrame::size()); int8 flags = frame.flags(); frame.set_length(0); - EXPECT_EQ(0, frame.length()); + EXPECT_EQ(0u, frame.length()); EXPECT_EQ(flags, frame.flags()); frame.set_length(kLengthMask); EXPECT_EQ(kLengthMask, frame.length()); EXPECT_EQ(flags, frame.flags()); - frame.set_length(5); - EXPECT_EQ(5, frame.length()); + frame.set_length(5u); + EXPECT_EQ(5u, frame.length()); EXPECT_EQ(flags, frame.flags()); // Set flags to various values. Make sure that when you set_flags(x), @@ -134,15 +130,15 @@ TEST(FlipProtocolTest, TestDataFrame) { memset(frame.data(), '1', FlipDataFrame::size()); uint32 length = frame.length(); frame.set_flags(0); - EXPECT_EQ(0, frame.flags()); + EXPECT_EQ(0u, frame.flags()); EXPECT_EQ(length, frame.length()); int8 all_flags = ~0; frame.set_flags(all_flags); flags = frame.flags(); EXPECT_EQ(all_flags, flags); EXPECT_EQ(length, frame.length()); - frame.set_flags(5); - EXPECT_EQ(5, frame.flags()); + frame.set_flags(5u); + EXPECT_EQ(5u, frame.flags()); EXPECT_EQ(length, frame.length()); } @@ -171,7 +167,7 @@ TEST(FlipProtocolDeathTest, TestFlipControlFrame) { // Set the stream ID to various values. frame.set_stream_id(0); - EXPECT_EQ(0, frame.stream_id()); + EXPECT_EQ(0u, frame.stream_id()); EXPECT_FALSE(frame.is_control_frame()); frame.set_stream_id(~0 & kStreamIdMask); EXPECT_EQ(~0 & kStreamIdMask, frame.stream_id()); diff --git a/net/net.gyp b/net/net.gyp index 5a7f7b2..cfc2286 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -613,6 +613,7 @@ 'http/des_unittest.cc', 'flip/flip_framer_test.cc', 'flip/flip_network_transaction_unittest.cc', + 'flip/flip_protocol_test.cc', 'flip/flip_session_unittest.cc', 'flip/flip_stream_unittest.cc', 'http/http_auth_cache_unittest.cc', |