Store correct read-only flag of mounted disks.

chromeos/disks/disk_mount_manager_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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chromeos::disks::DiskMountManager;
 using chromeos::CrosDisksClient;
 using chromeos::DBusThreadManager;
 using chromeos::FakeCrosDisksClient;
 using testing::_;
 using testing::Field;
 using testing::InSequence;
+using testing::InvokeWithoutArgs;
 
 namespace {
 
 const char kReadOnlyMountpath[] = "/device/read_only_mount_path";
 const char kReadOnlyDeviceSource[] = "/device/read_only_source_path";
 
 // Holds information needed to create a DiskMountManager::Disk instance.
 struct TestDiskInfo {
   const char* source_path;
   const char* mount_path;
@@ skipping 35 matching lines @@
     "/device/device_label",
     "/device/drive_label",
     "/device/vendor_id",
     "/device/vendor_name",
     "/device/product_id",
     "/device/product_name",
     "/device/fs_uuid",
     "/device/prefix",
     chromeos::DEVICE_TYPE_USB,
     1073741824,  // size in bytes
-    false,  // is parent
-    false,  // is read only
-    true,   // has media
-    false,  // is on boot device
-    true,  // is on removable device
-    false  // is hidden
+    false,       // is parent
+    false,       // is read only
+    true,        // has media
+    false,       // is on boot device
+    true,        // is on removable device
+    false        // is hidden
+  },
+  {
+    "/device/source_path2",
+    "/device/mount_path2",
+    "/device/prefix/system_path2",
+    "/device/file_path2",
+    "/device/device_label2",
+    "/device/drive_label2",
+    "/device/vendor_id2",
+    "/device/vendor_name2",
+    "/device/product_id2",
+    "/device/product_name2",
+    "/device/fs_uuid2",
+    "/device/prefix2",
+    chromeos::DEVICE_TYPE_SD,
+    1073741824,  // size in bytes
+    false,       // is parent
+    false,       // is read only
+    true,        // has media
+    false,       // is on boot device
+    true,        // is on removable device
+    false        // is hidden
   },
   {
     kReadOnlyDeviceSource,
     kReadOnlyMountpath,
-    "/device/prefix/system_path_2",
-    "/device/file_path_2",
-    "/device/device_label_2",
-    "/device/drive_label_2",
-    "/device/vendor_id_2",
-    "/device/vendor_name_2",
-    "/device/product_id_2",
-    "/device/product_name_2",
-    "/device/fs_uuid_2",
+    "/device/prefix/system_path_3",
+    "/device/file_path_3",
+    "/device/device_label_3",
+    "/device/drive_label_3",
+    "/device/vendor_id_3",
+    "/device/vendor_name_3",
+    "/device/product_id_3",
+    "/device/product_name_3",
+    "/device/fs_uuid_3",
     "/device/prefix",
     chromeos::DEVICE_TYPE_USB,
     1073741824,  // size in bytes
-    false,  // is parent
-    true,  // is read only
-    true,  // has media
-    false,  // is on boot device
-    true,  // is on removable device
-    false  // is hidden
+    false,       // is parent
+    true,        // is read only
+    true,        // has media
+    false,       // is on boot device
+    true,        // is on removable device
+    false        // is hidden
   },
 };
 
 // List of mount points  held in DiskMountManager at the begining of the test.
 const TestMountPointInfo kTestMountPoints[] = {
   {
     "/archive/source_path",
     "/archive/mount_path",
     chromeos::MOUNT_TYPE_ARCHIVE,
     chromeos::disks::MOUNT_CONDITION_NONE
@@ skipping 24 matching lines @@
   MOCK_METHOD3(OnMountEvent,
       void(DiskMountManager::MountEvent event,
            chromeos::MountError error_code,
            const DiskMountManager::MountPointInfo& mount_point));
   MOCK_METHOD3(OnFormatEvent,
       void(DiskMountManager::FormatEvent event,
            chromeos::FormatError error_code,
            const std::string& device_path));
 };
 
+// Expect |is_read_only| value of a disk object keyed by |source_path|.
+void ExpectDiskReadOnly(const DiskMountManager* manager,
+                        const std::string& source_path,
+                        bool expected) {
+  EXPECT_EQ(expected,
+            manager->disks().find(source_path)->second->is_read_only());
+}
+
 class DiskMountManagerTest : public testing::Test {
  public:
   DiskMountManagerTest() {}
   ~DiskMountManagerTest() override {}
 
   // Sets up test dbus tread manager and disks mount manager.
   // Initializes disk mount manager disks and mount points.
   // Adds a test observer to the disk mount manager.
   void SetUp() override {
     fake_cros_disks_client_ = new FakeCrosDisksClient;
@@ skipping 453 matching lines @@
   EXPECT_EQ(2, fake_cros_disks_client_->format_call_count());
   EXPECT_EQ("/device/source_path",
             fake_cros_disks_client_->last_format_device_path());
   EXPECT_EQ("vfat", fake_cros_disks_client_->last_format_filesystem());
 
   // Simulate cros_disks reporting success.
   fake_cros_disks_client_->SendFormatCompletedEvent(
       chromeos::FORMAT_ERROR_NONE, "/device/source_path");
 }
 
+TEST_F(DiskMountManagerTest, MountPath_RecordAccessMode) {
+  DiskMountManager* manager = DiskMountManager::GetInstance();
+  const std::string kSourcePath1 = "/device/source_path";
+  const std::string kSourcePath2 = "/device/source_path2";
+  const std::string kSourceFormat = std::string();
+  const std::string kMountLabel = std::string();  // N/A for MOUNT_TYPE_DEVICE
+  // For MountCompleted. Must be non-empty strings.
+  const std::string kMountPath1 = "/media/foo";
+  const std::string kMountPath2 = "/media/bar";
+
+  EXPECT_CALL(
+      observer_,
+      OnMountEvent(
+          DiskMountManager::MOUNTING, chromeos::MOUNT_ERROR_NONE,
+          Field(&DiskMountManager::MountPointInfo::mount_path, kMountPath1)));
+  // Observers should see updated disks_ object reflecting mount option.
+  EXPECT_CALL(
+      observer_,
+      OnMountEvent(
+          DiskMountManager::MOUNTING, chromeos::MOUNT_ERROR_NONE,
+          Field(&DiskMountManager::MountPointInfo::mount_path, kMountPath2)))
+      .WillOnce(InvokeWithoutArgs(
+          [&]() { ExpectDiskReadOnly(manager, kSourcePath2, true); }));

[satorux1, 2016/08/24 22:05:50]

hmm, this is hard to read... Please add some comment here what this code does.

I'd like use of GMock removed from this file but it'd be a separate task.

+
+  manager->MountPath(kSourcePath1, kSourceFormat, std::string(),
+                     chromeos::MOUNT_TYPE_DEVICE,
+                     chromeos::MOUNT_ACCESS_MODE_READ_WRITE);
+  manager->MountPath(kSourcePath2, kSourceFormat, std::string(),
+                     chromeos::MOUNT_TYPE_DEVICE,
+                     chromeos::MOUNT_ACCESS_MODE_READ_ONLY);
+  // Simulate cros_disks reporting mount completed.
+  fake_cros_disks_client_->SendMountCompletedEvent(
+      chromeos::MOUNT_ERROR_NONE, kSourcePath1, chromeos::MOUNT_TYPE_DEVICE,
+      kMountPath1);
+  fake_cros_disks_client_->SendMountCompletedEvent(
+      chromeos::MOUNT_ERROR_NONE, kSourcePath2, chromeos::MOUNT_TYPE_DEVICE,
+      kMountPath2);
+
+  const DiskMountManager::DiskMap& disks = manager->disks();
+  ASSERT_GT(disks.count(kSourcePath1), 0U);
+  EXPECT_FALSE(disks.find(kSourcePath1)->second->is_read_only());
+  ASSERT_GT(disks.count(kSourcePath2), 0U);
+  EXPECT_TRUE(disks.find(kSourcePath2)->second->is_read_only());
+}
+
 }  // namespace