Drop prefixes from test data resource IDs

chrome/browser/chromeos/drive/change_list_processor_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/change_list_processor.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ skipping 31 matching lines @@
 // Returns a basic change list which contains some files and directories.
 ScopedVector<ChangeList> CreateBaseChangeList() {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   // Add directories to the change list.
   ResourceEntry directory;
   directory.mutable_file_info()->set_is_directory(true);
 
   directory.set_title("Directory 1");
-  directory.set_resource_id("folder:1_folder_resource_id");
+  directory.set_resource_id("1_folder_resource_id");
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   directory.set_title("Sub Directory Folder");
-  directory.set_resource_id("folder:sub_dir_folder_resource_id");
+  directory.set_resource_id("sub_dir_folder_resource_id");
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:1_folder_resource_id");
+      "1_folder_resource_id");
 
   directory.set_title("Sub Sub Directory Folder");
-  directory.set_resource_id("folder:sub_sub_directory_folder_id");
+  directory.set_resource_id("sub_sub_directory_folder_id");
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:sub_dir_folder_resource_id");
+      "sub_dir_folder_resource_id");
 
   directory.set_title("Directory 2 excludeDir-test");
-  directory.set_resource_id("folder:sub_dir_folder_2_self_link");
+  directory.set_resource_id("sub_dir_folder_2_self_link");
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   // Add files to the change list.
   ResourceEntry file;
 
   file.set_title("File 1.txt");
-  file.set_resource_id("file:2_file_resource_id");
+  file.set_resource_id("2_file_resource_id");
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   file.set_title("SubDirectory File 1.txt");
-  file.set_resource_id("file:subdirectory_file_1_id");
+  file.set_resource_id("subdirectory_file_1_id");
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:1_folder_resource_id");
+      "1_folder_resource_id");
 
   file.set_title("Orphan File 1.txt");
-  file.set_resource_id("file:1_orphanfile_resource_id");
+  file.set_resource_id("1_orphanfile_resource_id");
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back("");
 
   change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp);
   return change_lists.Pass();
 }
 
 class ChangeListProcessorTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
@@ skipping 69 matching lines @@
 
 }  // namespace
 
 TEST_F(ChangeListProcessorTest, ApplyFullResourceList) {
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   const EntryExpectation kExpected[] = {
       // Root files
       {"drive/root", kRootId, "", DIRECTORY},
       {"drive/root/File 1.txt",
-          "file:2_file_resource_id", kRootId, FILE},
+          "2_file_resource_id", kRootId, FILE},
       // Subdirectory files
       {"drive/root/Directory 1",
-          "folder:1_folder_resource_id", kRootId, DIRECTORY},
+          "1_folder_resource_id", kRootId, DIRECTORY},
       {"drive/root/Directory 1/SubDirectory File 1.txt",
-          "file:subdirectory_file_1_id", "folder:1_folder_resource_id", FILE},
+          "subdirectory_file_1_id", "1_folder_resource_id", FILE},
       {"drive/root/Directory 2 excludeDir-test",
-          "folder:sub_dir_folder_2_self_link", kRootId, DIRECTORY},
+          "sub_dir_folder_2_self_link", kRootId, DIRECTORY},
       // Deeper
       {"drive/root/Directory 1/Sub Directory Folder",
-          "folder:sub_dir_folder_resource_id",
-          "folder:1_folder_resource_id", DIRECTORY},
+          "sub_dir_folder_resource_id",
+          "1_folder_resource_id", DIRECTORY},
       {"drive/root/Directory 1/Sub Directory Folder/Sub Sub Directory Folder",
-          "folder:sub_sub_directory_folder_id",
-          "folder:sub_dir_folder_resource_id", DIRECTORY},
+          "sub_sub_directory_folder_id",
+          "sub_dir_folder_resource_id", DIRECTORY},
       // Orphan
