summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-20 02:25:01 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-20 02:25:01 +0000
commitbc2af34f7b605082d26ba5e724b540b93d84c8f1 (patch)
tree3891b0310f7b4323052242077728ff668b202db7 /net/proxy
parent932b32a15a691e04aa325a8b23810b81d18f1b75 (diff)
downloadchromium_src-bc2af34f7b605082d26ba5e724b540b93d84c8f1.zip
chromium_src-bc2af34f7b605082d26ba5e724b540b93d84c8f1.tar.gz
chromium_src-bc2af34f7b605082d26ba5e724b540b93d84c8f1.tar.bz2
Add a unit test to mac build.
Review URL: http://codereview.chromium.org/15090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_unittest.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc
index 73476ed..8507a86 100644
--- a/net/proxy/proxy_script_fetcher_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_unittest.cc
@@ -10,6 +10,7 @@
#include "net/base/net_util.h"
#include "net/url_request/url_request_unittest.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
// TODO(eroman):
// - Test canceling an outstanding request.
@@ -160,7 +161,9 @@ GURL GetTestFileUrl(const std::string& relpath) {
return GURL(base_url.spec() + "/" + relpath);
}
-TEST(ProxyScriptFetcherTest, FileUrl) {
+typedef PlatformTest ProxyScriptFetcherTest;
+
+TEST_F(ProxyScriptFetcherTest, FileUrl) {
SynchFetcher pac_fetcher;
{ // Fetch a non-existent file.
@@ -177,7 +180,7 @@ TEST(ProxyScriptFetcherTest, FileUrl) {
// Note that all mime types are allowed for PAC file, to be consistent
// with other browsers.
-TEST(ProxyScriptFetcherTest, HttpMimeType) {
+TEST_F(ProxyScriptFetcherTest, HttpMimeType) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -201,7 +204,7 @@ TEST(ProxyScriptFetcherTest, HttpMimeType) {
}
}
-TEST(ProxyScriptFetcherTest, HttpStatusCode) {
+TEST_F(ProxyScriptFetcherTest, HttpStatusCode) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -219,7 +222,7 @@ TEST(ProxyScriptFetcherTest, HttpStatusCode) {
}
}
-TEST(ProxyScriptFetcherTest, ContentDisposition) {
+TEST_F(ProxyScriptFetcherTest, ContentDisposition) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -231,7 +234,7 @@ TEST(ProxyScriptFetcherTest, ContentDisposition) {
EXPECT_EQ("-downloadable.pac-\n", result.bytes);
}
-TEST(ProxyScriptFetcherTest, TooLarge) {
+TEST_F(ProxyScriptFetcherTest, TooLarge) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -264,7 +267,7 @@ TEST(ProxyScriptFetcherTest, TooLarge) {
}
}
-TEST(ProxyScriptFetcherTest, Hang) {
+TEST_F(ProxyScriptFetcherTest, Hang) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;