Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 2109503009: Refactor net tests to use GMock matchers for checking net::Error results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to contents.txt files Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_service_mojo_unittest.cc ('k') | net/quic/bidirectional_stream_quic_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index a1c61793014f88d9fe8783930403f421d0ddd5b6..97f9a15232052bab5fc2bbb2c75acdf738216468 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -29,9 +29,14 @@
#include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_resolver.h"
#include "net/proxy/proxy_script_fetcher.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
+using net::test::IsError;
+using net::test::IsOk;
+
using base::ASCIIToUTF16;
// TODO(eroman): Write a test which exercises
@@ -360,7 +365,7 @@ TEST_F(ProxyServiceTest, Direct) {
int rv =
service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr, log.bound());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(factory->pending_requests().empty());
EXPECT_TRUE(info.is_direct());
@@ -401,7 +406,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) {
int rv =
service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr, log.bound());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Verify that network delegate is invoked.
TestResolveProxyDelegate delegate;
@@ -459,7 +464,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) {
int rv =
service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr, log.bound());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
TestResolveProxyDelegate delegate;
delegate.set_remove_proxy(true);
@@ -504,7 +509,7 @@ TEST_F(ProxyServiceTest, PAC) {
int rv =
service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), &request, nullptr, log.bound());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request));
@@ -520,7 +525,7 @@ TEST_F(ProxyServiceTest, PAC) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy:80", info.proxy_server().ToURI());
EXPECT_TRUE(info.did_use_pac_script());
@@ -564,7 +569,7 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -596,7 +601,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -609,7 +614,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy:8080");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy:8080", info.proxy_server().ToURI());
EXPECT_TRUE(info.did_use_pac_script());
@@ -628,7 +633,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) {
url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, &proxy_delegate, BoundNetLog());
// ReconsiderProxyAfterError returns error indicating nothing left.
- EXPECT_EQ(ERR_FAILED, rv);
+ EXPECT_THAT(rv, IsError(ERR_FAILED));
EXPECT_TRUE(info.is_empty());
}
@@ -651,7 +656,7 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -663,7 +668,7 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) {
// Simulate a failure in the PAC executor.
resolver.pending_requests()[0]->CompleteNow(ERR_PAC_SCRIPT_FAILED);
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
// Since the PAC script was non-mandatory, we should have fallen-back to
// DIRECT.
@@ -710,7 +715,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -724,7 +729,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
"DIRECT ; PROXY foobar:10 ; DIRECT ; PROXY foobar:20");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
// Fallback 1.
@@ -732,7 +737,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foobar:10", info.proxy_server().ToURI());
@@ -743,7 +748,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
rv = service.ReconsiderProxyAfterError(
url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback3.callback(), nullptr, &proxy_delegate, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info.is_direct());
// Fallback 3.
@@ -752,7 +757,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
rv = service.ReconsiderProxyAfterError(
url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback4.callback(), nullptr, &proxy_delegate, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foobar:20", info.proxy_server().ToURI());
@@ -762,7 +767,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
rv = service.ReconsiderProxyAfterError(
url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback5.callback(), nullptr, &proxy_delegate, BoundNetLog());
- EXPECT_EQ(ERR_FAILED, rv);
+ EXPECT_THAT(rv, IsError(ERR_FAILED));
EXPECT_TRUE(info.is_empty());
}
@@ -787,7 +792,7 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- ASSERT_EQ(ERR_IO_PENDING, rv);
+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver);
ASSERT_EQ(1u, resolver.pending_requests().size());
@@ -795,7 +800,7 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
EXPECT_TRUE(info.did_use_pac_script());
@@ -826,7 +831,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -840,7 +845,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
// Although the proxy resolver failed the request, ProxyService implicitly
// falls-back to DIRECT.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
// Failed PAC executions still have proxy resolution times.
@@ -854,7 +859,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -864,7 +869,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy_valid:8080", info.proxy_server().ToURI());
}
@@ -890,7 +895,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {
int rv = service.ResolveProxy(url, std::string(), net::LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, factory->pending_requests().size());
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -905,7 +910,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {
// Although the proxy resolver failed the request, ProxyService implicitly
// falls-back to DIRECT.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
// Failed PAC executions still have proxy resolution times.
@@ -921,7 +926,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {
rv = service.ResolveProxy(url, std::string(), net::LOAD_NORMAL, &info,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, factory->pending_requests().size());
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -935,7 +940,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy_valid:8080", info.proxy_server().ToURI());
}
@@ -963,12 +968,12 @@ TEST_F(ProxyServiceTest,
int rv = service.ResolveProxy(url1, std::string(), net::LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
TestCompletionCallback callback2;
rv = service.ResolveProxy(url2, std::string(), net::LOAD_NORMAL, &info,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, factory->pending_requests().size());
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -982,7 +987,7 @@ TEST_F(ProxyServiceTest,
// Although the proxy resolver failed the request, ProxyService implicitly
// falls-back to DIRECT.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
// Failed PAC executions still have proxy resolution times.
@@ -1006,7 +1011,7 @@ TEST_F(ProxyServiceTest,
requests[url2]->results()->UseNamedProxy("foopy_valid:8080");
requests[url2]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy_valid:8080", info.proxy_server().ToURI());
}
@@ -1034,7 +1039,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1053,7 +1058,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED, rv);
+ EXPECT_THAT(rv, IsError(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED));
EXPECT_FALSE(info.is_direct());
}
@@ -1085,7 +1090,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -1132,7 +1137,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1156,7 +1161,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1166,7 +1171,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {
resolver.pending_requests()[0]->results()->UseNamedProxy("foopy_valid:8080");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy_valid:8080", info.proxy_server().ToURI());
}
@@ -1193,7 +1198,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1208,7 +1213,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
resolver.pending_requests()[0]->CompleteNow(OK);
// The first item is valid.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1223,7 +1228,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Proxy times should not have been modified by fallback.
EXPECT_EQ(proxy_resolve_start_time, info.proxy_resolve_start_time());
@@ -1243,7 +1248,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1254,7 +1259,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
"foopy3:7070;foopy1:8080;foopy2:9090");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback3.WaitForResult());
+ EXPECT_THAT(callback3.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy3:7070", info.proxy_server().ToURI());
@@ -1271,7 +1276,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback4.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI());
// We fake another error. At this point we have tried all of the
@@ -1281,7 +1286,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback5.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
// Fake another error, the last proxy is gone, the list should now be empty,
@@ -1290,7 +1295,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback6.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_FAILED, rv);
+ EXPECT_THAT(rv, IsError(ERR_FAILED));
EXPECT_FALSE(info.is_direct());
EXPECT_TRUE(info.is_empty());
@@ -1303,7 +1308,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback7.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1315,7 +1320,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
resolver.pending_requests()[0]->CompleteNow(OK);
// ... therefore, we should see the second proxy first.
- EXPECT_EQ(OK, callback7.WaitForResult());
+ EXPECT_THAT(callback7.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy3:7070", info.proxy_server().ToURI());
@@ -1346,7 +1351,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1361,7 +1366,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Get the first result.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1370,7 +1375,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Now we get back the second proxy.
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI());
@@ -1380,7 +1385,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback3.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Finally, we get back DIRECT.
EXPECT_TRUE(info.is_direct());
@@ -1396,7 +1401,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
callback4.callback(), nullptr, nullptr, BoundNetLog());
// There was nothing left to try after DIRECT, so we are out of
// choices.
- EXPECT_EQ(ERR_FAILED, rv);
+ EXPECT_THAT(rv, IsError(ERR_FAILED));
}
TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
@@ -1420,7 +1425,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1435,7 +1440,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
resolver.pending_requests()[0]->CompleteNow(OK);
// The first item is valid.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1447,7 +1452,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy-new/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1461,7 +1466,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
resolver.pending_requests()[0]->CompleteNow(OK);
// The first proxy is still there since the configuration changed.
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
// We fake another error. It should now ignore the first one.
@@ -1469,7 +1474,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback3.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI());
// We simulate a new configuration.
@@ -1482,7 +1487,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback4.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy-new2/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1495,7 +1500,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
"foopy1:8080;foopy2:9090");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback4.WaitForResult());
+ EXPECT_THAT(callback4.WaitForResult(), IsOk());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
EXPECT_FALSE(info.proxy_resolve_start_time().is_null());
@@ -1524,7 +1529,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1537,7 +1542,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
resolver.pending_requests()[0]->CompleteNow(OK);
// The first item is valid.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1546,7 +1551,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// The first proxy is ignored, and the second one is selected.
EXPECT_FALSE(info.is_direct());
@@ -1558,7 +1563,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info2,
callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1568,7 +1573,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
// Although the resolver failed, the ProxyService will implicitly fall-back
// to a DIRECT connection.
- EXPECT_EQ(OK, callback3.WaitForResult());
+ EXPECT_THAT(callback3.WaitForResult(), IsOk());
EXPECT_TRUE(info2.is_direct());
EXPECT_FALSE(info2.is_empty());
@@ -1580,7 +1585,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3,
callback4.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1591,7 +1596,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
// The first proxy is not there since the it was added to the bad proxies
// list by the earlier ReconsiderProxyAfterError().
- EXPECT_EQ(OK, callback4.WaitForResult());
+ EXPECT_THAT(callback4.WaitForResult(), IsOk());
EXPECT_FALSE(info3.is_direct());
EXPECT_EQ("foopy1:8080", info3.proxy_server().ToURI());
@@ -1624,7 +1629,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -1637,7 +1642,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
resolver.pending_requests()[0]->CompleteNow(OK);
// The first item is valid.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1646,7 +1651,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info,
callback2.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// The first proxy is ignored, and the second one is selected.
EXPECT_FALSE(info.is_direct());
@@ -1658,7 +1663,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info2,
callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1681,7 +1686,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
rv = service.ReconsiderProxyAfterError(
url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3,
callback4.callback(), nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(url, resolver.pending_requests()[0]->url());
@@ -1692,7 +1697,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
// The first proxy is not there since the it was added to the bad proxies
// list by the earlier ReconsiderProxyAfterError().
- EXPECT_EQ(OK, callback4.WaitForResult());
+ EXPECT_THAT(callback4.WaitForResult(), IsOk());
EXPECT_FALSE(info3.is_direct());
EXPECT_EQ("foopy1:8080", info3.proxy_server().ToURI());
}
@@ -1718,14 +1723,14 @@ TEST_F(ProxyServiceTest, ProxyBypassList) {
rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info[0],
callback[0].callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info[0].is_direct());
// Request for a .com domain hits the proxy.
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info[1],
callback[1].callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI());
}
@@ -1777,7 +1782,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
}
@@ -1790,7 +1795,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info.is_direct());
EXPECT_EQ("direct://", info.proxy_server().ToURI());
}
@@ -1803,7 +1808,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
}
@@ -1817,7 +1822,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
}
@@ -1839,7 +1844,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// Should be SOURCE_TEST, even if there are no HTTP proxies configured.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
}
@@ -1855,7 +1860,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// Used the HTTPS proxy. So source should be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
}
@@ -1870,7 +1875,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// ProxyConfig is empty. Source should still be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
}
@@ -1894,7 +1899,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
}
@@ -1907,7 +1912,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
}
@@ -1920,7 +1925,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
}
@@ -1933,7 +1938,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
}
@@ -1961,7 +1966,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Successfully initialize the PAC script.
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1976,7 +1981,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2,
callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
GetPendingRequestsForURLs(resolver, url1, url2);
@@ -1985,7 +1990,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
rv = service.ResolveProxy(url3, std::string(), LOAD_NORMAL, &info3,
callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
GetPendingRequestsForURLs(resolver, url1, url2, url3);
// Cancel the second request
@@ -2002,13 +2007,13 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
requests[url1]->CompleteNow(OK);
// Complete and verify that requests ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
EXPECT_FALSE(callback2.have_result()); // Cancelled.
GetCancelledRequestsForURLs(resolver, url2);
- EXPECT_EQ(OK, callback3.WaitForResult());
+ EXPECT_THAT(callback3.WaitForResult(), IsOk());
EXPECT_EQ("request3:80", info3.proxy_server().ToURI());
}
@@ -2039,7 +2044,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1,
callback1.callback(), &request1, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2051,7 +2056,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2,
callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ProxyInfo info3;
TestCompletionCallback callback3;
@@ -2059,7 +2064,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
rv = service.ResolveProxy(url3, std::string(), LOAD_NORMAL, &info3,
callback3.callback(), &request3, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Nothing has been sent to the factory yet.
EXPECT_TRUE(factory->pending_requests().empty());
@@ -2100,19 +2105,19 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
requests[url2]->CompleteNow(OK);
// Complete and verify that requests ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());
EXPECT_LE(info1.proxy_resolve_start_time(), info1.proxy_resolve_end_time());
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
EXPECT_FALSE(info2.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info2.proxy_resolve_end_time().is_null());
EXPECT_LE(info2.proxy_resolve_start_time(), info2.proxy_resolve_end_time());
- EXPECT_EQ(OK, callback3.WaitForResult());
+ EXPECT_THAT(callback3.WaitForResult(), IsOk());
EXPECT_EQ("request3:80", info3.proxy_server().ToURI());
EXPECT_FALSE(info3.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info3.proxy_resolve_end_time().is_null());
@@ -2144,7 +2149,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2155,7 +2160,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2,
callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// At this point the ProxyService should be waiting for the
// ProxyScriptFetcher to invoke its completion callback, notifying it of
@@ -2206,7 +2211,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
&request1, nullptr, log1.bound());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2218,14 +2223,14 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ProxyInfo info3;
TestCompletionCallback callback3;
rv = service.ResolveProxy(GURL("http://request3"), std::string(), LOAD_NORMAL,
&info3, callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Nothing has been sent to the factory yet.
EXPECT_TRUE(factory->pending_requests().empty());
@@ -2252,7 +2257,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
resolver.pending_requests()[0]->results()->UseNamedProxy("request3:80");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback3.WaitForResult());
+ EXPECT_THAT(callback3.WaitForResult(), IsOk());
EXPECT_EQ("request3:80", info3.proxy_server().ToURI());
EXPECT_TRUE(resolver.cancelled_requests().empty());
@@ -2304,7 +2309,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ProxyInfo info2;
TestCompletionCallback callback2;
@@ -2312,7 +2317,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2,
callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -2344,13 +2349,13 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
requests[url1]->CompleteNow(OK);
// Verify that requests ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
EXPECT_FALSE(info1.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info1.proxy_resolve_end_time().is_null());
EXPECT_LE(info1.proxy_resolve_start_time(), info1.proxy_resolve_end_time());
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
EXPECT_FALSE(info2.proxy_resolve_start_time().is_null());
EXPECT_FALSE(info2.proxy_resolve_end_time().is_null());
@@ -2385,7 +2390,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1,
callback1.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ProxyInfo info2;
TestCompletionCallback callback2;
@@ -2393,7 +2398,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2,
callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -2427,10 +2432,10 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
requests[url1]->CompleteNow(OK);
// Verify that requests ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
}
@@ -2459,7 +2464,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ProxyInfo info2;
TestCompletionCallback callback2;
@@ -2467,7 +2472,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), &request2, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -2488,10 +2493,10 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
// Verify that requests ran as expected -- they should have fallen back to
// the manual proxy configuration for HTTP urls.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("foopy:80", info1.proxy_server().ToURI());
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("foopy:80", info2.proxy_server().ToURI());
}
@@ -2521,7 +2526,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -2544,7 +2549,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Verify that request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// Start another request, it should pickup the bypass item.
@@ -2553,7 +2558,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(),
LOAD_NORMAL, &info2, callback2.callback(), nullptr,
nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
ASSERT_EQ(1u, resolver.pending_requests().size());
EXPECT_EQ(GURL("http://www.google.com"),
@@ -2563,7 +2568,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
}
@@ -2592,7 +2597,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that nothing has been sent to the proxy resolver factory yet.
ASSERT_EQ(0u, factory->pending_requests().size());
@@ -2624,7 +2629,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) {
int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
factory->pending_requests()[0]->script_data()->url());
@@ -2642,7 +2647,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
ProxyConfig config2;
@@ -2654,7 +2659,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
}
@@ -2677,7 +2682,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Successfully set the autodetect script.
EXPECT_EQ(ProxyResolverScriptData::TYPE_AUTO_DETECT,
@@ -2690,7 +2695,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Verify that request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// Force the ProxyService to pull down a new proxy configuration.
@@ -2706,7 +2711,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(),
LOAD_NORMAL, &info2, callback2.callback(), nullptr,
nullptr, BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info2.is_direct());
}
@@ -2739,7 +2744,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2767,7 +2772,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// Now simluate a change in the network. The ProxyConfigService is still
@@ -2782,7 +2787,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// This second request should have triggered the re-download of the PAC
// script (since we marked the network as having changed).
@@ -2810,7 +2815,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
// Check that the expected events were output to the log stream. In particular
@@ -2857,7 +2862,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2877,7 +2882,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ASSERT_TRUE(factory->pending_requests().empty());
// Wait for completion callback, and verify it used DIRECT.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_TRUE(info1.is_direct());
// At this point we have initialized the proxy service using a PAC script,
@@ -2918,7 +2923,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that it was sent to the resolver.
ASSERT_EQ(1u, resolver.pending_requests().size());
@@ -2929,7 +2934,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
}
@@ -2964,7 +2969,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -2992,7 +2997,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// At this point we have initialized the proxy service using a PAC script.
@@ -3031,7 +3036,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that it was sent to the resolver.
ASSERT_EQ(1u, resolver.pending_requests().size());
@@ -3042,7 +3047,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
}
@@ -3077,7 +3082,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -3105,7 +3110,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// At this point we have initialized the proxy service using a PAC script.
@@ -3141,7 +3146,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Check that it was sent to the resolver.
ASSERT_EQ(1u, resolver.pending_requests().size());
@@ -3152,7 +3157,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
}
@@ -3187,7 +3192,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -3215,7 +3220,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// At this point we have initialized the proxy service using a PAC script.
@@ -3248,7 +3253,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info2.is_direct());
}
@@ -3342,7 +3347,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
int rv = service.ResolveProxy(GURL("http://request1"), std::string(),
LOAD_NORMAL, &info1, callback1.callback(),
nullptr, nullptr, BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The first request should have triggered initial download of PAC script.
EXPECT_TRUE(fetcher->has_pending_request());
@@ -3370,7 +3375,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
resolver.pending_requests()[0]->CompleteNow(OK);
// Wait for completion callback, and verify that the request ran as expected.
- EXPECT_EQ(OK, callback1.WaitForResult());
+ EXPECT_THAT(callback1.WaitForResult(), IsOk());
EXPECT_EQ("request1:80", info1.proxy_server().ToURI());
// At this point we have initialized the proxy service using a PAC script.
@@ -3387,7 +3392,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL,
&info2, callback2.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// This request should have sent work to the resolver; complete it.
ASSERT_EQ(1u, resolver.pending_requests().size());
@@ -3395,7 +3400,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
resolver.pending_requests()[0]->results()->UseNamedProxy("request2:80");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback2.WaitForResult());
+ EXPECT_THAT(callback2.WaitForResult(), IsOk());
EXPECT_EQ("request2:80", info2.proxy_server().ToURI());
// In response to getting that resolve request, the poller should have
@@ -3418,7 +3423,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
rv = service.ResolveProxy(GURL("http://request3"), std::string(), LOAD_NORMAL,
&info3, callback3.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(info3.is_direct());
}
@@ -3499,7 +3504,7 @@ class SanitizeUrlHelper {
int rv = service_->ResolveProxy(url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// First step is to download the PAC script.
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -3512,7 +3517,7 @@ class SanitizeUrlHelper {
// Complete the request.
resolver.pending_requests()[0]->results()->UsePacString("DIRECT");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
}
@@ -3531,7 +3536,7 @@ class SanitizeUrlHelper {
int rv = service_->ResolveProxy(raw_url, std::string(), LOAD_NORMAL, &info,
callback.callback(), nullptr, nullptr,
BoundNetLog());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_EQ(1u, resolver.pending_requests().size());
@@ -3540,7 +3545,7 @@ class SanitizeUrlHelper {
// Complete the request.
resolver.pending_requests()[0]->results()->UsePacString("DIRECT");
resolver.pending_requests()[0]->CompleteNow(OK);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_TRUE(info.is_direct());
return sanitized_url;
« no previous file with comments | « net/proxy/proxy_service_mojo_unittest.cc ('k') | net/quic/bidirectional_stream_quic_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698