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