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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_fetcher_impl_unittest.cc

Issue 12210088: Make the TestServer use an absolute document root path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testserver uses absolute docroot path Created 7 years, 10 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/test/remote_test_server.h ('K') | « net/test/remote_test_server.cc ('k') | net/url_request/url_request_context_builder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_fetcher_impl_unittest.cc
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index d49d2c37735955cf1350b1f76214e1ff4f48d01a..3d143bcdafdb9092924f1bb1de42bfd041e89f63 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -41,8 +41,6 @@ using base::TimeDelta;
namespace {
// TODO(akalin): Move all the test data to somewhere under net/.
-const base::FilePath::CharType kDocRoot[] =
- FILE_PATH_LITERAL("chrome/test/data");
const char kTestServerFilePrefix[] = "files/";
class ThrottlingTestURLRequestContext : public TestURLRequestContext {
@@ -202,7 +200,7 @@ void URLFetcherMockDnsTest::SetUp() {
test_server_.reset(new TestServer(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot)));
+ TestServer::GetTestDataPath()));
ASSERT_TRUE(test_server_->Start());
// test_server_.GetURL() returns a URL with 127.0.0.1 (kLocalhost), that is
@@ -878,7 +876,7 @@ void URLFetcherFileTest::OnURLFetchComplete(const URLFetcher* source) {
TEST_F(URLFetcherTest, SameThreadsTest) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Create the fetcher on the main thread. Since IO will happen on the main
@@ -892,7 +890,7 @@ TEST_F(URLFetcherTest, SameThreadsTest) {
TEST_F(URLFetcherTest, DifferentThreadsTest) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Create a separate thread that will create the URLFetcher. The current
@@ -921,7 +919,7 @@ void CancelAllOnIO() {
TEST_F(URLFetcherTest, CancelAll) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
EXPECT_EQ(0, GetNumFetcherCores());
@@ -1046,7 +1044,7 @@ TEST_F(URLFetcherMockDnsTest, RetryOnNetworkChangedAndSucceed) {
TEST_F(URLFetcherPostTest, Basic) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("echo"));
@@ -1056,7 +1054,7 @@ TEST_F(URLFetcherPostTest, Basic) {
TEST_F(URLFetcherPostFileTest, Basic) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("echo"));
@@ -1066,7 +1064,7 @@ TEST_F(URLFetcherPostFileTest, Basic) {
TEST_F(URLFetcherEmptyPostTest, Basic) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("echo"));
@@ -1076,7 +1074,7 @@ TEST_F(URLFetcherEmptyPostTest, Basic) {
TEST_F(URLFetcherUploadProgressTest, Basic) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("echo"));
@@ -1086,7 +1084,7 @@ TEST_F(URLFetcherUploadProgressTest, Basic) {
TEST_F(URLFetcherDownloadProgressTest, Basic) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Get a file large enough to require more than one read into
@@ -1107,7 +1105,7 @@ TEST_F(URLFetcherDownloadProgressTest, Basic) {
TEST_F(URLFetcherDownloadProgressCancelTest, CancelWhileProgressReport) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Get a file large enough to require more than one read into
@@ -1123,7 +1121,8 @@ TEST_F(URLFetcherHeadersTest, Headers) {
TestServer test_server(
TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
+ TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))));
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("files/with-headers.html"));
@@ -1135,7 +1134,8 @@ TEST_F(URLFetcherSocketAddressTest, SocketAddress) {
TestServer test_server(
TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest")));
+ TestServer::GetSourceRelativePath(
+ base::FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))));
ASSERT_TRUE(test_server.Start());
expected_port_ = test_server.host_port_pair().port();
@@ -1148,7 +1148,7 @@ TEST_F(URLFetcherSocketAddressTest, SocketAddress) {
TEST_F(URLFetcherStopOnRedirectTest, StopOnRedirect) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(
@@ -1160,7 +1160,7 @@ TEST_F(URLFetcherStopOnRedirectTest, StopOnRedirect) {
TEST_F(URLFetcherProtectTest, Overload) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL url(test_server.GetURL("defaultresponse"));
@@ -1181,7 +1181,7 @@ TEST_F(URLFetcherProtectTest, Overload) {
TEST_F(URLFetcherProtectTest, ServerUnavailable) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL url(test_server.GetURL("files/server-unavailable.html"));
@@ -1204,7 +1204,7 @@ TEST_F(URLFetcherProtectTest, ServerUnavailable) {
TEST_F(URLFetcherProtectTestPassedThrough, ServerUnavailablePropagateResponse) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL url(test_server.GetURL("files/server-unavailable.html"));
@@ -1231,7 +1231,7 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) {
TestServer::SSLOptions::CERT_EXPIRED);
TestServer test_server(TestServer::TYPE_HTTPS,
ssl_options,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
CreateFetcher(test_server.GetURL("defaultresponse"));
@@ -1241,7 +1241,7 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) {
TEST_F(URLFetcherCancelTest, ReleasesContext) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL url(test_server.GetURL("files/server-unavailable.html"));
@@ -1264,7 +1264,7 @@ TEST_F(URLFetcherCancelTest, ReleasesContext) {
TEST_F(URLFetcherCancelTest, CancelWhileDelayedStartTaskPending) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
GURL url(test_server.GetURL("files/server-unavailable.html"));
@@ -1296,7 +1296,7 @@ TEST_F(URLFetcherCancelTest, CancelWhileDelayedStartTaskPending) {
TEST_F(URLFetcherMultipleAttemptTest, SameData) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Create the fetcher on the main thread. Since IO will happen on the main
@@ -1310,7 +1310,7 @@ TEST_F(URLFetcherMultipleAttemptTest, SameData) {
TEST_F(URLFetcherFileTest, SmallGet) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
base::ScopedTempDir temp_dir;
@@ -1332,7 +1332,7 @@ TEST_F(URLFetcherFileTest, SmallGet) {
TEST_F(URLFetcherFileTest, LargeGet) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
base::ScopedTempDir temp_dir;
@@ -1352,7 +1352,7 @@ TEST_F(URLFetcherFileTest, LargeGet) {
TEST_F(URLFetcherFileTest, CanTakeOwnershipOfFile) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
base::ScopedTempDir temp_dir;
@@ -1376,7 +1376,7 @@ TEST_F(URLFetcherFileTest, CanTakeOwnershipOfFile) {
TEST_F(URLFetcherFileTest, OverwriteExistingFile) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
base::ScopedTempDir temp_dir;
@@ -1403,7 +1403,7 @@ TEST_F(URLFetcherFileTest, OverwriteExistingFile) {
TEST_F(URLFetcherFileTest, TryToOverwriteDirectory) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
base::ScopedTempDir temp_dir;
@@ -1430,7 +1430,7 @@ TEST_F(URLFetcherFileTest, TryToOverwriteDirectory) {
TEST_F(URLFetcherFileTest, SmallGetToTempFile) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Get a small file.
@@ -1448,7 +1448,7 @@ TEST_F(URLFetcherFileTest, SmallGetToTempFile) {
TEST_F(URLFetcherFileTest, LargeGetToTempFile) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Get a file large enough to require more than one read into
@@ -1464,7 +1464,7 @@ TEST_F(URLFetcherFileTest, LargeGetToTempFile) {
TEST_F(URLFetcherFileTest, CanTakeOwnershipOfTempFile) {
TestServer test_server(TestServer::TYPE_HTTP,
TestServer::kLocalhost,
- base::FilePath(kDocRoot));
+ TestServer::GetTestDataPath());
ASSERT_TRUE(test_server.Start());
// Get a small file.
« net/test/remote_test_server.h ('K') | « net/test/remote_test_server.cc ('k') | net/url_request/url_request_context_builder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698