Drop prefixes from test data resource IDs

chrome/browser/chromeos/drive/job_scheduler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 341 matching lines @@
   ASSERT_TRUE(file_list);
 }
 
 TEST_F(JobSchedulerTest, GetFileResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
 
   scheduler_->GetFileResource(
-      "file:2_file_resource_id",  // resource ID
+      "2_file_resource_id",  // resource ID
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(JobSchedulerTest, GetShareUrl) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   GURL share_url;
 
   scheduler_->GetShareUrl(
-      "file:2_file_resource_id",  // resource ID
+      "2_file_resource_id",  // resource ID
       GURL("chrome-extension://test-id/"), // embed origin
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &share_url));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_FALSE(share_url.is_empty());
 }
 
 TEST_F(JobSchedulerTest, TrashResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   scheduler_->TrashResource(
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
 }
 
 TEST_F(JobSchedulerTest, CopyResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
 
   scheduler_->CopyResource(
-      "file:2_file_resource_id",  // resource ID
-      "folder:1_folder_resource_id",  // parent resource ID
+      "2_file_resource_id",  // resource ID
+      "1_folder_resource_id",  // parent resource ID
       "New Document",  // new title
       base::Time(),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(JobSchedulerTest, UpdateResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
 
   scheduler_->UpdateResource(
-      "file:2_file_resource_id",  // resource ID
-      "folder:1_folder_resource_id",  // parent resource ID
+      "2_file_resource_id",  // resource ID
+      "1_folder_resource_id",  // parent resource ID
       "New Document",  // new title
       base::Time(),
       base::Time(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(JobSchedulerTest, RenameResource) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   scheduler_->RenameResource(
-      "file:2_file_resource_id",
+      "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();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   scheduler_->AddResourceToDirectory(
-      "folder:1_folder_resource_id",
-      "file:2_file_resource_id",
+      "1_folder_resource_id",
+      "2_file_resource_id",
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
 }
 
 TEST_F(JobSchedulerTest, RemoveResourceFromDirectory) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   scheduler_->RemoveResourceFromDirectory(
-      "folder:1_folder_resource_id",
-      "file:subdirectory_file_1_id",  // resource ID
+      "1_folder_resource_id",
+      "subdirectory_file_1_id",  // resource ID
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_NO_CONTENT, error);
 }
 
 TEST_F(JobSchedulerTest, AddNewDirectory) {
   ConnectToWifi();
 
@@ skipping 11 matching lines @@
   ASSERT_EQ(google_apis::HTTP_CREATED, error);
   ASSERT_TRUE(entry);
 }
 
 TEST_F(JobSchedulerTest, PriorityHandling) {
   // Saturate the metadata job queue with uninteresting jobs to prevent
   // following jobs from starting.
   google_apis::GDataErrorCode error_dontcare = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry_dontcare;
   for (int i = 0; i < GetMetadataQueueMaxJobCount(); ++i) {
-    std::string resource_id("file:2_file_resource_id");
+    std::string resource_id("2_file_resource_id");
     scheduler_->GetFileResource(
         resource_id,
         ClientContext(USER_INITIATED),
         google_apis::test_util::CreateCopyResultCallback(&error_dontcare,
                                                          &entry_dontcare));
   }
 
   // Start jobs with different priorities.
   std::string title_1("new file 1");
   std::string title_2("new file 2");
@@ skipping 31 matching lines @@
   ASSERT_EQ(4ul, titles.size());
   EXPECT_EQ(title_1, titles[0]);
   EXPECT_EQ(title_4, titles[1]);
   EXPECT_EQ(title_2, titles[2]);
   EXPECT_EQ(title_3, titles[3]);
 }
 
 TEST_F(JobSchedulerTest, NoConnectionUserInitiated) {
   ConnectToNone();
 
-  std::string resource_id("file:2_file_resource_id");
+  std::string resource_id("2_file_resource_id");
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
   scheduler_->GetFileResource(
       resource_id,
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(google_apis::GDATA_NO_CONNECTION, error);
 }
 
 TEST_F(JobSchedulerTest, NoConnectionBackground) {
   ConnectToNone();
 
-  std::string resource_id("file:2_file_resource_id");
+  std::string resource_id("2_file_resource_id");
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::FileResource> entry;
   scheduler_->GetFileResource(
       resource_id,
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(entry);
@@ skipping 18 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
           &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AboutResource> about_resource;
 
   // Try to get the metadata
   scheduler_->GetAboutResource(
@@ skipping 32 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
           &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AboutResource> about_resource;
 
   // Try to get the metadata
   scheduler_->GetAboutResource(
@@ skipping 32 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
           &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AboutResource> about_resource;
 
   // Try to get the metadata
   scheduler_->GetAboutResource(
@@ skipping 24 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   const base::FilePath kOutputFilePath =
       temp_dir.path().AppendASCII("whatever.txt");
   google_apis::GDataErrorCode download_error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath output_file_path;
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       kOutputFilePath,
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(
           &download_error, &output_file_path),
       google_apis::GetContentCallback());
   // Metadata should still work
   google_apis::GDataErrorCode metadata_error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::AboutResource> about_resource;
 
   // Try to get the metadata
   scheduler_->GetAboutResource(
@@ skipping 38 matching lines @@
       "New Directory",
       DriveServiceInterface::AddNewDirectoryOptions(),
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
   expected_types.insert(TYPE_GET_ABOUT_RESOURCE);
   scheduler_->GetAboutResource(
       google_apis::test_util::CreateCopyResultCallback(
           &error, &about_resource));
   expected_types.insert(TYPE_RENAME_RESOURCE);
   scheduler_->RenameResource(
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       "New Title",
       google_apis::test_util::CreateCopyResultCallback(&error));
   expected_types.insert(TYPE_DOWNLOAD_FILE);
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       temp_dir.path().AppendASCII("whatever.txt"),
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error, &path),
       google_apis::GetContentCallback());
 
   // The number of jobs queued so far.
   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_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_DOWNLOAD_FILE));
 
   // Add more jobs.
   expected_types.insert(TYPE_ADD_RESOURCE_TO_DIRECTORY);
   scheduler_->AddResourceToDirectory(
-      "folder:1_folder_resource_id",
-      "file:2_file_resource_id",
+      "1_folder_resource_id",
+      "2_file_resource_id",
       google_apis::test_util::CreateCopyResultCallback(&error));
   expected_types.insert(TYPE_COPY_RESOURCE);
   scheduler_->CopyResource(
-      "document:5_document_resource_id",
+      "5_document_resource_id",
       fake_drive_service_->GetRootResourceId(),
       "New Document",
       base::Time(),  // last_modified
       google_apis::test_util::CreateCopyResultCallback(&error, &entry));
 
   // 6 jobs in total were queued.
   std::vector<JobInfo> jobs = scheduler_->GetJobInfoList();
   EXPECT_EQ(6U, jobs.size());
   std::set<JobType> actual_types;
   std::set<JobID> job_ids;
@@ skipping 52 matching lines @@
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   base::FilePath path;
 
   // Download job.
   scheduler_->DownloadFile(
       base::FilePath::FromUTF8Unsafe("drive/whatever.txt"),  // virtual path
       kDummyDownloadFileSize,
       temp_dir.path().AppendASCII("whatever.txt"),
-      "file:2_file_resource_id",
+      "2_file_resource_id",
       ClientContext(BACKGROUND),
       google_apis::test_util::CreateCopyResultCallback(&error, &path),
       google_apis::GetContentCallback());
   base::RunLoop().RunUntilIdle();
 
   std::vector<int64> download_progress;
   logger.GetProgressInfo(TYPE_DOWNLOAD_FILE, &download_progress);
   ASSERT_TRUE(!download_progress.empty());
   EXPECT_TRUE(base::STLIsSorted(download_progress));
   EXPECT_GE(download_progress.front(), 0);
@@ skipping 121 matching lines @@
   scheduler_->CancelJob(first_job_id);
 
   // Only the first job should be cancelled.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(google_apis::GDATA_CANCELLED, error1);
   EXPECT_EQ(google_apis::HTTP_SUCCESS, error2);
   EXPECT_TRUE(scheduler_->GetJobInfoList().empty());
 }
 
 }  // namespace drive