Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/change_list_loader_unittest.cc

 // Copyright 2013 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_loader.h"
 
 #include "base/callback_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.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/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_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"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
 namespace internal {
 
 class TestChangeListLoaderObserver : public ChangeListLoaderObserver {
  public:
   explicit TestChangeListLoaderObserver(ChangeListLoader* loader)
       : loader_(loader),
         load_from_server_complete_count_(0),
         initial_load_complete_count_(0) {
     loader_->AddObserver(this);
   }
 
   virtual ~TestChangeListLoaderObserver() {
     loader_->RemoveObserver(this);
   }
 
-  const std::set<base::FilePath>& changed_directories() const {
-    return changed_directories_;
-  }
-  void clear_changed_directories() { changed_directories_.clear(); }
+  const FileChange& changed_files() const { return changed_files_; }
+  void clear_changed_files() { changed_files_.ClearForTest(); }
 
   int load_from_server_complete_count() const {
     return load_from_server_complete_count_;
   }
   int initial_load_complete_count() const {
     return initial_load_complete_count_;
   }
 
   // ChageListObserver overrides:
-  virtual void OnDirectoryChanged(
-      const base::FilePath& directory_path) OVERRIDE {
-    changed_directories_.insert(directory_path);
+  virtual void OnDirectoryChanged(const FileChange& changed_files) OVERRIDE {
+    changed_files_.Apply(changed_files);
   }
   virtual void OnLoadFromServerComplete() OVERRIDE {
     ++load_from_server_complete_count_;
   }
   virtual void OnInitialLoadComplete() OVERRIDE {
     ++initial_load_complete_count_;
   }
 
  private:
   ChangeListLoader* loader_;
-  std::set<base::FilePath> changed_directories_;
+  FileChange changed_files_;
   int load_from_server_complete_count_;
   int initial_load_complete_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeListLoaderObserver);
 };
 
 class ChangeListLoaderTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 82 matching lines @@
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   EXPECT_FALSE(change_list_loader_->IsRefreshing());
   int64 changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_LT(0, changestamp);
   EXPECT_EQ(1, drive_service_->file_list_load_count());
   EXPECT_EQ(1, drive_service_->about_resource_load_count());
   EXPECT_EQ(1, observer.initial_load_complete_count());
   EXPECT_EQ(1, observer.load_from_server_complete_count());
-  EXPECT_TRUE(observer.changed_directories().empty());
+  EXPECT_TRUE(observer.changed_files().empty());
 
   base::FilePath file_path =
       util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK,
             metadata_->GetResourceEntryByPath(file_path, &entry));
 }
 
 TEST_F(ChangeListLoaderTest, Load_LocalMetadataAvailable) {
   // Prepare metadata.
@@ skipping 30 matching lines @@
   EXPECT_EQ(previous_file_list_load_count,
             drive_service_->file_list_load_count());
   EXPECT_EQ(1, observer.initial_load_complete_count());
 
   // Update should be checked by Load().
   int64 changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(drive_service_->about_resource().largest_change_id(), changestamp);
   EXPECT_EQ(1, drive_service_->change_list_load_count());
   EXPECT_EQ(1, observer.load_from_server_complete_count());
-  EXPECT_EQ(1U, observer.changed_directories().count(
-      util::GetDriveMyDriveRootPath()));
+  EXPECT_TRUE(
+      observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
 
   base::FilePath file_path =
       util::GetDriveMyDriveRootPath().AppendASCII(gdata_entry->title());
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK,
             metadata_->GetResourceEntryByPath(file_path, &entry));
 }
 
 TEST_F(ChangeListLoaderTest, CheckForUpdates) {
   // CheckForUpdates() results in no-op before load.
@@ skipping 51 matching lines @@
   TestChangeListLoaderObserver observer(change_list_loader_.get());
   change_list_loader_->CheckForUpdates(
       google_apis::test_util::CreateCopyResultCallback(
           &check_for_updates_error));
   EXPECT_TRUE(change_list_loader_->IsRefreshing());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(change_list_loader_->IsRefreshing());
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_LT(previous_changestamp, changestamp);
   EXPECT_EQ(1, observer.load_from_server_complete_count());
-  EXPECT_EQ(1U, observer.changed_directories().count(
-      util::GetDriveMyDriveRootPath()));
+  EXPECT_TRUE(
+      observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
 
   // The new file is found in the local metadata.
   base::FilePath new_file_path =
       util::GetDriveMyDriveRootPath().AppendASCII(gdata_entry->title());
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK,
             metadata_->GetResourceEntryByPath(new_file_path, &entry));
 }
 
 TEST_F(ChangeListLoaderTest, Lock) {
@@ skipping 12 matching lines @@
 
   // Start update.
   TestChangeListLoaderObserver observer(change_list_loader_.get());
   FileError check_for_updates_error = FILE_ERROR_FAILED;
   change_list_loader_->CheckForUpdates(
       google_apis::test_util::CreateCopyResultCallback(
           &check_for_updates_error));
   base::RunLoop().RunUntilIdle();
 
   // Update is pending due to the lock.
-  EXPECT_TRUE(observer.changed_directories().empty());
+  EXPECT_TRUE(observer.changed_files().empty());
 
   // Unlock the loader, this should resume the pending udpate.
   lock.reset();
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(1U, observer.changed_directories().count(
-      util::GetDriveMyDriveRootPath()));
+  EXPECT_TRUE(
+      observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
 }
 
 }  // namespace internal
 }  // namespace drive