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

Unified Diff: chrome/browser/chromeos/drive/job_scheduler_unittest.cc

Issue 449763002: Remove DriveServiceInterface::RenameResource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « chrome/browser/chromeos/drive/job_scheduler.cc ('k') | chrome/browser/drive/drive_api_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/job_scheduler_unittest.cc
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index 4bff5d0c72d09d6960ec85a65460178ff4f1f570..bcda3f5cf5ea3c2ef6b250eeb65e1c694db12066 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -437,20 +437,6 @@ TEST_F(JobSchedulerTest, UpdateResource) {
ASSERT_TRUE(entry);
}
-TEST_F(JobSchedulerTest, RenameResource) {
- ConnectToWifi();
-
- google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-
- scheduler_->RenameResource(
- "2_file_resource_id",
- "New Title",
- google_apis::test_util::CreateCopyResultCallback(&error));
- base::RunLoop().RunUntilIdle();
-
- ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-}
-
TEST_F(JobSchedulerTest, AddResourceToDirectory) {
ConnectToWifi();
@@ -819,11 +805,15 @@ TEST_F(JobSchedulerTest, JobInfo) {
scheduler_->GetAboutResource(
google_apis::test_util::CreateCopyResultCallback(
&error, &about_resource));
- expected_types.insert(TYPE_RENAME_RESOURCE);
- scheduler_->RenameResource(
+ expected_types.insert(TYPE_UPDATE_RESOURCE);
+ scheduler_->UpdateResource(
"2_file_resource_id",
+ std::string(),
"New Title",
- google_apis::test_util::CreateCopyResultCallback(&error));
+ base::Time(),
+ base::Time(),
+ ClientContext(USER_INITIATED),
+ google_apis::test_util::CreateCopyResultCallback(&error, &entry));
expected_types.insert(TYPE_DOWNLOAD_FILE);
scheduler_->DownloadFile(
base::FilePath::FromUTF8Unsafe("drive/whatever.txt"), // virtual path
@@ -838,11 +828,11 @@ TEST_F(JobSchedulerTest, JobInfo) {
EXPECT_EQ(4U, scheduler_->GetJobInfoList().size());
EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_ADD_NEW_DIRECTORY));
EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_GET_ABOUT_RESOURCE));
- EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_RENAME_RESOURCE));
+ EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_UPDATE_RESOURCE));
EXPECT_TRUE(logger.Has(JobListLogger::ADDED, TYPE_DOWNLOAD_FILE));
EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_ADD_NEW_DIRECTORY));
EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_GET_ABOUT_RESOURCE));
- EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_RENAME_RESOURCE));
+ EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_UPDATE_RESOURCE));
EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_DOWNLOAD_FILE));
// Add more jobs.
@@ -886,7 +876,7 @@ TEST_F(JobSchedulerTest, JobInfo) {
EXPECT_TRUE(logger.Has(JobListLogger::UPDATED, TYPE_ADD_NEW_DIRECTORY));
EXPECT_TRUE(logger.Has(JobListLogger::UPDATED, TYPE_GET_ABOUT_RESOURCE));
- EXPECT_TRUE(logger.Has(JobListLogger::UPDATED, TYPE_RENAME_RESOURCE));
+ EXPECT_TRUE(logger.Has(JobListLogger::UPDATED, TYPE_UPDATE_RESOURCE));
EXPECT_TRUE(logger.Has(JobListLogger::UPDATED,
TYPE_ADD_RESOURCE_TO_DIRECTORY));
EXPECT_TRUE(logger.Has(JobListLogger::UPDATED, TYPE_COPY_RESOURCE));
@@ -894,7 +884,7 @@ TEST_F(JobSchedulerTest, JobInfo) {
EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_ADD_NEW_DIRECTORY));
EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_GET_ABOUT_RESOURCE));
- EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_RENAME_RESOURCE));
+ EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_UPDATE_RESOURCE));
EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_ADD_RESOURCE_TO_DIRECTORY));
EXPECT_TRUE(logger.Has(JobListLogger::DONE, TYPE_COPY_RESOURCE));
EXPECT_FALSE(logger.Has(JobListLogger::DONE, TYPE_DOWNLOAD_FILE));
« no previous file with comments | « chrome/browser/chromeos/drive/job_scheduler.cc ('k') | chrome/browser/drive/drive_api_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698