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/url_request | |
| 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/url_request')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 1adeb0c..48cfd35 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -218,22 +218,14 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) { // The first part of the log will be for URL_REQUEST_START. // After that, there should be an HTTP_TRANSACTION_READ_BODY - EXPECT_TRUE( - net::LogContains(*r.load_log(), 0, - net::LoadLog::TYPE_URL_REQUEST_START, - net::LoadLog::PHASE_BEGIN)); - EXPECT_TRUE( - net::LogContains(*r.load_log(), -3, - net::LoadLog::TYPE_URL_REQUEST_START, - net::LoadLog::PHASE_END)); - EXPECT_TRUE( - net::LogContains(*r.load_log(), -2, - net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY, - net::LoadLog::PHASE_BEGIN)); - EXPECT_TRUE( - net::LogContains(*r.load_log(), -1, - net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY, - net::LoadLog::PHASE_END)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *r.load_log(), 0, net::LoadLog::TYPE_URL_REQUEST_START)); + EXPECT_TRUE(net::LogContainsEndEvent( + *r.load_log(), -3, net::LoadLog::TYPE_URL_REQUEST_START)); + EXPECT_TRUE(net::LogContainsBeginEvent( + *r.load_log(), -2, net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY)); + EXPECT_TRUE(net::LogContainsEndEvent( + *r.load_log(), -1, net::LoadLog::TYPE_HTTP_TRANSACTION_READ_BODY)); } } |