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

Unified Diff: net/url_request/url_request_ftp_job_unittest.cc

Issue 2332643002: Change net/nqe and some url_request tests to use new URLRequest API (Closed)
Patch Set: add ftp job unittests and http job files Created 4 years, 3 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/nqe/throughput_analyzer_unittest.cc ('k') | net/url_request/url_request_http_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_ftp_job_unittest.cc
diff --git a/net/url_request/url_request_ftp_job_unittest.cc b/net/url_request/url_request_ftp_job_unittest.cc
index e478e2a17515d211a7a4e2479ef9e42dac4492cb..526269c0c8cc306ff6463d24ecf92c92040d5494 100644
--- a/net/url_request/url_request_ftp_job_unittest.cc
+++ b/net/url_request/url_request_ftp_job_unittest.cc
@@ -310,7 +310,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequest) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_TRUE(url_request->proxy_server().Equals(
HostPortPair::FromString("localhost:80")));
EXPECT_EQ(1, network_delegate()->completed_requests());
@@ -406,7 +406,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthNoCredentials) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_TRUE(url_request->proxy_server().Equals(
HostPortPair::FromString("localhost:80")));
EXPECT_EQ(1, network_delegate()->completed_requests());
@@ -452,7 +452,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAuthWithCredentials) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_EQ(1, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
EXPECT_TRUE(request_delegate.auth_required_called());
@@ -485,7 +485,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthNoCredentials) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_EQ(1, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
EXPECT_TRUE(request_delegate.auth_required_called());
@@ -529,7 +529,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedServerAuthWithCredentials) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_EQ(1, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
EXPECT_TRUE(request_delegate.auth_required_called());
@@ -603,7 +603,6 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) {
// Run until server auth is requested.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
EXPECT_EQ(0, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
url_request->SetAuth(
@@ -612,7 +611,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestNeedProxyAndServerAuth) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_EQ(1, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
EXPECT_TRUE(request_delegate.auth_required_called());
@@ -643,7 +642,7 @@ TEST_F(URLRequestFtpJobTest, FtpProxyRequestDoNotSaveCookies) {
// The TestDelegate will by default quit the message loop on completion.
base::RunLoop().Run();
- EXPECT_TRUE(url_request->status().is_success());
+ EXPECT_THAT(request_delegate.request_status(), IsOk());
EXPECT_EQ(1, network_delegate()->completed_requests());
EXPECT_EQ(0, network_delegate()->error_count());
« no previous file with comments | « net/nqe/throughput_analyzer_unittest.cc ('k') | net/url_request/url_request_http_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698