Revert 132149 - gdata: Remove OnDirectoryChanged from MockGDataSyncClient

chrome/browser/chromeos/gdata/gdata_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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1291 matching lines @@
   EXPECT_EQ(src_file, FindFileByResourceId(src_file_resource));
 
   EXPECT_CALL(*mock_doc_service_,
               RenameResource(src_file->self_url(),
                              FILE_PATH_LITERAL("Test.log"), _));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
                  callback_helper_.get());
 
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   EXPECT_TRUE(FindFile(src_file_path) == NULL);
 
   GDataFileBase* dest_file = NULL;
   EXPECT_TRUE((dest_file = FindFile(dest_file_path)) != NULL);
   EXPECT_EQ(dest_file, FindFileByResourceId(src_file_resource));
   EXPECT_EQ(src_file, dest_file);
@@ skipping 22 matching lines @@
               RenameResource(src_file->self_url(),
                              FILE_PATH_LITERAL("Test.log"), _));
   EXPECT_CALL(*mock_doc_service_,
               AddResourceToDirectory(dest_parent->content_url(),
                                      src_file->self_url(), _));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
                  callback_helper_.get());
 
+  // Expect notification for both source and destination directories.
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   EXPECT_TRUE(FindFile(src_file_path) == NULL);
 
   GDataFileBase* dest_file = NULL;
   EXPECT_TRUE((dest_file = FindFile(dest_file_path)) != NULL);
   EXPECT_EQ(dest_file, FindFileByResourceId(src_file_path_resource));
   EXPECT_EQ(src_file, dest_file);
@@ skipping 24 matching lines @@
                              FILE_PATH_LITERAL("Test.log"), _));
   EXPECT_CALL(*mock_doc_service_,
               RemoveResourceFromDirectory(src_parent->content_url(),
                                           src_file->self_url(),
                                           src_file_path_resource, _));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
                  callback_helper_.get());
 
+  // Expect notification for both source and destination directories.
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   EXPECT_TRUE(FindFile(src_file_path) == NULL);
 
   GDataFileBase* dest_file = NULL;
   EXPECT_TRUE((dest_file = FindFile(dest_file_path)) != NULL);
   EXPECT_EQ(dest_file, FindFileByResourceId(src_file_path_resource));
   EXPECT_EQ(src_file, dest_file);
 }
 
 TEST_F(GDataFileSystemTest, MoveFileBetweenSubDirectories) {
   FilePath src_parent_path(FILE_PATH_LITERAL("gdata/Directory 1"));
   FilePath src_file_path(
       FILE_PATH_LITERAL("gdata/Directory 1/SubDirectory File 1.txt"));
   FilePath dest_parent_path(FILE_PATH_LITERAL("gdata/New Folder 1"));
   FilePath dest_file_path(FILE_PATH_LITERAL("gdata/New Folder 1/Test.log"));
   FilePath interim_file_path(FILE_PATH_LITERAL("gdata/Test.log"));
 
   LoadRootFeedDocument("root_feed.json");
 
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+
   AddDirectoryFromFile(dest_parent_path, "directory_entry_atom.json");
 
   GDataFileBase* src_file = NULL;
   EXPECT_TRUE((src_file = FindFile(src_file_path)) != NULL);
   EXPECT_TRUE(src_file->AsGDataFile() != NULL);
   std::string src_file_path_resource = src_file->AsGDataFile()->resource_id();
   EXPECT_EQ(src_file, FindFileByResourceId(src_file_path_resource));
   EXPECT_FALSE(src_file->self_url().is_empty());
 
   GDataFileBase* src_parent = NULL;
@@ skipping 16 matching lines @@
                                           src_file->self_url(),
                                           src_file_path_resource, _));
   EXPECT_CALL(*mock_doc_service_,
               AddResourceToDirectory(dest_parent->content_url(),
                                      src_file->self_url(), _));
 
   FileOperationCallback callback =
       base::Bind(&CallbackHelper::FileOperationCallback,
                  callback_helper_.get());
 
