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_stream | |
| 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_stream')
| -rw-r--r-- | net/socket_stream/socket_stream_unittest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index fc9cac2..76d59e9 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -210,13 +210,10 @@ TEST_F(SocketStreamTest, BasicAuthProxy) { // The first and last entries of the LoadLog should be for // SOCKET_STREAM_CONNECT. - ExpectLogContains(socket_stream->load_log(), 0, - LoadLog::TYPE_SOCKET_STREAM_CONNECT, - LoadLog::PHASE_BEGIN); - ExpectLogContains(socket_stream->load_log(), - socket_stream->load_log()->entries().size() - 1, - LoadLog::TYPE_SOCKET_STREAM_CONNECT, - LoadLog::PHASE_END); + EXPECT_TRUE(LogContainsBeginEvent( + *socket_stream->load_log(), 0, LoadLog::TYPE_SOCKET_STREAM_CONNECT)); + EXPECT_TRUE(LogContainsEndEvent( + *socket_stream->load_log(), -1, LoadLog::TYPE_SOCKET_STREAM_CONNECT)); } } // namespace net |