Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/change_list_processor_unittest.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
@@ skipping 102 matching lines @@
 
     ChangeListProcessor processor(metadata_.get());
     return processor.Apply(about_resource.Pass(),
                            changes.Pass(),
                            false /* is_delta_update */);
   }
 
   // Applies the |changes| to |metadata_| as a delta update. Delta changelists
   // should contain their changestamp in themselves.
   FileError ApplyChangeList(ScopedVector<ChangeList> changes,
-                            std::set<base::FilePath>* changed_dirs) {
+                            FileChange* changed_files) {
     scoped_ptr<google_apis::AboutResource> about_resource(
         new google_apis::AboutResource);
     about_resource->set_largest_change_id(kBaseResourceListChangestamp);
     about_resource->set_root_folder_id(kRootId);
 
     ChangeListProcessor processor(metadata_.get());
     FileError error = processor.Apply(about_resource.Pass(),
                                       changes.Pass(),
                                       true /* is_delta_update */);
-    *changed_dirs = processor.changed_dirs();
+    *changed_files = processor.changed_files();
     return error;
   }
 
   // Gets the resource entry for the path from |metadata_| synchronously.
   // Returns null if the entry does not exist.
   scoped_ptr<ResourceEntry> GetResourceEntry(const std::string& path) {
     scoped_ptr<ResourceEntry> entry(new ResourceEntry);
     FileError error = metadata_->GetResourceEntryByPath(
         base::FilePath::FromUTF8Unsafe(path), entry.get());
     if (error != FILE_ERROR_OK)
@@ skipping 72 matching lines @@
   new_file.set_resource_id("document: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()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+
+  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/New Directory"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/New Directory/File in new dir.txt"));
 
-  EXPECT_EQ(2U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root")));
-  EXPECT_TRUE(changed_dirs.count(
+  EXPECT_EQ(2U, changed_files.size());
+  EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+      "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_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");
 
   change_lists[0]->set_largest_changestamp(16809);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+
+  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(16809, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 2 excludeDir-test/Directory 1"));
 
-  EXPECT_EQ(4U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
+  EXPECT_EQ(2U, changed_files.size());
+  EXPECT_TRUE(changed_files.CountDirectory(
       base::FilePath::FromUTF8Unsafe("drive/root")));
-  EXPECT_TRUE(changed_dirs.count(
+  EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe(
-          "drive/root/Directory 2 excludeDir-test")));
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe(
-          "drive/root/Directory 2 excludeDir-test/Directory 1")));
+  EXPECT_TRUE(changed_files.CountDirectory(base::FilePath::FromUTF8Unsafe(
+      "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_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()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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(16815, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry("drive/root/SubDirectory File 1.txt"));
 
-  EXPECT_EQ(2U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root")));
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+  EXPECT_EQ(2U, changed_files.size());
+  EXPECT_TRUE(changed_files.count(
+      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_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");
 
   change_lists[0]->set_largest_changestamp(16767);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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(16767, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 1/New SubDirectory File 1.txt"));
 
-  EXPECT_EQ(1U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+  EXPECT_EQ(2U, changed_files.size());
+  EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
+      "drive/root/Directory 1/SubDirectory File 1.txt")));
+  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_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()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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(16683, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Added file.txt"));
-  EXPECT_EQ(1U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root")));
+  EXPECT_EQ(1U, changed_files.size());
+  EXPECT_TRUE(changed_files.count(
+      base::FilePath::FromUTF8Unsafe("drive/root/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(kRootId);
 
   change_lists[0]->set_largest_changestamp(16687);
 
   // Apply.
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  EXPECT_EQ(FILE_ERROR_OK,
+            ApplyChangeList(change_lists.Pass(), &changed_files));
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16687, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Added file.txt"));
-  EXPECT_EQ(1U, changed_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root")));
+  EXPECT_EQ(1U, changed_files.size());
+  EXPECT_TRUE(changed_files.count(
+      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_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");
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+  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");
 
   change_lists[0]->set_largest_changestamp(16770);
 
   // Apply.
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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_dirs.size());
-  EXPECT_TRUE(changed_dirs.count(
-      base::FilePath::FromUTF8Unsafe("drive/root/Directory 1")));
+  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);
 
@@ skipping 10 matching lines @@
   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()));
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  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_FALSE(GetResourceEntry("drive/root/New Directory/new_pdf_file.pdf"));
 
-  EXPECT_TRUE(changed_dirs.empty());
+  EXPECT_TRUE(changed_files.empty());
 }
 
 TEST_F(ChangeListProcessorTest, RefreshDirectory) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   // Create change list.
   scoped_ptr<ChangeList> change_list(new ChangeList);
 
   // Add a new file to the change list.
@@ skipping 75 matching lines @@
   change_lists.push_back(new ChangeList);
 
   // Add a new file with non-existing parent resource id to the change lists.
   ResourceEntry new_file;
   new_file.set_title("new_file");
   new_file.set_resource_id("new_file_id");
   change_lists[0]->mutable_entries()->push_back(new_file);
   change_lists[0]->mutable_parent_resource_ids()->push_back("nonexisting");
   change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp + 1);
 
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  FileChange changed_files;
+  EXPECT_EQ(FILE_ERROR_OK,
+            ApplyChangeList(change_lists.Pass(), &changed_files));
 
   // "new_file" should be added under drive/other.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveGrandRootPath().AppendASCII("other/new_file"), &entry));
 }
 
 TEST_F(ChangeListProcessorTest, ModificationDate) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
@@ skipping 22 matching lines @@
   new_file_local.set_resource_id(new_file_remote.resource_id());
   new_file_local.set_parent_local_id(root.local_id());
   new_file_local.set_title("new_file_local");
   new_file_local.set_metadata_edit_state(ResourceEntry::DIRTY);
   new_file_local.set_modification_date(
       (now + base::TimeDelta::FromSeconds(1)).ToInternalValue());
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->AddEntry(new_file_local, &local_id));
 
   // Apply the change.
-  std::set<base::FilePath> changed_dirs;
-  EXPECT_EQ(FILE_ERROR_OK, ApplyChangeList(change_lists.Pass(), &changed_dirs));
+  FileChange changed_files;
+  EXPECT_EQ(FILE_ERROR_OK,
+            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