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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc

Issue 23892008: Move VolumeManager to c/b/chromeos/file_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h ('k') | chrome/browser/chromeos/file_manager/volume_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc
deleted file mode 100644
index bb0928bc747432228d2b1e10a2fd214243eec655..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/extensions/file_manager/volume_manager_unittest.cc
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2013 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/extensions/file_manager/volume_manager.h"
-
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/prefs/pref_service.h"
-#include "chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_profile.h"
-#include "chromeos/disks/disk_mount_manager.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace file_manager {
-namespace {
-
-// Fake implementation of DiskMountManager.
-class FakeDiskMountManager : public chromeos::disks::DiskMountManager {
- public:
- struct MountRequest {
- MountRequest(const std::string& source_path,
- const std::string& source_format,
- const std::string& mount_label,
- chromeos::MountType type)
- : source_path(source_path),
- source_format(source_format),
- mount_label(mount_label),
- type(type) {
- }
-
- std::string source_path;
- std::string source_format;
- std::string mount_label;
- chromeos::MountType type;
- };
-
- struct UnmountRequest {
- UnmountRequest(const std::string& mount_path,
- chromeos::UnmountOptions options)
- : mount_path(mount_path),
- options(options) {
- }
-
- std::string mount_path;
- chromeos::UnmountOptions options;
- };
-
- FakeDiskMountManager() {}
- virtual ~FakeDiskMountManager() {}
-
- const std::vector<MountRequest>& mount_requests() const {
- return mount_requests_;
- }
- const std::vector<UnmountRequest>& unmount_requests() const {
- return unmount_requests_;
- }
-
- // DiskMountManager overrides.
- virtual void AddObserver(Observer* observer) OVERRIDE {}
- virtual void RemoveObserver(Observer* observer) OVERRIDE {}
- virtual const DiskMap& disks() const OVERRIDE { return disks_; }
- virtual const Disk* FindDiskBySourcePath(
- const std::string& source_path) const OVERRIDE {
- return NULL;
- }
- virtual const MountPointMap& mount_points() const OVERRIDE {
- return mount_points_;
- }
- virtual void RequestMountInfoRefresh() OVERRIDE {}
- virtual void MountPath(const std::string& source_path,
- const std::string& source_format,
- const std::string& mount_label,
- chromeos::MountType type) OVERRIDE {
- mount_requests_.push_back(
- MountRequest(source_path, source_format, mount_label, type));
- }
- virtual void UnmountPath(const std::string& mount_path,
- chromeos::UnmountOptions options,
- const UnmountPathCallback& callback) OVERRIDE {
- unmount_requests_.push_back(UnmountRequest(mount_path, options));
- // Currently |callback| is just ignored.
- }
- virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE {}
- virtual void UnmountDeviceRecursively(
- const std::string& device_path,
- const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE {}
-
- virtual bool AddDiskForTest(Disk* disk) OVERRIDE { return false; }
- virtual bool AddMountPointForTest(
- const MountPointInfo& mount_point) OVERRIDE {
- return false;
- }
-
- private:
- DiskMap disks_;
- MountPointMap mount_points_;
-
- std::vector<MountRequest> mount_requests_;
- std::vector<UnmountRequest> unmount_requests_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeDiskMountManager);
-};
-
-class LoggingObserver : public VolumeManagerObserver {
- public:
- struct Event {
- enum EventType {
- DISK_ADDED,
- DISK_REMOVED,
- DEVICE_ADDED,
- DEVICE_REMOVED,
- FORMAT_STARTED,
- FORMAT_COMPLETED,
- } type;
-
- // Available on DEVICE_ADDED, DEVICE_REMOVED, FORMAT_STARTED and
- // FORMAT_COMPLETED.
- std::string device_path;
-
- // Available on DISK_ADDED.
- bool mounting;
-
- // Available on FORMAT_STARTED and FORMAT_COMPLETED.
- bool success;
- };
-
- LoggingObserver() {}
- virtual ~LoggingObserver() {}
-
- const std::vector<Event>& events() const { return events_; }
-
- // VolumeManagerObserver overrides.
- virtual void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk& disk,
- bool mounting) OVERRIDE {
- Event event;
- event.type = Event::DISK_ADDED;
- event.device_path = disk.device_path(); // Keep only device_path.
- event.mounting = mounting;
- events_.push_back(event);
- }
-
- virtual void OnDiskRemoved(
- const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE {
- Event event;
- event.type = Event::DISK_REMOVED;
- event.device_path = disk.device_path(); // Keep only device_path.
- events_.push_back(event);
- }
-
- virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE {
- Event event;
- event.type = Event::DEVICE_ADDED;
- event.device_path = device_path;
- events_.push_back(event);
- }
-
- virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE {
- Event event;
- event.type = Event::DEVICE_REMOVED;
- event.device_path = device_path;
- events_.push_back(event);
- }
-
- virtual void OnFormatStarted(
- const std::string& device_path, bool success) OVERRIDE {
- Event event;
- event.type = Event::FORMAT_STARTED;
- event.device_path = device_path;
- event.success = success;
- events_.push_back(event);
- }
-
- virtual void OnFormatCompleted(
- const std::string& device_path, bool success) OVERRIDE {
- Event event;
- event.type = Event::FORMAT_COMPLETED;
- event.device_path = device_path;
- event.success = success;
- events_.push_back(event);
- }
-
- private:
- std::vector<Event> events_;
-
- DISALLOW_COPY_AND_ASSIGN(LoggingObserver);
-};
-
-} // namespace
-
-class VolumeManagerTest : public testing::Test {
- protected:
- VolumeManagerTest() {
- }
- virtual ~VolumeManagerTest() {
- }
-
- virtual void SetUp() OVERRIDE {
- disk_mount_manager_.reset(new FakeDiskMountManager);
- profile_.reset(new TestingProfile);
- volume_manager_.reset(
- new VolumeManager(profile_.get(), disk_mount_manager_.get()));
- }
-
- content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<FakeDiskMountManager> disk_mount_manager_;
- scoped_ptr<TestingProfile> profile_;
- scoped_ptr<VolumeManager> volume_manager_;
-};
-
-TEST_F(VolumeManagerTest, OnDiskEvent_Hidden) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const bool kIsHidden = true;
- const chromeos::disks::DiskMountManager::Disk kDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, kIsHidden);
-
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kDisk);
- EXPECT_EQ(0U, observer.events().size());
-
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_REMOVED, &kDisk);
- EXPECT_EQ(0U, observer.events().size());
-
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_CHANGED, &kDisk);
- EXPECT_EQ(0U, observer.events().size());
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDiskEvent_Added) {
- // Enable external storage.
- profile_->GetPrefs()->SetBoolean(prefs::kExternalStorageDisabled, false);
-
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const chromeos::disks::DiskMountManager::Disk kEmptyDevicePathDisk(
- "", // empty device path.
- "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kEmptyDevicePathDisk);
- EXPECT_EQ(0U, observer.events().size());
-
- const bool kHasMedia = true;
- const chromeos::disks::DiskMountManager::Disk kMediaDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, kHasMedia, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kMediaDisk);
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_ADDED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_TRUE(event.mounting);
-
- ASSERT_EQ(1U, disk_mount_manager_->mount_requests().size());
- const FakeDiskMountManager::MountRequest& mount_request =
- disk_mount_manager_->mount_requests()[0];
- EXPECT_EQ("device1", mount_request.source_path);
- EXPECT_EQ("", mount_request.source_format);
- EXPECT_EQ("", mount_request.mount_label);
- EXPECT_EQ(chromeos::MOUNT_TYPE_DEVICE, mount_request.type);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDiskEvent_AddedNonMounting) {
- // Enable external storage.
- profile_->GetPrefs()->SetBoolean(prefs::kExternalStorageDisabled, false);
-
- // Device which is already mounted.
- {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const bool kHasMedia = true;
- const chromeos::disks::DiskMountManager::Disk kMountedMediaDisk(
- "device1", "mounted", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false,
- kHasMedia, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kMountedMediaDisk);
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_ADDED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_FALSE(event.mounting);
-
- ASSERT_EQ(0U, disk_mount_manager_->mount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
- }
-
- // Device without media.
- {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const bool kWithoutMedia = false;
- const chromeos::disks::DiskMountManager::Disk kNoMediaDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false,
- kWithoutMedia, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kNoMediaDisk);
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_ADDED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_FALSE(event.mounting);
-
- ASSERT_EQ(0U, disk_mount_manager_->mount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
- }
-
- // External storage is disabled.
- {
- profile_->GetPrefs()->SetBoolean(prefs::kExternalStorageDisabled, true);
-
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const bool kHasMedia = true;
- const chromeos::disks::DiskMountManager::Disk kMediaDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false,
- kHasMedia, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_ADDED, &kMediaDisk);
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_ADDED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_FALSE(event.mounting);
-
- ASSERT_EQ(0U, disk_mount_manager_->mount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
- }
-}
-
-TEST_F(VolumeManagerTest, OnDiskEvent_Removed) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const chromeos::disks::DiskMountManager::Disk kMountedDisk(
- "device1", "mount_path", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_REMOVED, &kMountedDisk);
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, event.type);
- EXPECT_EQ("device1", event.device_path);
-
- ASSERT_EQ(1U, disk_mount_manager_->unmount_requests().size());
- const FakeDiskMountManager::UnmountRequest& unmount_request =
- disk_mount_manager_->unmount_requests()[0];
- EXPECT_EQ("mount_path", unmount_request.mount_path);
- EXPECT_EQ(chromeos::UNMOUNT_OPTIONS_LAZY, unmount_request.options);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDiskEvent_RemovedNotMounted) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const chromeos::disks::DiskMountManager::Disk kNotMountedDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_REMOVED, &kNotMountedDisk);
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, event.type);
- EXPECT_EQ("device1", event.device_path);
-
- ASSERT_EQ(0U, disk_mount_manager_->unmount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDiskEvent_Changed) {
- // Changed event is just ignored.
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- const chromeos::disks::DiskMountManager::Disk kDisk(
- "device1", "", "", "", "", "", "", "", "", "", "", "",
- chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false);
- volume_manager_->OnDiskEvent(
- chromeos::disks::DiskMountManager::DISK_CHANGED, &kDisk);
-
- EXPECT_EQ(0U, observer.events().size());
- EXPECT_EQ(0U, disk_mount_manager_->mount_requests().size());
- EXPECT_EQ(0U, disk_mount_manager_->unmount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDeviceEvent_Added) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnDeviceEvent(
- chromeos::disks::DiskMountManager::DEVICE_ADDED, "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DEVICE_ADDED, event.type);
- EXPECT_EQ("device1", event.device_path);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDeviceEvent_Removed) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnDeviceEvent(
- chromeos::disks::DiskMountManager::DEVICE_REMOVED, "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::DEVICE_REMOVED, event.type);
- EXPECT_EQ("device1", event.device_path);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnDeviceEvent_Scanned) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnDeviceEvent(
- chromeos::disks::DiskMountManager::DEVICE_SCANNED, "device1");
-
- // SCANNED event is just ignored.
- EXPECT_EQ(0U, observer.events().size());
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnFormatEvent_Started) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnFormatEvent(
- chromeos::disks::DiskMountManager::FORMAT_STARTED,
- chromeos::FORMAT_ERROR_NONE,
- "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::FORMAT_STARTED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_TRUE(event.success);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnFormatEvent_StartFailed) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnFormatEvent(
- chromeos::disks::DiskMountManager::FORMAT_STARTED,
- chromeos::FORMAT_ERROR_UNKNOWN,
- "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::FORMAT_STARTED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_FALSE(event.success);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnFormatEvent_Completed) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnFormatEvent(
- chromeos::disks::DiskMountManager::FORMAT_COMPLETED,
- chromeos::FORMAT_ERROR_NONE,
- "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::FORMAT_COMPLETED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_TRUE(event.success);
-
- // When "format" is successfully done, VolumeManager requests to mount it.
- ASSERT_EQ(1U, disk_mount_manager_->mount_requests().size());
- const FakeDiskMountManager::MountRequest& mount_request =
- disk_mount_manager_->mount_requests()[0];
- EXPECT_EQ("device1", mount_request.source_path);
- EXPECT_EQ("", mount_request.source_format);
- EXPECT_EQ("", mount_request.mount_label);
- EXPECT_EQ(chromeos::MOUNT_TYPE_DEVICE, mount_request.type);
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-TEST_F(VolumeManagerTest, OnFormatEvent_CompletedFailed) {
- LoggingObserver observer;
- volume_manager_->AddObserver(&observer);
-
- volume_manager_->OnFormatEvent(
- chromeos::disks::DiskMountManager::FORMAT_COMPLETED,
- chromeos::FORMAT_ERROR_UNKNOWN,
- "device1");
-
- ASSERT_EQ(1U, observer.events().size());
- const LoggingObserver::Event& event = observer.events()[0];
- EXPECT_EQ(LoggingObserver::Event::FORMAT_COMPLETED, event.type);
- EXPECT_EQ("device1", event.device_path);
- EXPECT_FALSE(event.success);
-
- EXPECT_EQ(0U, disk_mount_manager_->mount_requests().size());
-
- volume_manager_->RemoveObserver(&observer);
-}
-
-} // namespace file_manager
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/volume_manager_observer.h ('k') | chrome/browser/chromeos/file_manager/volume_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698