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/proxy/proxy_resolver_v8_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/proxy/proxy_resolver_v8_unittest.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_v8_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/proxy/proxy_resolver_v8_unittest.cc b/net/proxy/proxy_resolver_v8_unittest.cc index 4d1c1b8..ee536b0 100644 --- a/net/proxy/proxy_resolver_v8_unittest.cc +++ b/net/proxy/proxy_resolver_v8_unittest.cc @@ -435,18 +435,18 @@ TEST(ProxyResolverV8Test, LoadLog) { // isInNet() and isResolvable(). EXPECT_EQ(6u, log->entries().size()); - ExpectLogContains(log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS, - LoadLog::PHASE_BEGIN); - ExpectLogContains(log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS, - LoadLog::PHASE_END); - ExpectLogContains(log, 2, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE, - LoadLog::PHASE_BEGIN); - ExpectLogContains(log, 3, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE, - LoadLog::PHASE_END); - ExpectLogContains(log, 4, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE, - LoadLog::PHASE_BEGIN); - ExpectLogContains(log, 5, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE, - LoadLog::PHASE_END); + EXPECT_TRUE(LogContainsBeginEvent( + *log, 0, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS)); + EXPECT_TRUE(LogContainsEndEvent( + *log, 1, LoadLog::TYPE_PROXY_RESOLVER_V8_MY_IP_ADDRESS)); + EXPECT_TRUE(LogContainsBeginEvent( + *log, 2, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE)); + EXPECT_TRUE(LogContainsEndEvent( + *log, 3, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE)); + EXPECT_TRUE(LogContainsBeginEvent( + *log, 4, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE)); + EXPECT_TRUE(LogContainsEndEvent( + *log, 5, LoadLog::TYPE_PROXY_RESOLVER_V8_DNS_RESOLVE)); } // Try loading a PAC script that ends with a comment and has no terminal |