Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/file_system_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/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.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_change.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/drive/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 27 matching lines @@
  public:
   MockDirectoryChangeObserver() {}
   virtual ~MockDirectoryChangeObserver() {}
 
   // FileSystemObserver overrides.
   virtual void OnDirectoryChanged(
       const base::FilePath& directory_path) OVERRIDE {
     changed_directories_.push_back(directory_path);
   }
 
+  virtual void OnFileChanged(const FileChange& new_file_change) OVERRIDE {
+    changed_files_.Apply(new_file_change);
+  }
+
   const std::vector<base::FilePath>& changed_directories() const {
     return changed_directories_;
   }
 
+  const FileChange& changed_files() const { return changed_files_; }
+
  private:
   std::vector<base::FilePath> changed_directories_;
+  FileChange changed_files_;
   DISALLOW_COPY_AND_ASSIGN(MockDirectoryChangeObserver);
 };
 
 }  // namespace
 
 class FileSystemTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     pref_service_.reset(new TestingPrefServiceSimple);
@@ skipping 614 matching lines @@
   // To test it, call CheckForUpdates and verify it does try to check
   // updates, which will cause directory changes.
   fake_drive_service_->set_offline(false);
 
   file_system_->CheckForUpdates();
 
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(1, fake_drive_service_->about_resource_load_count());
   EXPECT_EQ(1, fake_drive_service_->change_list_load_count());
 
-  ASSERT_LE(1u, mock_directory_observer_->changed_directories().size());
+  ASSERT_LE(0u, mock_directory_observer_->changed_directories().size());
+  ASSERT_LE(1u, mock_directory_observer_->changed_files().size());
 }
 
 TEST_F(FileSystemTest, ReadDirectoryWhileRefreshing) {
   // Use old timestamp so the fast fetch will be performed.
   ASSERT_NO_FATAL_FAILURE(SetUpTestFileSystem(USE_OLD_TIMESTAMP));
 
   // The list of resources in "drive/root/Dir1" should be fetched.
   EXPECT_TRUE(ReadDirectorySync(base::FilePath(
       FILE_PATH_LITERAL("drive/root/Dir1"))));
   EXPECT_EQ(1, fake_drive_service_->directory_load_count());
@@ skipping 78 matching lines @@
   file_system_->Unpin(file_path,
                       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   entry = GetResourceEntrySync(file_path);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().cache_state().is_pinned());
 
   // Pinned file gets synced and it results in entry state changes.
-  ASSERT_EQ(1u, mock_directory_observer_->changed_directories().size());
-  EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("drive/root")),
-            mock_directory_observer_->changed_directories()[0]);
+  ASSERT_EQ(0u, mock_directory_observer_->changed_directories().size());
+  ASSERT_EQ(1u, mock_directory_observer_->changed_files().size());
+  EXPECT_EQ(1u,
+            mock_directory_observer_->changed_files().CountDirectory(
+                base::FilePath(FILE_PATH_LITERAL("drive/root"))));
 }
 
 TEST_F(FileSystemTest, PinAndUnpin_NotSynced) {
   ASSERT_TRUE(LoadFullResourceList());
 
   base::FilePath file_path(FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   // Get the file info.
   scoped_ptr<ResourceEntry> entry(GetResourceEntrySync(file_path));
   ASSERT_TRUE(entry);
@@ skipping 85 matching lines @@
       kEmbedOrigin,
       google_apis::test_util::CreateCopyResultCallback(&error, &share_url));
   test_util::RunBlockingPoolTask();
 
   // Verify the share url to the sharing dialog.
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_TRUE(share_url.is_valid());
 }
 
 }   // namespace drive