diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 07:10:46 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 07:10:46 +0000 |
| commit | e9002a949c6ab690c4e178d45f1ecb876c535aa4 (patch) | |
| tree | 3e9872db48aa6be97987ef2fa7d100aae24e85c3 /net/socket/tcp_client_socket_unittest.cc | |
| parent | 86c72c63d6d70e040bc6a10f09a1b8a190f6d3c6 (diff) | |
| download | chromium_src-e9002a949c6ab690c4e178d45f1ecb876c535aa4.zip chromium_src-e9002a949c6ab690c4e178d45f1ecb876c535aa4.tar.gz chromium_src-e9002a949c6ab690c4e178d45f1ecb876c535aa4.tar.bz2 | |
Cleanup the unittest helpers in load_log_unittest.h.
Consolidates all the callers to using the testing::AssertionResult() flavor, and renames them to have "Event" in the name. This rename is in anticipation of adding testers for other entry types.
BUG=NONE
TEST=existing
Review URL: http://codereview.chromium.org/551135
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/tcp_client_socket_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc index d797e05..eebdc9f 100644 --- a/net/socket/tcp_client_socket_unittest.cc +++ b/net/socket/tcp_client_socket_unittest.cc @@ -101,20 +101,20 @@ TEST_F(TCPClientSocketTest, Connect) { scoped_refptr<LoadLog> log(new LoadLog(LoadLog::kUnbounded)); int rv = sock_->Connect(&callback, log); - EXPECT_TRUE(net::LogContains( - *log, 0, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_BEGIN)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *log, 0, net::LoadLog::TYPE_TCP_CONNECT)); if (rv != OK) { ASSERT_EQ(rv, ERR_IO_PENDING); - EXPECT_FALSE(net::LogContains( - *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_FALSE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_TCP_CONNECT)); rv = callback.WaitForResult(); EXPECT_EQ(rv, OK); } EXPECT_TRUE(sock_->IsConnected()); - EXPECT_TRUE(net::LogContains( - *log, -1, net::LoadLog::TYPE_TCP_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_TRUE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_TCP_CONNECT)); sock_->Disconnect(); EXPECT_FALSE(sock_->IsConnected()); |