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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_script_fetcher_impl_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_script_decider_unittest.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_script_fetcher_impl_unittest.cc
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index f982c1e0b6d55bf8925e10eddb3faf440768b9eb..2fb37bb1ed8260db99772972ab75b822d0a95d9e 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -30,10 +30,12 @@
#include "net/http/transport_security_state.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/gtest_util.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "net/url_request/url_request_test_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -41,6 +43,9 @@
#include "net/url_request/file_protocol_handler.h"
#endif
+using net::test::IsError;
+using net::test::IsOk;
+
using base::ASCIIToUTF16;
// TODO(eroman):
@@ -217,8 +222,8 @@ TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(GetTestFileUrl("does-not-exist"),
&text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(ERR_FILE_NOT_FOUND, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsError(ERR_FILE_NOT_FOUND));
EXPECT_TRUE(text.empty());
}
{ // Fetch a file that exists.
@@ -226,8 +231,8 @@ TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(GetTestFileUrl("pac.txt"),
&text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
}
}
@@ -245,8 +250,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
}
{ // Fetch a PAC with mime type "text/html"
@@ -254,8 +259,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.html-\n"), text);
}
{ // Fetch a PAC with mime type "application/x-ns-proxy-autoconfig"
@@ -263,8 +268,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
}
}
@@ -279,8 +284,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsError(ERR_PAC_STATUS_NOT_OK));
EXPECT_TRUE(text.empty());
}
{ // Fetch a PAC which gives a 404 -- FAIL
@@ -288,8 +293,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsError(ERR_PAC_STATUS_NOT_OK));
EXPECT_TRUE(text.empty());
}
}
@@ -305,8 +310,8 @@ TEST_F(ProxyScriptFetcherImplTest, ContentDisposition) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-downloadable.pac-\n"), text);
}
@@ -322,8 +327,8 @@ TEST_F(ProxyScriptFetcherImplTest, NoCache) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-cacheable_1hr.pac-\n"), text);
}
@@ -337,7 +342,7 @@ TEST_F(ProxyScriptFetcherImplTest, NoCache) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
// Expect any error. The exact error varies by platform.
EXPECT_NE(OK, callback.WaitForResult());
@@ -367,8 +372,8 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(ERR_FILE_TOO_BIG, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsError(ERR_FILE_TOO_BIG));
EXPECT_TRUE(text.empty());
}
@@ -380,8 +385,8 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
}
}
@@ -402,8 +407,8 @@ TEST_F(ProxyScriptFetcherImplTest, Hang) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(ERR_TIMED_OUT, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsError(ERR_TIMED_OUT));
EXPECT_TRUE(text.empty());
}
@@ -415,8 +420,8 @@ TEST_F(ProxyScriptFetcherImplTest, Hang) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
}
}
@@ -435,8 +440,8 @@ TEST_F(ProxyScriptFetcherImplTest, Encodings) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("This data was gzipped.\n"), text);
}
@@ -447,8 +452,8 @@ TEST_F(ProxyScriptFetcherImplTest, Encodings) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, result);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(result, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text);
}
}
@@ -473,7 +478,7 @@ TEST_F(ProxyScriptFetcherImplTest, DataURLs) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(OK, result);
+ EXPECT_THAT(result, IsOk());
EXPECT_EQ(ASCIIToUTF16(kPacScript), text);
}
@@ -486,7 +491,7 @@ TEST_F(ProxyScriptFetcherImplTest, DataURLs) {
base::string16 text;
TestCompletionCallback callback;
int result = pac_fetcher.Fetch(url, &text, callback.callback());
- EXPECT_EQ(ERR_FAILED, result);
+ EXPECT_THAT(result, IsError(ERR_FAILED));
}
}
« no previous file with comments | « net/proxy/proxy_script_decider_unittest.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698