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/flip/flip_network_transaction_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/flip/flip_network_transaction_unittest.cc')
| -rw-r--r-- | net/flip/flip_network_transaction_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/flip/flip_network_transaction_unittest.cc b/net/flip/flip_network_transaction_unittest.cc index 1abcdc3..47c54c2 100644 --- a/net/flip/flip_network_transaction_unittest.cc +++ b/net/flip/flip_network_transaction_unittest.cc @@ -1053,9 +1053,8 @@ TEST_F(FlipNetworkTransactionTest, LoadLog) { EXPECT_LT(0u, log->entries().size()); int pos = 0; // We know the first event at position 0. - net::ExpectLogContains(log, 0, - net::LoadLog::TYPE_FLIP_TRANSACTION_INIT_CONNECTION, - net::LoadLog::PHASE_BEGIN); + EXPECT_TRUE(net::LogContainsBeginEvent( + *log, 0, net::LoadLog::TYPE_FLIP_TRANSACTION_INIT_CONNECTION)); // For the rest of the events, allow additional events in the middle, // but expect these to be logged in order. pos = net::ExpectLogContainsSomewhere(log, 0, |