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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_script_fetcher_impl_unittest.cc

Issue 6831025: Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix issue found by unit testing on a slow machine. Created 9 years, 8 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
« net/proxy/dhcp_proxy_script_fetcher_win.cc ('K') | « net/proxy/proxy_script_fetcher_impl.cc ('k') | net/proxy/proxy_service.h » ('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 56cccb1db8daadaa7c1a2fa417864b9fc13ac4e9..97c29bad473cf2140689f46b159f97ef17d4330d 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -102,8 +102,8 @@ TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
{ // Fetch a non-existent file.
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(GetTestFileUrl("does-not-exist"),
- &text, &callback);
+ pac_fetcher.SetURL(GetTestFileUrl("does-not-exist"));
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_FILE_NOT_FOUND, callback.WaitForResult());
EXPECT_TRUE(text.empty());
@@ -111,8 +111,8 @@ TEST_F(ProxyScriptFetcherImplTest, FileUrl) {
{ // Fetch a file that exists.
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(GetTestFileUrl("pac.txt"),
- &text, &callback);
+ pac_fetcher.SetURL(GetTestFileUrl("pac.txt"));
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
@@ -131,7 +131,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
GURL url(test_server_.GetURL("files/pac.txt"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.txt-\n"), text);
@@ -140,7 +141,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
GURL url(test_server_.GetURL("files/pac.html"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.html-\n"), text);
@@ -149,7 +151,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpMimeType) {
GURL url(test_server_.GetURL("files/pac.nsproxy"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
@@ -166,7 +169,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
GURL url(test_server_.GetURL("files/500.pac"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
EXPECT_TRUE(text.empty());
@@ -175,7 +179,8 @@ TEST_F(ProxyScriptFetcherImplTest, HttpStatusCode) {
GURL url(test_server_.GetURL("files/404.pac"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_PAC_STATUS_NOT_OK, callback.WaitForResult());
EXPECT_TRUE(text.empty());
@@ -193,7 +198,8 @@ TEST_F(ProxyScriptFetcherImplTest, ContentDisposition) {
GURL url(test_server_.GetURL("files/downloadable.pac"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-downloadable.pac-\n"), text);
@@ -210,7 +216,8 @@ TEST_F(ProxyScriptFetcherImplTest, NoCache) {
{
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-cacheable_1hr.pac-\n"), text);
@@ -225,7 +232,8 @@ TEST_F(ProxyScriptFetcherImplTest, NoCache) {
{
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_CONNECTION_REFUSED, callback.WaitForResult());
}
@@ -252,7 +260,8 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
const GURL& url = urls[i];
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_FILE_TOO_BIG, callback.WaitForResult());
EXPECT_TRUE(text.empty());
@@ -265,7 +274,8 @@ TEST_F(ProxyScriptFetcherImplTest, TooLarge) {
GURL url(test_server_.GetURL("files/pac.nsproxy"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
@@ -287,7 +297,8 @@ TEST_F(ProxyScriptFetcherImplTest, Hang) {
{ GURL url(test_server_.GetURL("slow/proxy.pac?1.2"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(ERR_TIMED_OUT, callback.WaitForResult());
EXPECT_TRUE(text.empty());
@@ -300,7 +311,8 @@ TEST_F(ProxyScriptFetcherImplTest, Hang) {
GURL url(test_server_.GetURL("files/pac.nsproxy"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("-pac.nsproxy-\n"), text);
@@ -321,7 +333,8 @@ TEST_F(ProxyScriptFetcherImplTest, Encodings) {
GURL url(test_server_.GetURL("files/gzipped_pac"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("This data was gzipped.\n"), text);
@@ -333,7 +346,8 @@ TEST_F(ProxyScriptFetcherImplTest, Encodings) {
GURL url(test_server_.GetURL("files/utf16be_pac"));
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_IO_PENDING, result);
EXPECT_EQ(OK, callback.WaitForResult());
EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text);
@@ -360,7 +374,8 @@ TEST_F(ProxyScriptFetcherImplTest, DataURLs) {
GURL url(kEncodedUrl);
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(OK, result);
EXPECT_EQ(ASCIIToUTF16(kPacScript), text);
}
@@ -373,7 +388,8 @@ TEST_F(ProxyScriptFetcherImplTest, DataURLs) {
GURL url(kEncodedUrlBroken);
string16 text;
TestCompletionCallback callback;
- int result = pac_fetcher.Fetch(url, &text, &callback);
+ pac_fetcher.SetURL(url);
+ int result = pac_fetcher.Fetch(&text, &callback);
EXPECT_EQ(ERR_FAILED, result);
}
}
« net/proxy/dhcp_proxy_script_fetcher_win.cc ('K') | « net/proxy/proxy_script_fetcher_impl.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698