Add to be fetched files instead of DriveMetadataStore.batch_sync_origins_

chrome/browser/sync_file_system/drive_file_sync_service_mock_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/sync_file_system/drive_file_sync_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/sync_file_system/mock_remote_change_processor.h"
 #include "chrome/browser/sync_file_system/sync_file_system.pb.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_builder.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/id_util.h"
 #include "net/base/escape.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/syncable/sync_direction.h"
 #include "webkit/fileapi/syncable/sync_file_metadata.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
@@ skipping 29 matching lines @@
   return base::FilePath().AppendASCII(path).value();
 }
 
 void DidInitialize(bool* done, SyncStatusCode status, bool created) {
   EXPECT_FALSE(*done);
   *done = true;
   EXPECT_EQ(SYNC_STATUS_OK, status);
   EXPECT_TRUE(created);
 }
 
-void DidUpdateEntry(SyncStatusCode status) {
-  EXPECT_EQ(SYNC_STATUS_OK, status);
-}
-
 void DidGetSyncRoot(bool* done,
                     SyncStatusCode status,
                     const std::string& resource_id) {
   EXPECT_FALSE(*done);
   *done = true;
 }
 
 void ExpectEqStatus(bool* done,
                     SyncStatusCode expected,
                     SyncStatusCode actual) {
   EXPECT_FALSE(*done);
   *done = true;
   EXPECT_EQ(expected, actual);
 }
 
+void ExpectOkStatus(SyncStatusCode status) {
+  EXPECT_EQ(SYNC_STATUS_OK, status);
+}
+
 // Mocks adding an installed extension to ExtensionService.
 scoped_refptr<const extensions::Extension> AddTestExtension(
     ExtensionService* extension_service,
     const base::FilePath::StringType& extension_name) {
   std::string id = extensions::id_util::GenerateIdForPath(
       base::FilePath(extension_name));
 
   scoped_refptr<const Extension> extension =
       extensions::ExtensionBuilder().SetManifest(
           DictionaryBuilder()
@@ skipping 231 matching lines @@
     extension_service_->UnloadExtension(
         extension_id, extension_misc::UNLOAD_REASON_UNINSTALL);
   }
 
   void UpdateRegisteredOrigins() {
     sync_service_->UpdateRegisteredOrigins();
     // Wait for completion of uninstalling origin.
     message_loop()->RunUntilIdle();
   }
 
-  void VerifySizeOfRegisteredOrigins(
-      DriveMetadataStore::ResourceIdByOrigin::size_type b_size,
-      DriveMetadataStore::ResourceIdByOrigin::size_type i_size,
-      DriveMetadataStore::ResourceIdByOrigin::size_type d_size) {
-    EXPECT_EQ(b_size, metadata_store()->batch_sync_origins().size());
+  void VerifySizeOfRegisteredOrigins(size_t b_size,
+                                     size_t i_size,
+                                     size_t d_size) {
+    EXPECT_EQ(b_size, pending_batch_sync_origins()->size());
     EXPECT_EQ(i_size, metadata_store()->incremental_sync_origins().size());
     EXPECT_EQ(d_size, metadata_store()->disabled_origins().size());
   }
 
   drive::APIUtilInterface* api_util() {
     if (api_util_)
       return api_util_.get();
     return sync_service_->api_util_.get();
   }
 
@@ skipping 14 matching lines @@
   StrictMock<MockFileStatusObserver>* mock_file_status_observer() {
     return &mock_file_status_observer_;
   }
 
   StrictMock<MockRemoteChangeProcessor>* mock_remote_processor() {
     return &mock_remote_processor_;
   }
 
   MessageLoop* message_loop() { return &message_loop_; }
   DriveFileSyncService* sync_service() { return sync_service_.get(); }
+  std::map<GURL, std::string>* pending_batch_sync_origins() {
+    return &(sync_service()->pending_batch_sync_origins_);
+  }
 
   const RemoteChangeHandler& remote_change_handler() const {
     return sync_service_->remote_change_handler_;
   }
 
   fileapi::FileSystemURL CreateURL(const GURL& origin,
                                    const base::FilePath::StringType& path) {
     return CreateSyncableFileSystemURL(
         origin, kServiceName, base::FilePath(path));
   }
@@ skipping 192 matching lines @@
   StrictMock<MockRemoteChangeProcessor> mock_remote_processor_;
 
   scoped_ptr<drive::APIUtil> api_util_;
   scoped_ptr<DriveMetadataStore> metadata_store_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncServiceMockTest);
 };
 
 #if !defined(OS_ANDROID)
 