+  // Expect notification for both source and destination directories plus
+  // interim file path.
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/Directory 1"))))).Times(1);
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/New Folder 1"))))).Times(1);
+
   file_system_->Move(src_file_path, dest_file_path, callback);
   message_loop_.RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_OK, callback_helper_->last_error_);
 
   EXPECT_TRUE(FindFile(src_file_path) == NULL);
   EXPECT_TRUE(FindFile(interim_file_path) == NULL);
 
   GDataFileBase* dest_file = NULL;
   EXPECT_TRUE((dest_file = FindFile(dest_file_path)) != NULL);
   EXPECT_EQ(dest_file, FindFileByResourceId(src_file_path_resource));
@@ skipping 106 matching lines @@
   std::string file_in_root_resource = file->AsGDataFile()->resource_id();
   EXPECT_EQ(file, FindFileByResourceId(file_in_root_resource));
 
   EXPECT_TRUE(FindFile(dir_in_root) != NULL);
 
   EXPECT_TRUE((file = FindFile(file_in_subdir)) != NULL);
   EXPECT_TRUE(file->AsGDataFile() != NULL);
   std::string file_in_subdir_resource = file->AsGDataFile()->resource_id();
   EXPECT_EQ(file, FindFileByResourceId(file_in_subdir_resource));
 
+  // Once for file in root and once for file...
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(2);
+
   // Remove first file in root.
   EXPECT_TRUE(RemoveFile(file_in_root));
   EXPECT_TRUE(FindFile(file_in_root) == NULL);
   EXPECT_EQ(NULL, FindFileByResourceId(file_in_root_resource));
   EXPECT_TRUE(FindFile(dir_in_root) != NULL);
   EXPECT_TRUE((file = FindFile(file_in_subdir)) != NULL);
   EXPECT_EQ(file, FindFileByResourceId(file_in_subdir_resource));
 
   // Remove directory.
   EXPECT_TRUE(RemoveFile(dir_in_root));
@@ skipping 12 matching lines @@
   // Try removing root file element.
   EXPECT_FALSE(RemoveFile(FilePath(FILE_PATH_LITERAL("gdata"))));
 
   // Need this to ensure OnDirectoryChanged() is run.
   RunAllPendingForIO();
 }
 
 TEST_F(GDataFileSystemTest, CreateDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata"))))).Times(1);
+
   // Create directory in root.
   FilePath dir_path(FILE_PATH_LITERAL("gdata/New Folder 1"));
   EXPECT_TRUE(FindFile(dir_path) == NULL);
   AddDirectoryFromFile(dir_path, "directory_entry_atom.json");
   EXPECT_TRUE(FindFile(dir_path) != NULL);
 
+  EXPECT_CALL(*mock_sync_client_, OnDirectoryChanged(
+      Eq(FilePath(FILE_PATH_LITERAL("gdata/New Folder 1"))))).Times(1);
+
   // Create directory in a sub dirrectory.
   FilePath subdir_path(FILE_PATH_LITERAL("gdata/New Folder 1/New Folder 2"));
   EXPECT_TRUE(FindFile(subdir_path) == NULL);
   AddDirectoryFromFile(subdir_path, "directory_entry_atom.json");
   EXPECT_TRUE(FindFile(subdir_path) != NULL);
 }
 
 TEST_F(GDataFileSystemTest, FindFirstMissingParentDirectory) {
   LoadRootFeedDocument("root_feed.json");
 
@@ skipping 1181 matching lines @@
 
   // Verify account meta feed is saved to cache.
   RunAllPendingForIO();
   FilePath path = file_system_->cache_paths_[
       GDataRootDirectory::CACHE_TYPE_META].Append(
           FILE_PATH_LITERAL("account_metadata.json"));
   EXPECT_TRUE(file_util::PathExists(path));
 }
 
 }   // namespace gdata