Add Move operation to the the scheduler

chrome/browser/chromeos/drive/drive_scheduler_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/drive_scheduler.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/file_system/drive_operations.h"
+#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace drive {
 
 namespace {
 
 class MockNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
   MOCK_CONST_METHOD0(GetCurrentConnectionType,
                      net::NetworkChangeNotifier::ConnectionType());
 };
 
+class MockMoveOperation : public file_system::MoveOperation {
+ public:
+  MockMoveOperation()
+      : file_system::MoveOperation(NULL, NULL, NULL) {
+  }
+
+  MOCK_METHOD3(Move, void(const FilePath& src_file_path,
+                          const FilePath& dest_file_path,
+                          const FileOperationCallback& callback));
+};
+
 class MockRemoveOperation : public file_system::RemoveOperation {
  public:
   MockRemoveOperation()
       : file_system::RemoveOperation(NULL, NULL, NULL, NULL) {
   }
 
   MOCK_METHOD3(Remove, void(const FilePath& file_path,
                             bool is_recursive,
                             const FileOperationCallback& callback));
 };
@@ skipping 10 matching lines @@
 class DriveSchedulerTest : public testing::Test {
  public:
   DriveSchedulerTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         profile_(new TestingProfile) {
   }
 
   virtual void SetUp() OVERRIDE {
     mock_network_change_notifier_.reset(new MockNetworkChangeNotifier);
 
+    mock_move_operation_ = new StrictMock<MockMoveOperation>();
     mock_remove_operation_ = new StrictMock<MockRemoveOperation>();
-    drive_operations_.InitForTesting(NULL, mock_remove_operation_);
+    drive_operations_.InitForTesting(mock_move_operation_,
+                                     mock_remove_operation_);
     scheduler_.reset(new DriveScheduler(profile_.get(),
                                         &drive_operations_));
 
     scheduler_->Initialize();
     scheduler_->SetDisableThrottling(true);
   }
 
   virtual void TearDown() OVERRIDE {
     // The scheduler should be deleted before NetworkLibrary, as it
     // registers itself as observer of NetworkLibrary.
@@ skipping 34 matching lines @@
   }
 
  protected:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<DriveScheduler> scheduler_;
   scoped_ptr<MockNetworkChangeNotifier> mock_network_change_notifier_;
 
   file_system::DriveOperations drive_operations_;
+  StrictMock<MockMoveOperation>* mock_move_operation_;
   StrictMock<MockRemoveOperation>* mock_remove_operation_;
 };
 
+TEST_F(DriveSchedulerTest, MoveFile) {
+  ConnectToWifi();
+
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_file(FILE_PATH_LITERAL("drive/File 1.txt"));
+  EXPECT_CALL(*mock_move_operation_, Move(file_in_root, dest_file, _))
+      .WillOnce(MockRemove(DRIVE_FILE_OK));
+
+  DriveFileError error;

[satorux1, 2012/10/16 05:10:37]

nit: initialize this with DRIVE_FILE_FAILED?

[Zachary Kuznia, 2012/11/07 05:46:17]

Done.

+  scheduler_->Move(
+      file_in_root, dest_file,
+      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+  gdata::test_util::RunBlockingPoolTask();
+
+  ASSERT_EQ(DRIVE_FILE_OK, error);
+}
+
+TEST_F(DriveSchedulerTest, MoveFileRetry) {
+  ConnectToWifi();
+
+  FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
+  FilePath dest_file(FILE_PATH_LITERAL("drive/File 1.txt"));
+  EXPECT_CALL(*mock_move_operation_, Move(file_in_root, dest_file, _))

[satorux1, 2012/10/16 05:10:37]

Please add some comment explaining what you are testing (retry due to throttle)

[Zachary Kuznia, 2012/11/07 05:46:17]

Done.

+      .WillOnce(MockRemove(DRIVE_FILE_ERROR_THROTTLED))
+      .WillOnce(MockRemove(DRIVE_FILE_OK));
+
+  DriveFileError error;

[satorux1, 2012/10/16 05:10:37]

nit: initialize this with DRIVE_FILE_FAILED?

[Zachary Kuznia, 2012/11/07 05:46:17]

Done.

+  scheduler_->Move(
+      file_in_root, dest_file,
+      base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
+  gdata::test_util::RunBlockingPoolTask();
+
+  ASSERT_EQ(DRIVE_FILE_OK, error);
+}
+
 TEST_F(DriveSchedulerTest, RemoveFile) {
   ConnectToWifi();
 
   FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   EXPECT_CALL(*mock_remove_operation_, Remove(file_in_root, _, _))
       .WillOnce(MockRemove(DRIVE_FILE_OK));
 
   DriveFileError error;
   scheduler_->Remove(
       file_in_root, false,
@@ skipping 110 matching lines @@
 
   FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   DriveFileError error;
   scheduler_->Remove(
       file_in_root, false,
       base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
   gdata::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace drive