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