-TEST_F(DriveFileSyncServiceMockTest, BatchSyncOnInitialization) {
-  const GURL kOrigin1 = ExtensionNameToGURL(FPL("example1"));
-  const GURL kOrigin2 = ExtensionNameToGURL(FPL("example2"));
-  const std::string kDirectoryResourceId1(
-      "folder:origin_directory_resource_id");
-  const std::string kDirectoryResourceId2(
-      "folder:origin_directory_resource_id2");
-  const std::string kSyncRootResourceId("folder:sync_root_resource_id");
-
-  metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin1, kDirectoryResourceId1);
-  metadata_store()->AddBatchSyncOrigin(kOrigin2, kDirectoryResourceId2);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
-
-  Sequence change_queue_seq;
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
-      .InSequence(change_queue_seq);
-  EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(1))
-      .Times(AnyNumber())
-      .InSequence(change_queue_seq);
-
-  SetUpDriveServiceExpectCallsForGetAboutResource();
-  SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
-      "chromeos/sync_file_system/listing_files_in_directory.json",
-      kDirectoryResourceId1);
-
-  // The service will get called for incremental sync at the end after
-  // batch sync's done.
-  SetUpDriveServiceExpectCallsForIncrementalSync();
-
-  SetUpDriveSyncService(true);
-  message_loop()->RunUntilIdle();
-
-  // kOrigin1 should be a batch sync origin and kOrigin2 should be an
-  // incremental sync origin.
-  // 4 pending remote changes are from listing_files_in_directory as batch sync
-  // changes.
-  VerifySizeOfRegisteredOrigins(1u, 1u, 0u);
-  EXPECT_EQ(1u, remote_change_handler().ChangesSize());
-}
-
 TEST_F(DriveFileSyncServiceMockTest, RegisterNewOrigin) {
   const GURL kOrigin("chrome-extension://example");
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   // The root id is in the "sync_root_entry.json" file.
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(0))
       .Times(AnyNumber());
@@ skipping 65 matching lines @@
       "chromeos/sync_file_system/listing_files_in_directory.json",
       kDirectoryResourceId);
 
   SetUpDriveSyncService(true);
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
   message_loop()->RunUntilIdle();
   EXPECT_TRUE(done);
 
-  // The origin should be registered as a batch sync origin.
-  VerifySizeOfRegisteredOrigins(1u, 0u, 0u);
+  // The origin should be registered as an incremental sync origin.
+  VerifySizeOfRegisteredOrigins(0u, 1u, 0u);
 
   // |listing_files_in_directory| contains 4 items to sync.
   EXPECT_EQ(1u, remote_change_handler().ChangesSize());
 }
 
 TEST_F(DriveFileSyncServiceMockTest, UnregisterOrigin) {
   const GURL kOrigin1 = ExtensionNameToGURL(FPL("example1"));
   const GURL kOrigin2 = ExtensionNameToGURL(FPL("example2"));
   const std::string kDirectoryResourceId1(
       "folder:origin_directory_resource_id");
   const std::string kDirectoryResourceId2(
       "folder:origin_directory_resource_id2");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin1, kDirectoryResourceId1);
-  metadata_store()->AddBatchSyncOrigin(kOrigin2, kDirectoryResourceId2);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin1, kDirectoryResourceId1);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin2, kDirectoryResourceId2);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
-  InSequence sequence;
-
-  SetUpDriveServiceExpectCallsForGetAboutResource();
-  SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
-      "chromeos/sync_file_system/listing_files_in_directory.json",
-      kDirectoryResourceId1);
-
-  SetUpDriveServiceExpectCallsForIncrementalSync();
-
   SetUpDriveSyncService(true);
   message_loop()->RunUntilIdle();
 
