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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/file_system_provider/service_unittest.cc

Issue 334263017: [fsp] Remember mounted file systems as soon as possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 5 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_system_provider/service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_system_provider/service_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index c6673d92d703c0d121885abc027ec45971323712..69653dbcbeac28d236da8b2aa2241d949aa7853d 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -31,9 +31,13 @@ namespace file_system_provider {
namespace {
const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
-const char kFileSystemId[] = "camera/pictures/id !@#$%^&*()_+";
const char kFileSystemName[] = "Camera Pictures";
+// The dot in the file system ID is there in order to check that saving to
+// preferences works correctly. File System ID is used as a key in
+// a base::DictionaryValue, so it has to be stored without path expansion.
+const char kFileSystemId[] = "camera/pictures/id .!@#$%^&*()_+";
+
// Utility observer, logging events from file_system_provider::Service.
class LoggingObserver : public Observer {
public:
@@ -98,11 +102,11 @@ void RememberFakeFileSystem(TestingProfile* profile,
ASSERT_TRUE(pref_service);
base::DictionaryValue extensions;
- base::ListValue* file_systems = new base::ListValue();
+ base::DictionaryValue* file_systems = new base::DictionaryValue();
base::DictionaryValue* file_system = new base::DictionaryValue();
file_system->SetString(kPrefKeyFileSystemId, kFileSystemId);
file_system->SetString(kPrefKeyFileSystemName, kFileSystemName);
- file_systems->Append(file_system);
+ file_systems->SetWithoutPathExpansion(kFileSystemId, file_system);
extensions.Set(kExtensionId, file_systems);
pref_service->Set(prefs::kFileSystemProviderMounted, extensions);
@@ -122,9 +126,8 @@ class FileSystemProviderServiceTest : public testing::Test {
user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
extension_registry_.reset(
new extensions::ExtensionRegistry(profile_.get()));
- file_system_provider_service_.reset(
- new Service(profile_.get(), extension_registry_.get()));
- file_system_provider_service_->SetFileSystemFactoryForTesting(
+ service_.reset(new Service(profile_.get(), extension_registry_.get()));
+ service_->SetFileSystemFactoryForTesting(
base::Bind(&FakeProvidedFileSystem::Create));
extension_ = createFakeExtension(kExtensionId);
}
@@ -134,16 +137,16 @@ class FileSystemProviderServiceTest : public testing::Test {
FakeUserManager* user_manager_;
scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
scoped_ptr<extensions::ExtensionRegistry> extension_registry_;
- scoped_ptr<Service> file_system_provider_service_;
+ scoped_ptr<Service> service_;
scoped_refptr<extensions::Extension> extension_;
};
TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_TRUE(result);
ASSERT_EQ(1u, observer.mounts.size());
@@ -160,22 +163,22 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
ASSERT_EQ(0u, observer.unmounts.size());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(1u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_TRUE(result);
- const bool second_result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool second_result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_FALSE(second_result);
ASSERT_EQ(2u, observer.mounts.size());
@@ -183,29 +186,29 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
EXPECT_EQ(base::File::FILE_ERROR_EXISTS, observer.mounts[1].error());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(1u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
const size_t kMaxFileSystems = 16;
for (size_t i = 0; i < kMaxFileSystems; ++i) {
const std::string file_system_id =
std::string("test-") + base::IntToString(i);
- const bool result = file_system_provider_service_->MountFileSystem(
+ const bool result = service_->MountFileSystem(
kExtensionId, file_system_id, kFileSystemName);
EXPECT_TRUE(result);
}
ASSERT_EQ(kMaxFileSystems, observer.mounts.size());
// The next file system is out of limit, and registering it should fail.
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_FALSE(result);
ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size());
@@ -213,23 +216,23 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
observer.mounts[kMaxFileSystems].error());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(kMaxFileSystems, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_TRUE(result);
ASSERT_EQ(1u, observer.mounts.size());
- const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
- kExtensionId, kFileSystemId);
+ const bool unmount_result = service_->UnmountFileSystem(
+ kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
EXPECT_TRUE(unmount_result);
ASSERT_EQ(1u, observer.unmounts.size());
EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
@@ -240,23 +243,23 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
observer.unmounts[0].file_system_info().file_system_id());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(0u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_TRUE(result);
ASSERT_EQ(1u, observer.mounts.size());
// Directly call the observer's method.
- file_system_provider_service_->OnExtensionUnloaded(
+ service_->OnExtensionUnloaded(
profile_.get(),
extension_.get(),
extensions::UnloadedExtensionInfo::REASON_DISABLE);
@@ -270,55 +273,58 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
observer.unmounts[0].file_system_info().file_system_id());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(0u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
+ service_->AddObserver(&observer);
const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
- const bool result = file_system_provider_service_->MountFileSystem(
- kExtensionId, kFileSystemId, kFileSystemName);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
EXPECT_TRUE(result);
ASSERT_EQ(1u, observer.mounts.size());
- ASSERT_EQ(
- 1u,
- file_system_provider_service_->GetProvidedFileSystemInfoList().size());
+ ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
- const bool unmount_result = file_system_provider_service_->UnmountFileSystem(
- kWrongExtensionId, kFileSystemId);
+ const bool unmount_result = service_->UnmountFileSystem(
+ kWrongExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
EXPECT_FALSE(unmount_result);
ASSERT_EQ(1u, observer.unmounts.size());
EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, observer.unmounts[0].error());
- ASSERT_EQ(
- 1u,
- file_system_provider_service_->GetProvidedFileSystemInfoList().size());
+ ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ service_->GetProvidedFileSystemInfoList();
ASSERT_EQ(1u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ service_->RemoveObserver(&observer);
}
TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
- LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
-
// Create a fake entry in the preferences.
RememberFakeFileSystem(
profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
+ // Create a new service instance in order to load remembered file systems
+ // from preferences.
+ scoped_ptr<Service> file_system_provider_service(
+ new Service(profile_.get(), extension_registry_.get()));
+ LoggingObserver observer;
+ file_system_provider_service->AddObserver(&observer);
+
+ file_system_provider_service->SetFileSystemFactoryForTesting(
+ base::Bind(&FakeProvidedFileSystem::Create));
+
EXPECT_EQ(0u, observer.mounts.size());
// Directly call the observer's method.
- file_system_provider_service_->OnExtensionLoaded(profile_.get(),
- extension_.get());
+ file_system_provider_service->OnExtensionLoaded(profile_.get(),
+ extension_.get());
ASSERT_EQ(1u, observer.mounts.size());
EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
@@ -328,86 +334,127 @@ TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
observer.mounts[0].file_system_info().file_system_id());
std::vector<ProvidedFileSystemInfo> file_system_info_list =
- file_system_provider_service_->GetProvidedFileSystemInfoList();
+ file_system_provider_service->GetProvidedFileSystemInfoList();
ASSERT_EQ(1u, file_system_info_list.size());
- file_system_provider_service_->RemoveObserver(&observer);
+ file_system_provider_service->RemoveObserver(&observer);
}
-TEST_F(FileSystemProviderServiceTest, ForgetFileSystem_OnExtensionUnload) {
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnMount) {
LoggingObserver observer;
- file_system_provider_service_->AddObserver(&observer);
-
- // Create a fake entry in the preferences.
- RememberFakeFileSystem(
- profile_.get(), kExtensionId, kFileSystemId, kFileSystemName);
-
- // Directly call the observer's methods.
- file_system_provider_service_->OnExtensionLoaded(profile_.get(),
- extension_.get());
-
- file_system_provider_service_->OnExtensionUnloaded(
- profile_.get(),
- extension_.get(),
- extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ service_->AddObserver(&observer);
+ const bool result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+ EXPECT_TRUE(result);
hashimoto 2014/07/07 11:07:46 nit: EXPECT_TRUE(service_->MountFileSystem())?
mtomasz 2014/07/08 01:52:09 Done.
ASSERT_EQ(1u, observer.mounts.size());
- EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
- ASSERT_EQ(1u, observer.unmounts.size());
- EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
- TestingPrefServiceSyncable* pref_service = profile_->GetTestingPrefService();
+ TestingPrefServiceSyncable* const pref_service =
hashimoto 2014/07/07 11:07:46 nit: No need to have const here. We don't usually
mtomasz 2014/07/08 01:52:09 I try to keep File System Provider API code const
+ profile_->GetTestingPrefService();
ASSERT_TRUE(pref_service);
- const base::DictionaryValue* extensions =
+ const base::DictionaryValue* const extensions =
pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
ASSERT_TRUE(extensions);
- const base::ListValue* file_systems;
- EXPECT_FALSE(extensions->GetList(kExtensionId, &file_systems));
+ const base::DictionaryValue* file_systems;
hashimoto 2014/07/07 11:07:46 nit: Initialize with NULL.
mtomasz 2014/07/08 01:52:09 Done.
+ ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+ ASSERT_EQ(1u, file_systems->size());
hashimoto 2014/07/07 11:07:46 nit: Can be EXPECT.
mtomasz 2014/07/08 01:52:09 Done.
+
+ const base::Value* file_system_value = NULL;
+ const base::DictionaryValue* file_system = NULL;
+ ASSERT_TRUE(
+ file_systems->GetWithoutPathExpansion(kFileSystemId, &file_system_value));
+ ASSERT_TRUE(file_system_value->GetAsDictionary(&file_system));
- file_system_provider_service_->RemoveObserver(&observer);
+ std::string file_system_id;
+ file_system->GetString(kPrefKeyFileSystemId, &file_system_id);
+ EXPECT_EQ(kFileSystemId, file_system_id);
+
+ std::string file_system_name;
+ file_system->GetString(kPrefKeyFileSystemName, &file_system_name);
+ EXPECT_EQ(kFileSystemName, file_system_name);
+
+ service_->RemoveObserver(&observer);
}
-TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnShutdown) {
- {
- scoped_ptr<Service> service(
- new Service(profile_.get(), extension_registry_.get()));
- service->SetFileSystemFactoryForTesting(
- base::Bind(&FakeProvidedFileSystem::Create));
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountOnShutdown) {
+ LoggingObserver observer;
+ service_->AddObserver(&observer);
- LoggingObserver observer;
- service->AddObserver(&observer);
+ TestingPrefServiceSyncable* const pref_service =
+ profile_->GetTestingPrefService();
+ ASSERT_TRUE(pref_service);
- const bool result =
- service->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
- EXPECT_TRUE(result);
+ {
hashimoto 2014/07/07 11:07:46 No need to have this scope.
mtomasz 2014/07/08 01:52:09 Having a scope here allows to have the same variab
+ const bool mount_result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+ EXPECT_TRUE(mount_result);
ASSERT_EQ(1u, observer.mounts.size());
- service->RemoveObserver(&observer);
+ const base::DictionaryValue* extensions =
+ pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+ ASSERT_TRUE(extensions);
+
+ const base::DictionaryValue* file_systems;
hashimoto 2014/07/07 11:07:46 nit: Initialize with NULL.
mtomasz 2014/07/08 01:52:09 Done.
+ ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+ EXPECT_EQ(1u, file_systems->size());
}
- TestingPrefServiceSyncable* pref_service = profile_->GetTestingPrefService();
+ {
+ const bool unmount_result = service_->UnmountFileSystem(
+ kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_SHUTDOWN);
+ EXPECT_TRUE(unmount_result);
+
+ const base::DictionaryValue* const extensions =
+ pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+ ASSERT_TRUE(extensions);
+
+ const base::DictionaryValue* file_systems;
+ ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+ EXPECT_EQ(1u, file_systems->size());
+ }
+
+ service_->RemoveObserver(&observer);
+}
+
+TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountByUser) {
+ LoggingObserver observer;
+ service_->AddObserver(&observer);
+
+ TestingPrefServiceSyncable* const pref_service =
+ profile_->GetTestingPrefService();
ASSERT_TRUE(pref_service);
- const base::DictionaryValue* extensions =
- pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
- ASSERT_TRUE(extensions);
+ {
+ const bool mount_result =
+ service_->MountFileSystem(kExtensionId, kFileSystemId, kFileSystemName);
+ EXPECT_TRUE(mount_result);
+ ASSERT_EQ(1u, observer.mounts.size());
- const base::ListValue* file_systems;
- ASSERT_TRUE(extensions->GetList(kExtensionId, &file_systems));
- ASSERT_EQ(1u, file_systems->GetSize());
+ const base::DictionaryValue* extensions =
+ pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+ ASSERT_TRUE(extensions);
- const base::DictionaryValue* file_system = NULL;
- ASSERT_TRUE(file_systems->GetDictionary(0, &file_system));
+ const base::DictionaryValue* file_systems;
+ ASSERT_TRUE(extensions->GetDictionary(kExtensionId, &file_systems));
+ EXPECT_EQ(1u, file_systems->size());
+ }
- std::string file_system_id;
- file_system->GetString(kPrefKeyFileSystemId, &file_system_id);
- EXPECT_EQ(kFileSystemId, file_system_id);
+ {
+ const bool unmount_result = service_->UnmountFileSystem(
+ kExtensionId, kFileSystemId, Service::UNMOUNT_REASON_USER);
+ EXPECT_TRUE(unmount_result);
- std::string file_system_name;
- file_system->GetString(kPrefKeyFileSystemName, &file_system_name);
- EXPECT_EQ(kFileSystemName, file_system_name);
+ const base::DictionaryValue* const extensions =
+ pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
+ ASSERT_TRUE(extensions);
+
+ const base::DictionaryValue* file_systems;
+ EXPECT_FALSE(extensions->GetDictionary(kExtensionId, &file_systems));
+ }
+
+ service_->RemoveObserver(&observer);
}
} // namespace file_system_provider
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698