Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Unified Diff: chrome/browser/chromeos/drive/directory_loader_unittest.cc

Issue 1314803004: Move chrome/browser/chromeos/drive/file_system.cc (+deps) into components/drive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing... Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/directory_loader_unittest.cc
diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc
deleted file mode 100644
index 2243a763c5823409a56429fe23ce8c9b386517ec..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright 2014 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/directory_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 "base/single_thread_task_runner.h"
-#include "base/thread_task_runner_handle.h"
-#include "components/drive/change_list_loader.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/event_logger.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/file_system_core_util.h"
-#include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
-#include "components/drive/service/fake_drive_service.h"
-#include "components/drive/service/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 {
-
-namespace {
-
-class TestDirectoryLoaderObserver : public ChangeListLoaderObserver {
- public:
- explicit TestDirectoryLoaderObserver(DirectoryLoader* loader)
- : loader_(loader) {
- loader_->AddObserver(this);
- }
-
- ~TestDirectoryLoaderObserver() override { loader_->RemoveObserver(this); }
-
- const std::set<base::FilePath>& changed_directories() const {
- return changed_directories_;
- }
- void clear_changed_directories() { changed_directories_.clear(); }
-
- // ChageListObserver overrides:
- void OnDirectoryReloaded(const base::FilePath& directory_path) override {
- changed_directories_.insert(directory_path);
- }
-
- private:
- DirectoryLoader* loader_;
- std::set<base::FilePath> changed_directories_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDirectoryLoaderObserver);
-};
-
-void AccumulateReadDirectoryResult(ResourceEntryVector* out_entries,
- scoped_ptr<ResourceEntryVector> entries) {
- ASSERT_TRUE(entries);
- out_entries->insert(out_entries->end(), entries->begin(), entries->end());
-}
-
-} // namespace
-
-class DirectoryLoaderTest : public testing::Test {
- protected:
- void SetUp() override {
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- pref_service_.reset(new TestingPrefServiceSimple);
- test_util::RegisterDrivePrefs(pref_service_->registry());
-
- logger_.reset(new EventLogger);
-
- drive_service_.reset(new FakeDriveService);
- ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
-
- scheduler_.reset(new JobScheduler(
- pref_service_.get(),
- logger_.get(),
- drive_service_.get(),
- base::ThreadTaskRunnerHandle::Get().get()));
- metadata_storage_.reset(new ResourceMetadataStorage(
- temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
- ASSERT_TRUE(metadata_storage_->Initialize());
-
- cache_.reset(new FileCache(metadata_storage_.get(),
- temp_dir_.path(),
- base::ThreadTaskRunnerHandle::Get().get(),
- NULL /* free_disk_space_getter */));
- ASSERT_TRUE(cache_->Initialize());
-
- metadata_.reset(new ResourceMetadata(
- metadata_storage_.get(), cache_.get(),
- base::ThreadTaskRunnerHandle::Get().get()));
- ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
-
- about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
- loader_controller_.reset(new LoaderController);
- directory_loader_.reset(
- new DirectoryLoader(logger_.get(),
- base::ThreadTaskRunnerHandle::Get().get(),
- metadata_.get(),
- scheduler_.get(),
- about_resource_loader_.get(),
- loader_controller_.get()));
- }
-
- // Adds a new file to the root directory of the service.
- scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) {
- google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR;
- scoped_ptr<google_apis::FileResource> entry;
- drive_service_->AddNewFile(
- "text/plain",
- "content text",
- drive_service_->GetRootResourceId(),
- title,
- false, // shared_with_me
- google_apis::test_util::CreateCopyResultCallback(&error, &entry));
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(google_apis::HTTP_CREATED, error);
- return entry.Pass();
- }
-
- content::TestBrowserThreadBundle thread_bundle_;
- base::ScopedTempDir temp_dir_;
- scoped_ptr<TestingPrefServiceSimple> pref_service_;
- scoped_ptr<EventLogger> logger_;
- scoped_ptr<FakeDriveService> drive_service_;
- scoped_ptr<JobScheduler> scheduler_;
- scoped_ptr<ResourceMetadataStorage,
- test_util::DestroyHelperForTests> metadata_storage_;
- scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
- scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
- scoped_ptr<AboutResourceLoader> about_resource_loader_;
- scoped_ptr<LoaderController> loader_controller_;
- scoped_ptr<DirectoryLoader> directory_loader_;
-};
-
-TEST_F(DirectoryLoaderTest, ReadDirectory_GrandRoot) {
- TestDirectoryLoaderObserver observer(directory_loader_.get());
-
- // Load grand root.
- FileError error = FILE_ERROR_FAILED;
- ResourceEntryVector entries;
- directory_loader_->ReadDirectory(
- util::GetDriveGrandRootPath(),
- base::Bind(&AccumulateReadDirectoryResult, &entries),
- google_apis::test_util::CreateCopyResultCallback(&error));
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(FILE_ERROR_OK, error);
- EXPECT_EQ(0U, observer.changed_directories().size());
- observer.clear_changed_directories();
-
- // My Drive has resource ID.
- ResourceEntry entry;
- EXPECT_EQ(FILE_ERROR_OK,
- metadata_->GetResourceEntryByPath(util::GetDriveMyDriveRootPath(),
- &entry));
- EXPECT_EQ(drive_service_->GetRootResourceId(), entry.resource_id());
-}
-
-TEST_F(DirectoryLoaderTest, ReadDirectory_MyDrive) {
- TestDirectoryLoaderObserver observer(directory_loader_.get());
-
- // My Drive does not have resource ID yet.
- ResourceEntry entry;
- EXPECT_EQ(FILE_ERROR_OK,
- metadata_->GetResourceEntryByPath(util::GetDriveMyDriveRootPath(),
- &entry));
- EXPECT_TRUE(entry.resource_id().empty());
-
- // Load My Drive.
- FileError error = FILE_ERROR_FAILED;
- ResourceEntryVector entries;
- directory_loader_->ReadDirectory(
- util::GetDriveMyDriveRootPath(),
- base::Bind(&AccumulateReadDirectoryResult, &entries),
- google_apis::test_util::CreateCopyResultCallback(&error));
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(FILE_ERROR_OK, error);
- EXPECT_EQ(1U, observer.changed_directories().count(
- util::GetDriveMyDriveRootPath()));
-
- // My Drive has resource ID.
- EXPECT_EQ(FILE_ERROR_OK,
- metadata_->GetResourceEntryByPath(util::GetDriveMyDriveRootPath(),
- &entry));
- EXPECT_EQ(drive_service_->GetRootResourceId(), entry.resource_id());
- EXPECT_EQ(drive_service_->about_resource().largest_change_id(),
- entry.directory_specific_info().changestamp());
-
- // My Drive's child is present.
- base::FilePath file_path =
- util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
- EXPECT_EQ(FILE_ERROR_OK,
- metadata_->GetResourceEntryByPath(file_path, &entry));
-}
-
-TEST_F(DirectoryLoaderTest, ReadDirectory_MultipleCalls) {
- TestDirectoryLoaderObserver observer(directory_loader_.get());
-
- // Load grand root.
- FileError error = FILE_ERROR_FAILED;
- ResourceEntryVector entries;
- directory_loader_->ReadDirectory(
- util::GetDriveGrandRootPath(),
- base::Bind(&AccumulateReadDirectoryResult, &entries),
- google_apis::test_util::CreateCopyResultCallback(&error));
-
- // Load grand root again without waiting for the result.
- FileError error2 = FILE_ERROR_FAILED;
- ResourceEntryVector entries2;
- directory_loader_->ReadDirectory(
- util::GetDriveGrandRootPath(),
- base::Bind(&AccumulateReadDirectoryResult, &entries2),
- google_apis::test_util::CreateCopyResultCallback(&error2));
- base::RunLoop().RunUntilIdle();
-
- // Callback is called for each method call.
- EXPECT_EQ(FILE_ERROR_OK, error);
- EXPECT_EQ(FILE_ERROR_OK, error2);
-}
-
-TEST_F(DirectoryLoaderTest, Lock) {
- // Lock the loader.
- scoped_ptr<base::ScopedClosureRunner> lock = loader_controller_->GetLock();
-
- // Start loading.
- TestDirectoryLoaderObserver observer(directory_loader_.get());
- FileError error = FILE_ERROR_FAILED;
- ResourceEntryVector entries;
- directory_loader_->ReadDirectory(
- util::GetDriveMyDriveRootPath(),
- base::Bind(&AccumulateReadDirectoryResult, &entries),
- google_apis::test_util::CreateCopyResultCallback(&error));
- base::RunLoop().RunUntilIdle();
-
- // Update is pending due to the lock.
- EXPECT_TRUE(observer.changed_directories().empty());
-
- // Unlock the loader, this should resume the pending udpate.
- lock.reset();
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(1U, observer.changed_directories().count(
- util::GetDriveMyDriveRootPath()));
-}
-
-} // namespace internal
-} // namespace drive
« no previous file with comments | « chrome/browser/chromeos/drive/directory_loader.cc ('k') | chrome/browser/chromeos/drive/download_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698