-      {"drive/other/Orphan File 1.txt", "file:1_orphanfile_resource_id",
+      {"drive/other/Orphan File 1.txt", "1_orphanfile_resource_id",
            "", FILE},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kExpected); ++i) {
     scoped_ptr<ResourceEntry> entry = GetResourceEntry(kExpected[i].path);
     ASSERT_TRUE(entry) << "for path: " << kExpected[i].path;
     EXPECT_EQ(kExpected[i].id, entry->resource_id());
 
     ResourceEntry parent_entry;
     EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(
         entry->parent_local_id(), &parent_entry));
     EXPECT_EQ(kExpected[i].parent_id, parent_entry.resource_id());
     EXPECT_EQ(kExpected[i].type,
               entry->file_info().is_directory() ? DIRECTORY : FILE);
   }
 
   int64 changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(kBaseResourceListChangestamp, changestamp);
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileAddedInNewDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry new_folder;
-  new_folder.set_resource_id("folder:new_folder_resource_id");
+  new_folder.set_resource_id("new_folder_resource_id");
   new_folder.set_title("New Directory");
   new_folder.mutable_file_info()->set_is_directory(true);
   change_lists[0]->mutable_entries()->push_back(new_folder);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   ResourceEntry new_file;
-  new_file.set_resource_id("document:file_added_in_new_dir_id");
+  new_file.set_resource_id("file_added_in_new_dir_id");
   new_file.set_title("File in new dir.txt");
   change_lists[0]->mutable_entries()->push_back(new_file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       new_folder.resource_id());
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
@@ skipping 13 matching lines @@
       "drive/root/New Directory/File in new dir.txt")));
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/New Directory")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaDirMovedFromRootToDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
-  entry.set_resource_id("folder:1_folder_resource_id");
+  entry.set_resource_id("1_folder_resource_id");
   entry.set_title("Directory 1");
   entry.mutable_file_info()->set_is_directory(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:sub_dir_folder_2_self_link");
+      "sub_dir_folder_2_self_link");
 
   change_lists[0]->set_largest_changestamp(16809);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
@@ skipping 13 matching lines @@
       "drive/root/Directory 2 excludeDir-test")));
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 2 excludeDir-test/Directory 1")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileMovedFromDirectoryToRoot) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
-  entry.set_resource_id("file:subdirectory_file_1_id");
+  entry.set_resource_id("subdirectory_file_1_id");
   entry.set_title("SubDirectory File 1.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16815);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
@@ skipping 11 matching lines @@
       base::FilePath::FromUTF8Unsafe("drive/root/SubDirectory File 1.txt")));
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/SubDirectory File 1.txt")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaFileRenamedInDirectory) {
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
-  entry.set_resource_id("file:subdirectory_file_1_id");
+  entry.set_resource_id("subdirectory_file_1_id");
   entry.set_title("New SubDirectory File 1.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:1_folder_resource_id");
+      "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16767);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
   int64 changestamp = 0;
@@ skipping 10 matching lines @@
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/New SubDirectory File 1.txt")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileInRoot) {
   // Create ChangeList to add a file.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
-  entry.set_resource_id("document:added_in_root_id");
+  entry.set_resource_id("added_in_root_id");
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16683);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
@@ skipping 27 matching lines @@
       base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
 }
 
 
 TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileFromExistingDirectory) {
   // Create ChangeList to add a file.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
-  entry.set_resource_id("document:added_in_root_id");
+  entry.set_resource_id("added_in_root_id");
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:1_folder_resource_id");
+      "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
   int64 changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
   entry.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:1_folder_resource_id");
+      "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16770);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK,
             ApplyChangeList(change_lists.Pass(), &changed_files));
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16770, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaAddFileToNewButDeletedDirectory) {
   // Create a change which contains the following updates:
   // 1) A new PDF file is added to a new directory
   // 2) but the new directory is marked "deleted" (i.e. moved to Trash)
   // Hence, the PDF file should be just ignored.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry file;
-  file.set_resource_id("pdf:file_added_in_deleted_id");
+  file.set_resource_id("file_added_in_deleted_id");
   file.set_title("new_pdf_file.pdf");
   file.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
-      "folder:new_folder_resource_id");
+      "new_folder_resource_id");
 
   ResourceEntry directory;
-  directory.set_resource_id("folder:new_folder_resource_id");
+  directory.set_resource_id("new_folder_resource_id");
   directory.set_title("New Directory");
   directory.mutable_file_info()->set_is_directory(true);
   directory.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
@@ skipping 152 matching lines @@
             ApplyChangeList(change_lists.Pass(), &changed_files));
 
   // The change is rejected due to the old modification date.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
   EXPECT_EQ(new_file_local.title(), entry.title());
 }
 
 }  // namespace internal
 }  // namespace drive