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/ssl_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/ssl_client_socket_unittest.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 2fca322..a3556dc 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -82,21 +82,21 @@ TEST_F(SSLClientSocketTest, Connect) { scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded)); rv = sock->Connect(&callback, log); - EXPECT_TRUE(net::LogContains( - *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *log, 0, net::LoadLog::TYPE_SSL_CONNECT)); if (rv != net::OK) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); - EXPECT_FALSE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_FALSE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); rv = callback.WaitForResult(); EXPECT_EQ(net::OK, rv); } EXPECT_TRUE(sock->IsConnected()); - EXPECT_TRUE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_TRUE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); sock->Disconnect(); EXPECT_FALSE(sock->IsConnected()); @@ -126,13 +126,13 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded)); rv = sock->Connect(&callback, log); - EXPECT_TRUE(net::LogContains( - *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *log, 0, net::LoadLog::TYPE_SSL_CONNECT)); if (rv != net::OK) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); - EXPECT_FALSE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_FALSE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); rv = callback.WaitForResult(); EXPECT_EQ(net::ERR_CERT_DATE_INVALID, rv); @@ -142,8 +142,8 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { // the socket when it encounters an error, whereas other implementations // leave it connected. - EXPECT_TRUE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_TRUE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); } TEST_F(SSLClientSocketTest, ConnectMismatched) { @@ -171,13 +171,13 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { scoped_refptr<net::LoadLog> log(new net::LoadLog(net::LoadLog::kUnbounded)); rv = sock->Connect(&callback, log); - EXPECT_TRUE(net::LogContains( - *log, 0, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_BEGIN)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *log, 0, net::LoadLog::TYPE_SSL_CONNECT)); if (rv != net::ERR_CERT_COMMON_NAME_INVALID) { ASSERT_EQ(net::ERR_IO_PENDING, rv); EXPECT_FALSE(sock->IsConnected()); - EXPECT_FALSE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_FALSE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); rv = callback.WaitForResult(); EXPECT_EQ(net::ERR_CERT_COMMON_NAME_INVALID, rv); @@ -187,8 +187,8 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { // the socket when it encounters an error, whereas other implementations // leave it connected. - EXPECT_TRUE(net::LogContains( - *log, -1, net::LoadLog::TYPE_SSL_CONNECT, net::LoadLog::PHASE_END)); + EXPECT_TRUE(net::LogContainsEndEvent( + *log, -1, net::LoadLog::TYPE_SSL_CONNECT)); } // TODO(wtc): Add unit tests for IsConnectedAndIdle: |