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

Side by Side Diff: chrome/browser/chromeos/file_system_provider/service_unittest.cc

Issue 210803003: [fsp] Decouple file_service_provider::Service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system .h"
11 #include "chrome/browser/chromeos/file_system_provider/mount_path_util.h"
10 #include "chrome/browser/chromeos/file_system_provider/observer.h" 12 #include "chrome/browser/chromeos/file_system_provider/observer.h"
11 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h" 13 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info .h"
12 #include "chrome/browser/chromeos/file_system_provider/service.h" 14 #include "chrome/browser/chromeos/file_system_provider/service.h"
13 #include "chrome/browser/chromeos/login/fake_user_manager.h" 15 #include "chrome/browser/chromeos/login/fake_user_manager.h"
14 #include "chrome/test/base/testing_profile.h" 16 #include "chrome/test/base/testing_profile.h"
15 #include "content/public/test/test_browser_thread_bundle.h" 17 #include "content/public/test/test_browser_thread_bundle.h"
16 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
17 #include "webkit/browser/fileapi/external_mount_points.h" 19 #include "webkit/browser/fileapi/external_mount_points.h"
18 20
19 namespace chromeos { 21 namespace chromeos {
20 namespace file_system_provider { 22 namespace file_system_provider {
21 namespace { 23 namespace {
22 24
23 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj"; 25 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
24 const char kFileSystemName[] = "Camera Pictures"; 26 const char kFileSystemName[] = "Camera Pictures";
25 27
26 // Utility observer, logging events from file_system_provider::Service. 28 // Utility observer, logging events from file_system_provider::Service.
27 class LoggingObserver : public Observer { 29 class LoggingObserver : public Observer {
28 public: 30 public:
29 class Event { 31 class Event {
30 public: 32 public:
31 Event(const ProvidedFileSystem& file_system, base::File::Error error) 33 Event(const ProvidedFileSystemInfo& file_system_info,
32 : file_system_(file_system), error_(error) {} 34 base::File::Error error)
35 : file_system_info_(file_system_info), error_(error) {}
33 ~Event() {} 36 ~Event() {}
34 37
35 const ProvidedFileSystem& file_system() { return file_system_; } 38 const ProvidedFileSystemInfo& file_system_info() {
39 return file_system_info_;
40 }
36 base::File::Error error() { return error_; } 41 base::File::Error error() { return error_; }
37 42
38 private: 43 private:
39 ProvidedFileSystem file_system_; 44 ProvidedFileSystemInfo file_system_info_;
40 base::File::Error error_; 45 base::File::Error error_;
41 }; 46 };
42 47
43 LoggingObserver() {} 48 LoggingObserver() {}
44 virtual ~LoggingObserver() {} 49 virtual ~LoggingObserver() {}
45 50
46 // file_system_provider::Observer overrides. 51 // file_system_provider::Observer overrides.
47 virtual void OnProvidedFileSystemMount(const ProvidedFileSystem& file_system, 52 virtual void OnProvidedFileSystemMount(
48 base::File::Error error) OVERRIDE { 53 const ProvidedFileSystemInfo& file_system_info,
49 mounts.push_back(Event(file_system, error)); 54 base::File::Error error) OVERRIDE {
55 mounts.push_back(Event(file_system_info, error));
50 } 56 }
51 57
52 virtual void OnProvidedFileSystemUnmount( 58 virtual void OnProvidedFileSystemUnmount(
53 const ProvidedFileSystem& file_system, 59 const ProvidedFileSystemInfo& file_system_info,
54 base::File::Error error) OVERRIDE { 60 base::File::Error error) OVERRIDE {
55 unmounts.push_back(Event(file_system, error)); 61 unmounts.push_back(Event(file_system_info, error));
56 } 62 }
57 63
58 std::vector<Event> mounts; 64 std::vector<Event> mounts;
59 std::vector<Event> unmounts; 65 std::vector<Event> unmounts;
60 }; 66 };
61 67
62 } // namespace 68 } // namespace
63 69
64 class FileSystemProviderServiceTest : public testing::Test { 70 class FileSystemProviderServiceTest : public testing::Test {
65 protected: 71 protected:
66 FileSystemProviderServiceTest() {} 72 FileSystemProviderServiceTest() {}
67 virtual ~FileSystemProviderServiceTest() {} 73 virtual ~FileSystemProviderServiceTest() {}
68 74
69 virtual void SetUp() OVERRIDE { 75 virtual void SetUp() OVERRIDE {
70 user_manager_ = new FakeUserManager(); 76 user_manager_ = new FakeUserManager();
71 user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_)); 77 user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
72 profile_.reset(new TestingProfile); 78 profile_.reset(new TestingProfile);
73 user_manager_->AddUser(profile_->GetProfileName()); 79 user_manager_->AddUser(profile_->GetProfileName());
74 file_system_provider_service_.reset(new Service(profile_.get())); 80 file_system_provider_service_.reset(Service::CreateForTesting(
81 profile_.get(),
82 scoped_ptr<ProvidedFileSystemFactoryInterface>(
83 new FakeProvidedFileSystemFactory)));
75 } 84 }
76 85
77 virtual void TearDown() { 86 virtual void TearDown() {
78 fileapi::ExternalMountPoints::GetSystemInstance()->RevokeAllFileSystems(); 87 fileapi::ExternalMountPoints::GetSystemInstance()->RevokeAllFileSystems();
79 } 88 }
80 89
81 content::TestBrowserThreadBundle thread_bundle_; 90 content::TestBrowserThreadBundle thread_bundle_;
82 scoped_ptr<TestingProfile> profile_; 91 scoped_ptr<TestingProfile> profile_;
83 scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_; 92 scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
84 FakeUserManager* user_manager_; 93 FakeUserManager* user_manager_;
85 scoped_ptr<Service> file_system_provider_service_; 94 scoped_ptr<Service> file_system_provider_service_;
86 }; 95 };
87 96
88 TEST_F(FileSystemProviderServiceTest, MountFileSystem) { 97 TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
89 LoggingObserver observer; 98 LoggingObserver observer;
90 file_system_provider_service_->AddObserver(&observer); 99 file_system_provider_service_->AddObserver(&observer);
91 100
92 int file_system_id = file_system_provider_service_->MountFileSystem( 101 int file_system_id = file_system_provider_service_->MountFileSystem(
93 kExtensionId, kFileSystemName); 102 kExtensionId, kFileSystemName);
94 103
95 EXPECT_LT(0, file_system_id); 104 EXPECT_LT(0, file_system_id);
96 ASSERT_EQ(1u, observer.mounts.size()); 105 ASSERT_EQ(1u, observer.mounts.size());
97 EXPECT_EQ(kExtensionId, observer.mounts[0].file_system().extension_id()); 106 EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
98 EXPECT_EQ(1, observer.mounts[0].file_system().file_system_id()); 107 EXPECT_EQ(1, observer.mounts[0].file_system_info().file_system_id());
99 EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash", 108 base::FilePath expected_mount_path =
100 observer.mounts[0].file_system().mount_path().AsUTF8Unsafe()); 109 util::GetMountPointPath(profile_.get(), kExtensionId, file_system_id);
110 EXPECT_EQ(expected_mount_path.AsUTF8Unsafe(),
111 observer.mounts[0].file_system_info().mount_path().AsUTF8Unsafe());
101 EXPECT_EQ(kFileSystemName, 112 EXPECT_EQ(kFileSystemName,
102 observer.mounts[0].file_system().file_system_name()); 113 observer.mounts[0].file_system_info().file_system_name());
103 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error()); 114 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
104 ASSERT_EQ(0u, observer.unmounts.size()); 115 ASSERT_EQ(0u, observer.unmounts.size());
105 116
106 std::vector<ProvidedFileSystem> provided_file_systems = 117 std::vector<ProvidedFileSystemInfo> file_system_info_list =
107 file_system_provider_service_->GetMountedFileSystems(); 118 file_system_provider_service_->GetProvidedFileSystemInfoList();
108 ASSERT_EQ(1u, provided_file_systems.size()); 119 ASSERT_EQ(1u, file_system_info_list.size());
109 120
110 file_system_provider_service_->RemoveObserver(&observer); 121 file_system_provider_service_->RemoveObserver(&observer);
111 } 122 }
112 123
113 TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) { 124 TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
114 LoggingObserver observer; 125 LoggingObserver observer;
115 file_system_provider_service_->AddObserver(&observer); 126 file_system_provider_service_->AddObserver(&observer);
116 127
117 int file_system_first_id = file_system_provider_service_->MountFileSystem( 128 int file_system_first_id = file_system_provider_service_->MountFileSystem(
118 kExtensionId, kFileSystemName); 129 kExtensionId, kFileSystemName);
119 EXPECT_LT(0, file_system_first_id); 130 EXPECT_LT(0, file_system_first_id);
120 131
121 int file_system_second_id = file_system_provider_service_->MountFileSystem( 132 int file_system_second_id = file_system_provider_service_->MountFileSystem(
122 kExtensionId, kFileSystemName); 133 kExtensionId, kFileSystemName);
123 EXPECT_LT(0, file_system_second_id); 134 EXPECT_LT(0, file_system_second_id);
124 135
125 EXPECT_NE(file_system_first_id, file_system_second_id); 136 EXPECT_NE(file_system_first_id, file_system_second_id);
126 ASSERT_EQ(2u, observer.mounts.size()); 137 ASSERT_EQ(2u, observer.mounts.size());
127 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error()); 138 EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
128 EXPECT_EQ(base::File::FILE_OK, observer.mounts[1].error()); 139 EXPECT_EQ(base::File::FILE_OK, observer.mounts[1].error());
129 140
130 std::vector<ProvidedFileSystem> provided_file_systems = 141 std::vector<ProvidedFileSystemInfo> file_system_info_list =
131 file_system_provider_service_->GetMountedFileSystems(); 142 file_system_provider_service_->GetProvidedFileSystemInfoList();
132 ASSERT_EQ(2u, provided_file_systems.size()); 143 ASSERT_EQ(2u, file_system_info_list.size());
133 144
134 file_system_provider_service_->RemoveObserver(&observer); 145 file_system_provider_service_->RemoveObserver(&observer);
135 } 146 }
136 147
137 TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) { 148 TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
138 LoggingObserver observer; 149 LoggingObserver observer;
139 file_system_provider_service_->AddObserver(&observer); 150 file_system_provider_service_->AddObserver(&observer);
140 151
141 const size_t kMaxFileSystems = 16; 152 const size_t kMaxFileSystems = 16;
142 for (size_t i = 0; i < kMaxFileSystems; ++i) { 153 for (size_t i = 0; i < kMaxFileSystems; ++i) {
143 int file_system_id = file_system_provider_service_->MountFileSystem( 154 int file_system_id = file_system_provider_service_->MountFileSystem(
144 kExtensionId, kFileSystemName); 155 kExtensionId, kFileSystemName);
145 EXPECT_LT(0, file_system_id); 156 EXPECT_LT(0, file_system_id);
146 } 157 }
147 ASSERT_EQ(kMaxFileSystems, observer.mounts.size()); 158 ASSERT_EQ(kMaxFileSystems, observer.mounts.size());
148 159
149 // The next file system is out of limit, and registering it should fail. 160 // The next file system is out of limit, and registering it should fail.
150 int file_system_id = file_system_provider_service_->MountFileSystem( 161 int file_system_id = file_system_provider_service_->MountFileSystem(
151 kExtensionId, kFileSystemName); 162 kExtensionId, kFileSystemName);
152 EXPECT_EQ(0, file_system_id); 163 EXPECT_EQ(0, file_system_id);
153 164
154 ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size()); 165 ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size());
155 EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, 166 EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED,
156 observer.mounts[kMaxFileSystems].error()); 167 observer.mounts[kMaxFileSystems].error());
157 ASSERT_EQ(kMaxFileSystems,
158 file_system_provider_service_->GetMountedFileSystems().size());
159 168
160 std::vector<ProvidedFileSystem> provided_file_systems = 169 std::vector<ProvidedFileSystemInfo> file_system_info_list =
161 file_system_provider_service_->GetMountedFileSystems(); 170 file_system_provider_service_->GetProvidedFileSystemInfoList();
162 ASSERT_EQ(kMaxFileSystems, provided_file_systems.size()); 171 ASSERT_EQ(kMaxFileSystems, file_system_info_list.size());
163 172
164 file_system_provider_service_->RemoveObserver(&observer); 173 file_system_provider_service_->RemoveObserver(&observer);
165 } 174 }
166 175
167 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) { 176 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
168 LoggingObserver observer; 177 LoggingObserver observer;
169 file_system_provider_service_->AddObserver(&observer); 178 file_system_provider_service_->AddObserver(&observer);
170 179
171 int file_system_id = file_system_provider_service_->MountFileSystem( 180 int file_system_id = file_system_provider_service_->MountFileSystem(
172 kExtensionId, kFileSystemName); 181 kExtensionId, kFileSystemName);
173 EXPECT_LT(0, file_system_id); 182 EXPECT_LT(0, file_system_id);
174 ASSERT_EQ(1u, observer.mounts.size()); 183 ASSERT_EQ(1u, observer.mounts.size());
175 184
176 const bool result = file_system_provider_service_->UnmountFileSystem( 185 const bool result = file_system_provider_service_->UnmountFileSystem(
177 kExtensionId, file_system_id); 186 kExtensionId, file_system_id);
178 EXPECT_TRUE(result); 187 EXPECT_TRUE(result);
179 ASSERT_EQ(1u, observer.unmounts.size()); 188 ASSERT_EQ(1u, observer.unmounts.size());
180 EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error()); 189 EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
181 190
182 EXPECT_EQ(kExtensionId, observer.unmounts[0].file_system().extension_id()); 191 EXPECT_EQ(kExtensionId,
183 EXPECT_EQ(1, observer.unmounts[0].file_system().file_system_id()); 192 observer.unmounts[0].file_system_info().extension_id());
184 EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash", 193 EXPECT_EQ(1, observer.unmounts[0].file_system_info().file_system_id());
185 observer.unmounts[0].file_system().mount_path().AsUTF8Unsafe()); 194 base::FilePath expected_mount_path =
195 util::GetMountPointPath(profile_.get(), kExtensionId, file_system_id);
196 EXPECT_EQ(
197 expected_mount_path.AsUTF8Unsafe(),
198 observer.unmounts[0].file_system_info().mount_path().AsUTF8Unsafe());
186 EXPECT_EQ(kFileSystemName, 199 EXPECT_EQ(kFileSystemName,
187 observer.unmounts[0].file_system().file_system_name()); 200 observer.unmounts[0].file_system_info().file_system_name());
188 201
189 std::vector<ProvidedFileSystem> provided_file_systems = 202 std::vector<ProvidedFileSystemInfo> file_system_info_list =
190 file_system_provider_service_->GetMountedFileSystems(); 203 file_system_provider_service_->GetProvidedFileSystemInfoList();
191 ASSERT_EQ(0u, provided_file_systems.size()); 204 ASSERT_EQ(0u, file_system_info_list.size());
192 205
193 file_system_provider_service_->RemoveObserver(&observer); 206 file_system_provider_service_->RemoveObserver(&observer);
194 } 207 }
195 208
196 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) { 209 TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
197 LoggingObserver observer; 210 LoggingObserver observer;
198 file_system_provider_service_->AddObserver(&observer); 211 file_system_provider_service_->AddObserver(&observer);
199 212
200 const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe"; 213 const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
201 214
202 int file_system_id = file_system_provider_service_->MountFileSystem( 215 int file_system_id = file_system_provider_service_->MountFileSystem(
203 kExtensionId, kFileSystemName); 216 kExtensionId, kFileSystemName);
204 EXPECT_LT(0, file_system_id); 217 EXPECT_LT(0, file_system_id);
205 ASSERT_EQ(1u, observer.mounts.size()); 218 ASSERT_EQ(1u, observer.mounts.size());
206 ASSERT_EQ(1u, file_system_provider_service_->GetMountedFileSystems().size()); 219 ASSERT_EQ(
220 1u,
221 file_system_provider_service_->GetProvidedFileSystemInfoList().size());
207 222
208 const bool result = file_system_provider_service_->UnmountFileSystem( 223 const bool result = file_system_provider_service_->UnmountFileSystem(
209 kWrongExtensionId, file_system_id); 224 kWrongExtensionId, file_system_id);
210 EXPECT_FALSE(result); 225 EXPECT_FALSE(result);
211 ASSERT_EQ(1u, observer.unmounts.size()); 226 ASSERT_EQ(1u, observer.unmounts.size());
212 EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, observer.unmounts[0].error()); 227 EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, observer.unmounts[0].error());
213 ASSERT_EQ(1u, file_system_provider_service_->GetMountedFileSystems().size()); 228 ASSERT_EQ(
229 1u,
230 file_system_provider_service_->GetProvidedFileSystemInfoList().size());
214 231
215 std::vector<ProvidedFileSystem> provided_file_systems = 232 std::vector<ProvidedFileSystemInfo> file_system_info_list =
216 file_system_provider_service_->GetMountedFileSystems(); 233 file_system_provider_service_->GetProvidedFileSystemInfoList();
217 ASSERT_EQ(1u, provided_file_systems.size()); 234 ASSERT_EQ(1u, file_system_info_list.size());
218 235
219 file_system_provider_service_->RemoveObserver(&observer); 236 file_system_provider_service_->RemoveObserver(&observer);
220 } 237 }
221 238
222 } // namespace file_system_provider 239 } // namespace file_system_provider
223 } // namespace chromeos 240 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698