-  VerifySizeOfRegisteredOrigins(1u, 1u, 0u);
-  EXPECT_EQ(1u, remote_change_handler().ChangesSize());
+  VerifySizeOfRegisteredOrigins(0u, 2u, 0u);
+  EXPECT_EQ(0u, remote_change_handler().ChangesSize());
 
   bool done = false;
   sync_service()->UnregisterOriginForTrackingChanges(
       kOrigin1, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
   message_loop()->RunUntilIdle();
   EXPECT_TRUE(done);
 
   VerifySizeOfRegisteredOrigins(0u, 1u, 0u);
   EXPECT_TRUE(!remote_change_handler().HasChanges());
 }
 
 TEST_F(DriveFileSyncServiceMockTest, UpdateRegisteredOrigins) {
   const GURL kOrigin1 = ExtensionNameToGURL(FPL("example1"));
   const GURL kOrigin2 = ExtensionNameToGURL(FPL("example2"));
   const std::string kDirectoryResourceId1(
       "folder:origin_directory_resource_id");
   const std::string kDirectoryResourceId2(
       "folder:origin_directory_resource_id2");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const std::string extension_id1 =
       extensions::id_util::GenerateIdForPath(base::FilePath(FPL("example1")));
   const std::string extension_id2 =
       extensions::id_util::GenerateIdForPath(base::FilePath(FPL("example2")));
 
-  metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin1, kDirectoryResourceId1);
-  metadata_store()->AddBatchSyncOrigin(kOrigin2, kDirectoryResourceId2);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin2);
-
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
-  InSequence sequence;
-
-  SetUpDriveServiceExpectCallsForGetAboutResource();
-  SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
-      "chromeos/sync_file_system/listing_files_in_directory.json",
-      kDirectoryResourceId1);
-
-  SetUpDriveServiceExpectCallsForIncrementalSync();
-
   SetUpDriveSyncService(true);
   message_loop()->RunUntilIdle();
 
+  metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin1, kDirectoryResourceId1);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin2, kDirectoryResourceId2);

[tzik, 2013/05/23 04:03:05]

Could you move this back before SetUpDriveSyncService?
Previous ordering emulated the situation that DriveFileSyncService is
initialized on existing database.

[calvinlo, 2013/05/23 08:23:04]

Done.

+
   // [1] Both extensions and origins are enabled. Nothing to do.
-  VerifySizeOfRegisteredOrigins(1u, 1u, 0u);
+  VerifySizeOfRegisteredOrigins(0u, 2u, 0u);
   UpdateRegisteredOrigins();
-  VerifySizeOfRegisteredOrigins(1u, 1u, 0u);
+  VerifySizeOfRegisteredOrigins(0u, 2u, 0u);
 
+  // [2] Extension 1 should move to disabled list.
   DisableExtension(extension_id1);
-  DisableExtension(extension_id2);
+  UpdateRegisteredOrigins();
+  VerifySizeOfRegisteredOrigins(0u, 1u, 1u);
 
-  // [2] Origins should be disabled since extensions were disabled.
-  VerifySizeOfRegisteredOrigins(1u, 1u, 0u);
+  // [3] Make sure that state remains the same, nothing should change.
   UpdateRegisteredOrigins();
-  VerifySizeOfRegisteredOrigins(0u, 0u, 2u);
+  VerifySizeOfRegisteredOrigins(0u, 1u, 1u);
 
-  // [3] Both extensions and origins are disabled. Nothing to do.
-  VerifySizeOfRegisteredOrigins(0u, 0u, 2u);
+  // [4] Uninstall Extension 2.
+  UninstallExtension(extension_id2);
   UpdateRegisteredOrigins();
-  VerifySizeOfRegisteredOrigins(0u, 0u, 2u);
+  VerifySizeOfRegisteredOrigins(0u, 0u, 1u);
 
+  // [5] Re-enable Extension 1. It moves back to batch and not to incremental.
   EnableExtension(extension_id1);
-  EnableExtension(extension_id2);
-
-  // [4] Origins should be re-enabled since extensions were re-enabled.
-  VerifySizeOfRegisteredOrigins(0u, 0u, 2u);
-  UpdateRegisteredOrigins();
-  VerifySizeOfRegisteredOrigins(2u, 0u, 0u);
-
-  UninstallExtension(extension_id2);
-
-  // Prepare for UninstallOrigin called by UpdateRegisteredOrigins.
-  EXPECT_CALL(*mock_drive_service(),
-              DeleteResource(kDirectoryResourceId2, _, _))
-      .WillOnce(InvokeEntryActionCallback(google_apis::HTTP_SUCCESS));
-  SetUpDriveServiceExpectCallsForGetAboutResource();
-  SetUpDriveServiceExpectCallsForGetResourceListInDirectory(
-      "chromeos/sync_file_system/listing_files_in_directory.json",
-      kDirectoryResourceId1);
-
-  // [5] |kOrigin2| should be unregistered since its extension was uninstalled.
-  VerifySizeOfRegisteredOrigins(2u, 0u, 0u);
   UpdateRegisteredOrigins();
   VerifySizeOfRegisteredOrigins(1u, 0u, 0u);
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_NoChange) {
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
@@ skipping 10 matching lines @@
   EXPECT_TRUE(!remote_change_handler().HasChanges());
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_Busy) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin, kDirectoryResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName),
                                             kServiceName, _))
       .WillOnce(PrepareForRemoteChange_Busy());
   EXPECT_CALL(*mock_remote_processor(),
               ClearLocalChanges(CreateURL(kOrigin, kFileName), _))
