Commit 6b0a1859 authored by satorux's avatar satorux Committed by Commit bot

Move chrome/test/data/gdata/testfile.txt to chrome/test/data/drive

chrome/test/data/gdata will be removed once WAPI code is removed,
hence google_apis/drive/drive_api_requests_unittest.cc should stop
using chrome/test/data/gdata/testfile.txt

BUG=412238
TEST=no change to production binary.
     google_apis_unittests should pass as before

Review URL: https://codereview.chromium.org/548343004

Cr-Commit-Position: refs/heads/master@{#294121}
parent 82d00f0d
...@@ -81,7 +81,7 @@ TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) { ...@@ -81,7 +81,7 @@ TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) {
test_util::CreateCopyResultCallback(&result_code, &temp_file)), test_util::CreateCopyResultCallback(&result_code, &temp_file)),
GetContentCallback(), GetContentCallback(),
ProgressCallback(), ProgressCallback(),
test_server_.GetURL("/files/gdata/testfile.txt"), test_server_.GetURL("/files/drive/testfile.txt"),
GetTestCachedFilePath( GetTestCachedFilePath(
base::FilePath::FromUTF8Unsafe("cached_testfile.txt"))); base::FilePath::FromUTF8Unsafe("cached_testfile.txt")));
request_sender_->StartRequestWithRetry(request); request_sender_->StartRequestWithRetry(request);
...@@ -94,10 +94,10 @@ TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) { ...@@ -94,10 +94,10 @@ TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) {
EXPECT_EQ(HTTP_SUCCESS, result_code); EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method); EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
EXPECT_EQ("/files/gdata/testfile.txt", http_request_.relative_url); EXPECT_EQ("/files/drive/testfile.txt", http_request_.relative_url);
const base::FilePath expected_path = const base::FilePath expected_path =
test_util::GetTestFilePath("gdata/testfile.txt"); test_util::GetTestFilePath("drive/testfile.txt");
std::string expected_contents; std::string expected_contents;
base::ReadFileToString(expected_path, &expected_contents); base::ReadFileToString(expected_path, &expected_contents);
EXPECT_EQ(expected_contents, contents); EXPECT_EQ(expected_contents, contents);
......
...@@ -569,7 +569,7 @@ TEST_F(DriveApiRequestsTest, AboutGetRequest_ValidJson) { ...@@ -569,7 +569,7 @@ TEST_F(DriveApiRequestsTest, AboutGetRequest_ValidJson) {
TEST_F(DriveApiRequestsTest, AboutGetRequest_InvalidJson) { TEST_F(DriveApiRequestsTest, AboutGetRequest_InvalidJson) {
// Set an expected data file containing invalid result. // Set an expected data file containing invalid result.
expected_data_file_path_ = test_util::GetTestFilePath( expected_data_file_path_ = test_util::GetTestFilePath(
"gdata/testfile.txt"); "drive/testfile.txt");
GDataErrorCode error = GDATA_OTHER_ERROR; GDataErrorCode error = GDATA_OTHER_ERROR;
scoped_ptr<AboutResource> about_resource; scoped_ptr<AboutResource> about_resource;
......
...@@ -74,7 +74,7 @@ class GDataWapiRequestsTest : public testing::Test { ...@@ -74,7 +74,7 @@ class GDataWapiRequestsTest : public testing::Test {
request.content.find("<docs:authorizedApp>") != std::string::npos) { request.content.find("<docs:authorizedApp>") != std::string::npos) {
scoped_ptr<net::test_server::BasicHttpResponse> result( scoped_ptr<net::test_server::BasicHttpResponse> result(
test_util::CreateHttpResponseFromFile( test_util::CreateHttpResponseFromFile(
test_util::GetTestFilePath("gdata/testfile.txt"))); test_util::GetTestFilePath("drive/testfile.txt")));
return result.PassAs<net::test_server::HttpResponse>(); return result.PassAs<net::test_server::HttpResponse>();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment