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

Side by Side Diff: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

Issue 164183004: Files.app: filter out zip archives mounted in other profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unittest Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/file_manager/volume_manager.h" 5 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 volume_manager_->Initialize(); // Adds "Downloads" 674 volume_manager_->Initialize(); // Adds "Downloads"
675 VolumeInfo volume_info; 675 VolumeInfo volume_info;
676 ASSERT_FALSE(volume_manager_->FindVolumeInfoById( 676 ASSERT_FALSE(volume_manager_->FindVolumeInfoById(
677 "nonexistent", &volume_info)); 677 "nonexistent", &volume_info));
678 ASSERT_TRUE(volume_manager_->FindVolumeInfoById( 678 ASSERT_TRUE(volume_manager_->FindVolumeInfoById(
679 "downloads:Downloads", &volume_info)); 679 "downloads:Downloads", &volume_info));
680 EXPECT_EQ("downloads:Downloads", volume_info.volume_id); 680 EXPECT_EQ("downloads:Downloads", volume_info.volume_id);
681 EXPECT_EQ(VOLUME_TYPE_DOWNLOADS_DIRECTORY, volume_info.type); 681 EXPECT_EQ(VOLUME_TYPE_DOWNLOADS_DIRECTORY, volume_info.type);
682 } 682 }
683 683
684 TEST_F(VolumeManagerTest, ArchiveSourceFiltering) {
685 LoggingObserver observer;
686 volume_manager_->AddObserver(&observer);
687
688 // Mount a USB stick.
689 volume_manager_->OnMountEvent(
690 chromeos::disks::DiskMountManager::MOUNTING,
691 chromeos::MOUNT_ERROR_NONE,
692 chromeos::disks::DiskMountManager::MountPointInfo(
693 "/removable/usb",
694 "/removable/usb",
695 chromeos::MOUNT_TYPE_DEVICE,
696 chromeos::disks::MOUNT_CONDITION_NONE));
697 // Mount a zip archive in the stick.
hirono 2014/02/14 05:10:44 nit: Need an empty line before #697?
kinaba 2014/02/14 05:20:19 Done.
698 volume_manager_->OnMountEvent(
699 chromeos::disks::DiskMountManager::MOUNTING,
700 chromeos::MOUNT_ERROR_NONE,
701 chromeos::disks::DiskMountManager::MountPointInfo(
702 "/removable/usb/1.zip",
703 "/archive/1",
704 chromeos::MOUNT_TYPE_ARCHIVE,
705 chromeos::disks::MOUNT_CONDITION_NONE));
706 VolumeInfo volume_info;
707 ASSERT_TRUE(volume_manager_->FindVolumeInfoById("archive:1", &volume_info));
708 EXPECT_EQ("/archive/1", volume_info.mount_path.AsUTF8Unsafe());
709 EXPECT_EQ(2u, observer.events().size());
710
711 // Mount a zip archive in the previous zip archive.
712 volume_manager_->OnMountEvent(
713 chromeos::disks::DiskMountManager::MOUNTING,
714 chromeos::MOUNT_ERROR_NONE,
715 chromeos::disks::DiskMountManager::MountPointInfo(
716 "/archive/1/2.zip",
717 "/archive/2",
718 chromeos::MOUNT_TYPE_ARCHIVE,
719 chromeos::disks::MOUNT_CONDITION_NONE));
720 ASSERT_TRUE(volume_manager_->FindVolumeInfoById("archive:2", &volume_info));
721 EXPECT_EQ("/archive/2", volume_info.mount_path.AsUTF8Unsafe());
722 EXPECT_EQ(3u, observer.events().size());
723
724 // A zip file is mounted from other profile. It must be ignored in the current
725 // VolumeManager.
726 volume_manager_->OnMountEvent(
727 chromeos::disks::DiskMountManager::MOUNTING,
728 chromeos::MOUNT_ERROR_NONE,
729 chromeos::disks::DiskMountManager::MountPointInfo(
730 "/other/profile/drive/folder/3.zip",
731 "/archive/3",
732 chromeos::MOUNT_TYPE_ARCHIVE,
733 chromeos::disks::MOUNT_CONDITION_NONE));
734 EXPECT_FALSE(volume_manager_->FindVolumeInfoById("archive:3", &volume_info));
735 EXPECT_EQ(3u, observer.events().size());
736 }
737
684 } // namespace file_manager 738 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698