@@ skipping 15 matching lines @@
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_NewFile) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin, kDirectoryResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName),
                                             kServiceName, _))
       .WillOnce(PrepareForRemoteChange_NotFound());
   EXPECT_CALL(*mock_remote_processor(),
               ClearLocalChanges(CreateURL(kOrigin, kFileName), _))
@@ skipping 21 matching lines @@
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_UpdateFile) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath::StringType kFileName(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin, kDirectoryResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   EXPECT_CALL(*mock_remote_processor(),
               PrepareForProcessRemoteChange(CreateURL(kOrigin, kFileName),
                                             kServiceName, _))
       .WillOnce(PrepareForRemoteChange_NotModified());
   EXPECT_CALL(*mock_remote_processor(),
               ClearLocalChanges(CreateURL(kOrigin, kFileName), _))
@@ skipping 49 matching lines @@
 
   SetUpDriveSyncService(false);
   bool done = false;
   sync_service()->RegisterOriginForTrackingChanges(
       kOrigin, base::Bind(&ExpectEqStatus, &done, SYNC_STATUS_OK));
   message_loop()->RunUntilIdle();
   EXPECT_TRUE(done);
 
   // We must not have started batch sync for the newly registered origin,
   // so it should still be in the batch_sync_origins.
-  VerifySizeOfRegisteredOrigins(1u, 0u, 0u);
+  EXPECT_EQ(1u, pending_batch_sync_origins()->size());

[tzik, 2013/05/23 04:03:05]

Can we revert this?

[calvinlo, 2013/05/23 08:23:04]

Done.

   EXPECT_TRUE(!remote_change_handler().HasChanges());
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_Override) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
   const base::FilePath kFilePath(FPL("File 1.mp3"));
   const std::string kFileResourceId("file:2_file_resource_id");
   const std::string kFileResourceId2("file:2_file_resource_id_2");
   const fileapi::FileSystemURL kURL(CreateURL(kOrigin, kFilePath.value()));
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin, kDirectoryResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   SetUpDriveSyncService(true);
 
   EXPECT_TRUE(AppendIncrementalRemoteChange(
       kOrigin, kFilePath, false /* is_deleted */,
       kFileResourceId, 2, "remote_file_md5"));
 
@@ skipping 39 matching lines @@
       kOrigin, kFilePath, false /* is_deleted */,
       kFileResourceId2, 8, "updated_file_md5"));
 }
 
 TEST_F(DriveFileSyncServiceMockTest, RemoteChange_Folder) {
   const GURL kOrigin = ExtensionNameToGURL(FPL("example1"));
   const std::string kDirectoryResourceId("folder:origin_directory_resource_id");
   const std::string kSyncRootResourceId("folder:sync_root_resource_id");
 
   metadata_store()->SetSyncRootDirectory(kSyncRootResourceId);
-  metadata_store()->AddBatchSyncOrigin(kOrigin, kDirectoryResourceId);
-  metadata_store()->MoveBatchSyncOriginToIncremental(kOrigin);
+  metadata_store()->AddIncrementalSyncOrigin(kOrigin, kDirectoryResourceId);
 
   EXPECT_CALL(*mock_remote_observer(), OnRemoteChangeQueueUpdated(_))
       .Times(AnyNumber());
 
   SetUpDriveSyncService(true);
 
   scoped_ptr<ResourceEntry> entry(ResourceEntry::ExtractAndParse(
       *LoadJSONFile("chromeos/gdata/file_entry.json")));
   entry->set_kind(google_apis::ENTRY_KIND_FOLDER);
 
   // Expect to drop this change for file.
   EXPECT_FALSE(AppendIncrementalRemoteChangeByEntry(
       kOrigin, *entry, 1));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace sync_file_system