Pass calls to GetDocuments through 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/copy_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
+#include "chrome/browser/google_apis/mock_drive_service.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::Eq;
 using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace drive {
 
 namespace {
 
 class MockNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
@@ skipping 60 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);
 
+    // Allocate and keep a pointer to the mock, and inject it into the
+    // DriveFileSystem object, which will own the mock object.

[kinaba, 2012/11/22 08:04:07]

IIUC, DriveFileSystem does not own DriveService (that's the reason it has to be
deleted in TearDown).

[Zachary Kuznia, 2012/11/28 06:54:56]

Removed the comment.

+    mock_drive_service_ = new StrictMock<google_apis::MockDriveService>;

[kinaba, 2012/11/22 08:04:07]

Satorux is deprecating MockDriveService http://crbug.com/162350. We may want to
coordinate on how to write the tests depending on it...

+
     mock_copy_operation_ = new StrictMock<MockCopyOperation>();
     mock_move_operation_ = new StrictMock<MockMoveOperation>();
     mock_remove_operation_ = new StrictMock<MockRemoveOperation>();
     drive_operations_.InitForTesting(mock_copy_operation_,
                                      mock_move_operation_,
                                      mock_remove_operation_,
                                      NULL);
     scheduler_.reset(new DriveScheduler(profile_.get(),
+                                        mock_drive_service_,
                                         &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.
     scheduler_.reset();
     google_apis::test_util::RunBlockingPoolTask();
+    delete mock_drive_service_;
+    mock_drive_service_ = NULL;
     mock_network_change_notifier_.reset();
   }
 
   // Sets up MockNetworkChangeNotifier as if it's connected to a network with
   // the specified connection type.
   void ChangeConnectionType(net::NetworkChangeNotifier::ConnectionType type) {
     EXPECT_CALL(*mock_network_change_notifier_, GetCurrentConnectionType())
         .WillRepeatedly(Return(type));
     // Notify the sync client that the network is changed. This is done via
     // NetworkChangeNotifier in production, but here, we simulate the behavior
@@ skipping 20 matching lines @@
   void ConnectToNone() {
     ChangeConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE);
   }
 
  protected:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<DriveScheduler> scheduler_;
   scoped_ptr<MockNetworkChangeNotifier> mock_network_change_notifier_;
+  StrictMock<google_apis::MockDriveService>* mock_drive_service_;
 
   file_system::DriveOperations drive_operations_;
   StrictMock<MockCopyOperation>* mock_copy_operation_;
   StrictMock<MockMoveOperation>* mock_move_operation_;
   StrictMock<MockRemoveOperation>* mock_remove_operation_;
 };
 
 TEST_F(DriveSchedulerTest, CopyFile) {
   ConnectToWifi();
 
@@ skipping 58 matching lines @@
 
   DriveFileError error(DRIVE_FILE_ERROR_FAILED);
   scheduler_->TransferRegularFile(
       file_in_root, dest_file,
       base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
   google_apis::test_util::RunBlockingPoolTask();
 
   ASSERT_EQ(DRIVE_FILE_OK, error);
 }
 
+TEST_F(DriveSchedulerTest, GetDocuments) {
+  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_drive_service_,
+              GetDocuments(Eq(GURL()), _, _, _, _, _)).Times(1);
+
+
+  scheduler_->GetDocuments(
+      GURL(),
+      0,
+      std::string(),
+      true,
+      std::string(),
+      google_apis::GetDataCallback());
+  google_apis::test_util::RunBlockingPoolTask();

[satorux1, 2012/11/22 08:12:45]

I think we should check the results we get by GetDocuments.

To do that, we need a fake DriveService implementation (not a mock), that
returns something meaningful.

For implementing a fake, see this patch, which does something similar:
https://codereview.chromium.org/11414126/diff/5002/chrome/browser/chromeos/dr...

To get the results from GetDataCallback, we should use
CopyResultsFromGetDataCallback(), which is currently defined in
base_operations_unittest.cc. We should move this to c/b/google_apis/test_util.h,
so we can use it from here.

[Zachary Kuznia, 2012/11/28 06:54:56]

Done.

+}
+
 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(MockOperation(DRIVE_FILE_OK));
 
   DriveFileError error(DRIVE_FILE_ERROR_FAILED);
   scheduler_->Move(
@@ skipping 149 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));
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace drive