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

Unified Diff: chrome/browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc

Issue 23676008: Refactor MountedDiskMonitior and adds its test. (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/file_manager/mounted_disk_monitor.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc b/chrome/browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..85dc2a63e872fee97a2171ed8b7b8d06e2715953
--- /dev/null
+++ b/chrome/browser/chromeos/file_manager/mounted_disk_monitor_unittest.cc
@@ -0,0 +1,207 @@
+// 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/file_manager/mounted_disk_monitor.h"
+
+#include "base/basictypes.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/stl_util.h"
+#include "chromeos/dbus/fake_power_manager_client.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace file_manager {
+namespace {
+
+// Fake implementation of DiskMountManager. Does nothing but returns some
+// disk information.
+class FakeDiskMountManager : public chromeos::disks::DiskMountManager {
+ public:
+ FakeDiskMountManager() {}
+ virtual ~FakeDiskMountManager() {
+ STLDeleteValues(&disks_);
+ }
+
+ // 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 {
+ DiskMap::const_iterator iter = disks_.find(source_path);
+ if (iter == disks_.end())
+ return NULL;
+ return iter->second;
+ };
+
+ 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 {}
+ virtual void UnmountPath(const std::string& mount_path,
+ chromeos::UnmountOptions options,
+ const UnmountPathCallback& callback) OVERRIDE {}
+ 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 {
+ DCHECK(disk);
+ DCHECK(disks_.find(disk->device_path()) == disks_.end());
+ disks_[disk->device_path()] = disk;
+ return true;
+ }
+ virtual bool AddMountPointForTest(
+ const MountPointInfo& mount_point) OVERRIDE { return false; }
+
+ private:
+ DiskMap disks_;
+ MountPointMap mount_points_;
+
+ DISALLOW_COPY_AND_ASSIGN(FakeDiskMountManager);
+};
+
+// Creates a fake disk with |device_path| and |fs_uuid|.
+scoped_ptr<chromeos::disks::DiskMountManager::Disk> CreateDisk(
+ const std::string& device_path,
+ const std::string& fs_uuid) {
+ return make_scoped_ptr(
+ new chromeos::disks::DiskMountManager::Disk(
+ device_path, "", "", "", "", "", "", "", "", "", fs_uuid, "",
+ chromeos::DEVICE_TYPE_USB, 0, false, false, false, false, false));
+}
+
+} // namespace
+
+class MountedDiskMonitorTest : public testing::Test {
+ protected:
+ MountedDiskMonitorTest() {
+ }
+
+ virtual ~MountedDiskMonitorTest() {
+ }
+
+ virtual void SetUp() OVERRIDE {
+ power_manager_client_.reset(new chromeos::FakePowerManagerClient);
+ disk_mount_manager_.reset(new FakeDiskMountManager);
+ mounted_disk_monitor_.reset(new MountedDiskMonitor(
+ power_manager_client_.get(),
+ disk_mount_manager_.get()));
+ mounted_disk_monitor_->set_resuming_time_span_for_testing(
+ base::TimeDelta::FromSeconds(0));
+ }
+
+ base::MessageLoop message_loop_;
+ scoped_ptr<chromeos::FakePowerManagerClient> power_manager_client_;
+ scoped_ptr<FakeDiskMountManager> disk_mount_manager_;
+ scoped_ptr<MountedDiskMonitor> mounted_disk_monitor_;
+};
+
+// Makes sure that just mounting and unmounting repeatedly doesn't affect to
+// "remounting" state.
+TEST_F(MountedDiskMonitorTest, WithoutSuspend) {
+ scoped_ptr<chromeos::disks::DiskMountManager::Disk> disk(
+ CreateDisk("removable_device1", "uuid1"));
+
+ chromeos::disks::DiskMountManager::Disk* disk_ptr = disk.get();
+
+ const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint(
+ "removable_device1", "/tmp/removable_device1",
+ chromeos::MOUNT_TYPE_DEVICE, chromeos::disks::MOUNT_CONDITION_NONE);
+
+ // The ownership of Disks are taken by DiskMountManager.
hashimoto 2013/09/09 14:34:24 nit: Now this comment is not needed because scoped
hidehiko 2013/09/09 15:18:54 Done.
+ disk_mount_manager_->AddDiskForTest(disk.release());
+
+ // First, the disk is not remounting.
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk_ptr));
+
+ // Simple mounting and unmounting doesn't affect remounting state.
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::MOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint);
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk_ptr));
+
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::UNMOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint);
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk_ptr));
+
+ // Mounting again also should not affect remounting state.
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::MOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint);
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk_ptr));
+}
+
+// Makes sure that the unmounting after system resuming triggers the
+// "remounting" state, then after some period, the state is reset.
+TEST_F(MountedDiskMonitorTest, SuspendAndResume) {
+ scoped_ptr<chromeos::disks::DiskMountManager::Disk> disk1(
+ CreateDisk("removable_device1", "uuid1"));
+ scoped_ptr<chromeos::disks::DiskMountManager::Disk> disk2(
+ CreateDisk("removable_device2", "uuid2"));
+
+ chromeos::disks::DiskMountManager::Disk* disk1_ptr = disk1.get();
+ chromeos::disks::DiskMountManager::Disk* disk2_ptr = disk2.get();
+
+ const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint1(
+ "removable_device1", "/tmp/removable_device1",
+ chromeos::MOUNT_TYPE_DEVICE, chromeos::disks::MOUNT_CONDITION_NONE);
+ const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint2(
+ "removable_device2", "/tmp/removable_device2",
+ chromeos::MOUNT_TYPE_DEVICE, chromeos::disks::MOUNT_CONDITION_NONE);
+
+ // The ownership of Disks are taken by DiskMountManager.
+ disk_mount_manager_->AddDiskForTest(disk1.release());
+ disk_mount_manager_->AddDiskForTest(disk2.release());
+
+ // Mount |disk1|.
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::MOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint1);
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk1_ptr));
+
+ // Pseudo system suspend and resume.
+ mounted_disk_monitor_->SuspendImminent();
+ mounted_disk_monitor_->SystemResumed(base::TimeDelta::FromSeconds(0));
+
+ // On system resume, we expect unmount and then mount immediately.
+ // During the phase, we expect the disk is remounting.
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::UNMOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint1);
+ EXPECT_TRUE(mounted_disk_monitor_->DiskIsRemounting(*disk1_ptr));
+
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::MOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint1);
+ EXPECT_TRUE(mounted_disk_monitor_->DiskIsRemounting(*disk1_ptr));
+
+ // New disk should not be "remounting."
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk2_ptr));
+ mounted_disk_monitor_->OnMountEvent(
+ chromeos::disks::DiskMountManager::MOUNTING,
+ chromeos::MOUNT_ERROR_NONE,
+ kMountPoint2);
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk2_ptr));
+
+ // After certain period, remounting state should be cleared.
+ base::RunLoop().RunUntilIdle(); // Emulate time passage.
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk1_ptr));
+ EXPECT_FALSE(mounted_disk_monitor_->DiskIsRemounting(*disk2_ptr));
+}
+
+} // namespace file_manager
« no previous file with comments | « chrome/browser/chromeos/file_manager/mounted_disk_monitor.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698