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

Side by Side Diff: webkit/fileapi/sandbox_origin_database_unittest.cc

Issue 14885021: Cleanup: Prefix HTML5 Sandbox FileSystem related files with 'sandbox_' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« no previous file with comments | « webkit/fileapi/sandbox_origin_database.cc ('k') | webkit/fileapi/webkit_fileapi.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <functional> 6 #include <functional>
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/platform_file.h" 13 #include "base/platform_file.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "third_party/leveldatabase/src/db/filename.h" 16 #include "third_party/leveldatabase/src/db/filename.h"
17 #include "third_party/leveldatabase/src/include/leveldb/db.h" 17 #include "third_party/leveldatabase/src/include/leveldb/db.h"
18 #include "webkit/fileapi/file_system_database_test_helper.h"
19 #include "webkit/fileapi/file_system_origin_database.h"
20 #include "webkit/fileapi/file_system_util.h" 18 #include "webkit/fileapi/file_system_util.h"
19 #include "webkit/fileapi/sandbox_database_test_helper.h"
20 #include "webkit/fileapi/sandbox_origin_database.h"
21 21
22 namespace fileapi { 22 namespace fileapi {
23 23
24 namespace { 24 namespace {
25 const base::FilePath::CharType kFileSystemDirName[] = 25 const base::FilePath::CharType kFileSystemDirName[] =
26 FILE_PATH_LITERAL("File System"); 26 FILE_PATH_LITERAL("File System");
27 const base::FilePath::CharType kOriginDatabaseName[] = FILE_PATH_LITERAL("Origin s"); 27 const base::FilePath::CharType kOriginDatabaseName[] =
28 FILE_PATH_LITERAL("Origins");
28 } // namespace 29 } // namespace
29 30
30 TEST(FileSystemOriginDatabaseTest, BasicTest) { 31 TEST(SandboxOriginDatabaseTest, BasicTest) {
31 base::ScopedTempDir dir; 32 base::ScopedTempDir dir;
32 ASSERT_TRUE(dir.CreateUniqueTempDir()); 33 ASSERT_TRUE(dir.CreateUniqueTempDir());
33 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 34 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
34 EXPECT_FALSE(file_util::PathExists(kFSDir)); 35 EXPECT_FALSE(file_util::PathExists(kFSDir));
35 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 36 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
36 37
37 FileSystemOriginDatabase database(kFSDir); 38 SandboxOriginDatabase database(kFSDir);
38 std::string origin("origin"); 39 std::string origin("origin");
39 40
40 EXPECT_FALSE(database.HasOriginPath(origin)); 41 EXPECT_FALSE(database.HasOriginPath(origin));
41 // Double-check to make sure that had no side effects. 42 // Double-check to make sure that had no side effects.
42 EXPECT_FALSE(database.HasOriginPath(origin)); 43 EXPECT_FALSE(database.HasOriginPath(origin));
43 44
44 base::FilePath path0; 45 base::FilePath path0;
45 base::FilePath path1; 46 base::FilePath path1;
46 47
47 // Empty strings aren't valid origins. 48 // Empty strings aren't valid origins.
48 EXPECT_FALSE(database.GetPathForOrigin(std::string(), &path0)); 49 EXPECT_FALSE(database.GetPathForOrigin(std::string(), &path0));
49 50
50 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0)); 51 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
51 EXPECT_TRUE(database.HasOriginPath(origin)); 52 EXPECT_TRUE(database.HasOriginPath(origin));
52 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1)); 53 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
53 EXPECT_FALSE(path0.empty()); 54 EXPECT_FALSE(path0.empty());
54 EXPECT_FALSE(path1.empty()); 55 EXPECT_FALSE(path1.empty());
55 EXPECT_EQ(path0, path1); 56 EXPECT_EQ(path0, path1);
56 57
57 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName))); 58 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName)));
58 } 59 }
59 60
60 TEST(FileSystemOriginDatabaseTest, TwoPathTest) { 61 TEST(SandboxOriginDatabaseTest, TwoPathTest) {
61 base::ScopedTempDir dir; 62 base::ScopedTempDir dir;
62 ASSERT_TRUE(dir.CreateUniqueTempDir()); 63 ASSERT_TRUE(dir.CreateUniqueTempDir());
63 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 64 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
64 EXPECT_FALSE(file_util::PathExists(kFSDir)); 65 EXPECT_FALSE(file_util::PathExists(kFSDir));
65 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 66 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
66 67
67 FileSystemOriginDatabase database(kFSDir); 68 SandboxOriginDatabase database(kFSDir);
68 std::string origin0("origin0"); 69 std::string origin0("origin0");
69 std::string origin1("origin1"); 70 std::string origin1("origin1");
70 71
71 EXPECT_FALSE(database.HasOriginPath(origin0)); 72 EXPECT_FALSE(database.HasOriginPath(origin0));
72 EXPECT_FALSE(database.HasOriginPath(origin1)); 73 EXPECT_FALSE(database.HasOriginPath(origin1));
73 74
74 base::FilePath path0; 75 base::FilePath path0;
75 base::FilePath path1; 76 base::FilePath path1;
76 EXPECT_TRUE(database.GetPathForOrigin(origin0, &path0)); 77 EXPECT_TRUE(database.GetPathForOrigin(origin0, &path0));
77 EXPECT_TRUE(database.HasOriginPath(origin0)); 78 EXPECT_TRUE(database.HasOriginPath(origin0));
78 EXPECT_FALSE(database.HasOriginPath(origin1)); 79 EXPECT_FALSE(database.HasOriginPath(origin1));
79 EXPECT_TRUE(database.GetPathForOrigin(origin1, &path1)); 80 EXPECT_TRUE(database.GetPathForOrigin(origin1, &path1));
80 EXPECT_TRUE(database.HasOriginPath(origin1)); 81 EXPECT_TRUE(database.HasOriginPath(origin1));
81 EXPECT_FALSE(path0.empty()); 82 EXPECT_FALSE(path0.empty());
82 EXPECT_FALSE(path1.empty()); 83 EXPECT_FALSE(path1.empty());
83 EXPECT_NE(path0, path1); 84 EXPECT_NE(path0, path1);
84 85
85 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName))); 86 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName)));
86 } 87 }
87 88
88 TEST(FileSystemOriginDatabaseTest, DropDatabaseTest) { 89 TEST(SandboxOriginDatabaseTest, DropDatabaseTest) {
89 base::ScopedTempDir dir; 90 base::ScopedTempDir dir;
90 ASSERT_TRUE(dir.CreateUniqueTempDir()); 91 ASSERT_TRUE(dir.CreateUniqueTempDir());
91 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 92 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
92 EXPECT_FALSE(file_util::PathExists(kFSDir)); 93 EXPECT_FALSE(file_util::PathExists(kFSDir));
93 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 94 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
94 95
95 FileSystemOriginDatabase database(kFSDir); 96 SandboxOriginDatabase database(kFSDir);
96 std::string origin("origin"); 97 std::string origin("origin");
97 98
98 EXPECT_FALSE(database.HasOriginPath(origin)); 99 EXPECT_FALSE(database.HasOriginPath(origin));
99 100
100 base::FilePath path0; 101 base::FilePath path0;
101 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0)); 102 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
102 EXPECT_TRUE(database.HasOriginPath(origin)); 103 EXPECT_TRUE(database.HasOriginPath(origin));
103 EXPECT_FALSE(path0.empty()); 104 EXPECT_FALSE(path0.empty());
104 105
105 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName))); 106 EXPECT_TRUE(file_util::PathExists(kFSDir.Append(kOriginDatabaseName)));
106 107
107 database.DropDatabase(); 108 database.DropDatabase();
108 109
109 base::FilePath path1; 110 base::FilePath path1;
110 EXPECT_TRUE(database.HasOriginPath(origin)); 111 EXPECT_TRUE(database.HasOriginPath(origin));
111 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1)); 112 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
112 EXPECT_FALSE(path1.empty()); 113 EXPECT_FALSE(path1.empty());
113 EXPECT_EQ(path0, path1); 114 EXPECT_EQ(path0, path1);
114 } 115 }
115 116
116 TEST(FileSystemOriginDatabaseTest, DeleteOriginTest) { 117 TEST(SandboxOriginDatabaseTest, DeleteOriginTest) {
117 base::ScopedTempDir dir; 118 base::ScopedTempDir dir;
118 ASSERT_TRUE(dir.CreateUniqueTempDir()); 119 ASSERT_TRUE(dir.CreateUniqueTempDir());
119 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 120 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
120 EXPECT_FALSE(file_util::PathExists(kFSDir)); 121 EXPECT_FALSE(file_util::PathExists(kFSDir));
121 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 122 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
122 123
123 FileSystemOriginDatabase database(kFSDir); 124 SandboxOriginDatabase database(kFSDir);
124 std::string origin("origin"); 125 std::string origin("origin");
125 126
126 EXPECT_FALSE(database.HasOriginPath(origin)); 127 EXPECT_FALSE(database.HasOriginPath(origin));
127 EXPECT_TRUE(database.RemovePathForOrigin(origin)); 128 EXPECT_TRUE(database.RemovePathForOrigin(origin));
128 129
129 base::FilePath path0; 130 base::FilePath path0;
130 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0)); 131 EXPECT_TRUE(database.GetPathForOrigin(origin, &path0));
131 EXPECT_TRUE(database.HasOriginPath(origin)); 132 EXPECT_TRUE(database.HasOriginPath(origin));
132 EXPECT_FALSE(path0.empty()); 133 EXPECT_FALSE(path0.empty());
133 134
134 EXPECT_TRUE(database.RemovePathForOrigin(origin)); 135 EXPECT_TRUE(database.RemovePathForOrigin(origin));
135 EXPECT_FALSE(database.HasOriginPath(origin)); 136 EXPECT_FALSE(database.HasOriginPath(origin));
136 137
137 base::FilePath path1; 138 base::FilePath path1;
138 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1)); 139 EXPECT_TRUE(database.GetPathForOrigin(origin, &path1));
139 EXPECT_FALSE(path1.empty()); 140 EXPECT_FALSE(path1.empty());
140 EXPECT_NE(path0, path1); 141 EXPECT_NE(path0, path1);
141 } 142 }
142 143
143 TEST(FileSystemOriginDatabaseTest, ListOriginsTest) { 144 TEST(SandboxOriginDatabaseTest, ListOriginsTest) {
144 base::ScopedTempDir dir; 145 base::ScopedTempDir dir;
145 ASSERT_TRUE(dir.CreateUniqueTempDir()); 146 ASSERT_TRUE(dir.CreateUniqueTempDir());
146 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 147 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
147 EXPECT_FALSE(file_util::PathExists(kFSDir)); 148 EXPECT_FALSE(file_util::PathExists(kFSDir));
148 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 149 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
149 150
150 std::vector<FileSystemOriginDatabase::OriginRecord> origins; 151 std::vector<SandboxOriginDatabase::OriginRecord> origins;
151 152
152 FileSystemOriginDatabase database(kFSDir); 153 SandboxOriginDatabase database(kFSDir);
153 EXPECT_TRUE(database.ListAllOrigins(&origins)); 154 EXPECT_TRUE(database.ListAllOrigins(&origins));
154 EXPECT_TRUE(origins.empty()); 155 EXPECT_TRUE(origins.empty());
155 origins.clear(); 156 origins.clear();
156 157
157 std::string origin0("origin0"); 158 std::string origin0("origin0");
158 std::string origin1("origin1"); 159 std::string origin1("origin1");
159 160
160 EXPECT_FALSE(database.HasOriginPath(origin0)); 161 EXPECT_FALSE(database.HasOriginPath(origin0));
161 EXPECT_FALSE(database.HasOriginPath(origin1)); 162 EXPECT_FALSE(database.HasOriginPath(origin1));
162 163
(...skipping 13 matching lines...) Expand all
176 EXPECT_EQ(origins[1].origin, origin1); 177 EXPECT_EQ(origins[1].origin, origin1);
177 EXPECT_EQ(origins[1].path, path1); 178 EXPECT_EQ(origins[1].path, path1);
178 } else { 179 } else {
179 EXPECT_EQ(origins[0].origin, origin1); 180 EXPECT_EQ(origins[0].origin, origin1);
180 EXPECT_EQ(origins[0].path, path1); 181 EXPECT_EQ(origins[0].path, path1);
181 EXPECT_EQ(origins[1].origin, origin0); 182 EXPECT_EQ(origins[1].origin, origin0);
182 EXPECT_EQ(origins[1].path, path0); 183 EXPECT_EQ(origins[1].path, path0);
183 } 184 }
184 } 185 }
185 186
186 TEST(FileSystemOriginDatabaseTest, DatabaseRecoveryTest) { 187 TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
187 // Checks if FileSystemOriginDatabase properly handles database corruption. 188 // Checks if SandboxOriginDatabase properly handles database corruption.
188 // In this test, we'll register some origins to the origin database, then 189 // In this test, we'll register some origins to the origin database, then
189 // corrupt database and its log file. 190 // corrupt database and its log file.
190 // After repairing, the origin database should be consistent even when some 191 // After repairing, the origin database should be consistent even when some
191 // entries lost. 192 // entries lost.
192 193
193 base::ScopedTempDir dir; 194 base::ScopedTempDir dir;
194 ASSERT_TRUE(dir.CreateUniqueTempDir()); 195 ASSERT_TRUE(dir.CreateUniqueTempDir());
195 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 196 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
196 const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName); 197 const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName);
197 EXPECT_FALSE(file_util::PathExists(kFSDir)); 198 EXPECT_FALSE(file_util::PathExists(kFSDir));
198 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 199 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
199 200
200 const std::string kOrigins[] = { 201 const std::string kOrigins[] = {
201 "foo.example.com", 202 "foo.example.com",
202 "bar.example.com", 203 "bar.example.com",
203 "baz.example.com", 204 "baz.example.com",
204 "hoge.example.com", 205 "hoge.example.com",
205 "fuga.example.com", 206 "fuga.example.com",
206 }; 207 };
207 208
208 scoped_ptr<FileSystemOriginDatabase> database( 209 scoped_ptr<SandboxOriginDatabase> database(
209 new FileSystemOriginDatabase(kFSDir)); 210 new SandboxOriginDatabase(kFSDir));
210 for (size_t i = 0; i < arraysize(kOrigins); ++i) { 211 for (size_t i = 0; i < arraysize(kOrigins); ++i) {
211 base::FilePath path; 212 base::FilePath path;
212 EXPECT_FALSE(database->HasOriginPath(kOrigins[i])); 213 EXPECT_FALSE(database->HasOriginPath(kOrigins[i]));
213 EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path)); 214 EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path));
214 EXPECT_FALSE(path.empty()); 215 EXPECT_FALSE(path.empty());
215 EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path)); 216 EXPECT_TRUE(database->GetPathForOrigin(kOrigins[i], &path));
216 217
217 if (i != 1) 218 if (i != 1)
218 EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path))); 219 EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path)));
219 } 220 }
(...skipping 13 matching lines...) Expand all
233 EXPECT_TRUE(base::ClosePlatformFile(file)); 234 EXPECT_TRUE(base::ClosePlatformFile(file));
234 235
235 // Corrupt database itself and last log entry to drop last 1 database 236 // Corrupt database itself and last log entry to drop last 1 database
236 // operation. The database should detect the corruption and should recover 237 // operation. The database should detect the corruption and should recover
237 // its consistency after recovery. 238 // its consistency after recovery.
238 CorruptDatabase(kDBDir, leveldb::kDescriptorFile, 239 CorruptDatabase(kDBDir, leveldb::kDescriptorFile,
239 0, std::numeric_limits<size_t>::max()); 240 0, std::numeric_limits<size_t>::max());
240 CorruptDatabase(kDBDir, leveldb::kLogFile, -1, 1); 241 CorruptDatabase(kDBDir, leveldb::kLogFile, -1, 1);
241 242
242 base::FilePath path; 243 base::FilePath path;
243 database.reset(new FileSystemOriginDatabase(kFSDir)); 244 database.reset(new SandboxOriginDatabase(kFSDir));
244 std::vector<FileSystemOriginDatabase::OriginRecord> origins_in_db; 245 std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
245 EXPECT_TRUE(database->ListAllOrigins(&origins_in_db)); 246 EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
246 247
247 // Expect all but last added origin will be repaired back, and kOrigins[1] 248 // Expect all but last added origin will be repaired back, and kOrigins[1]
248 // should be dropped due to absence of backing directory. 249 // should be dropped due to absence of backing directory.
249 EXPECT_EQ(arraysize(kOrigins) - 2, origins_in_db.size()); 250 EXPECT_EQ(arraysize(kOrigins) - 2, origins_in_db.size());
250 251
251 const std::string kOrigin("piyo.example.org"); 252 const std::string kOrigin("piyo.example.org");
252 EXPECT_FALSE(database->HasOriginPath(kOrigin)); 253 EXPECT_FALSE(database->HasOriginPath(kOrigin));
253 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path)); 254 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
254 EXPECT_FALSE(path.empty()); 255 EXPECT_FALSE(path.empty());
255 EXPECT_TRUE(database->HasOriginPath(kOrigin)); 256 EXPECT_TRUE(database->HasOriginPath(kOrigin));
256 257
257 EXPECT_FALSE(file_util::PathExists(kGarbageFile)); 258 EXPECT_FALSE(file_util::PathExists(kGarbageFile));
258 EXPECT_FALSE(file_util::PathExists(kGarbageDir)); 259 EXPECT_FALSE(file_util::PathExists(kGarbageDir));
259 } 260 }
260 261
261 TEST(FileSystemOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) { 262 TEST(SandboxOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) {
262 const leveldb::FileType kLevelDBFileTypes[] = { 263 const leveldb::FileType kLevelDBFileTypes[] = {
263 leveldb::kLogFile, 264 leveldb::kLogFile,
264 leveldb::kDBLockFile, 265 leveldb::kDBLockFile,
265 leveldb::kTableFile, 266 leveldb::kTableFile,
266 leveldb::kDescriptorFile, 267 leveldb::kDescriptorFile,
267 leveldb::kCurrentFile, 268 leveldb::kCurrentFile,
268 leveldb::kTempFile, 269 leveldb::kTempFile,
269 leveldb::kInfoLogFile, 270 leveldb::kInfoLogFile,
270 }; 271 };
271 272
272 for (size_t i = 0; i < arraysize(kLevelDBFileTypes); ++i) { 273 for (size_t i = 0; i < arraysize(kLevelDBFileTypes); ++i) {
273 base::ScopedTempDir dir; 274 base::ScopedTempDir dir;
274 ASSERT_TRUE(dir.CreateUniqueTempDir()); 275 ASSERT_TRUE(dir.CreateUniqueTempDir());
275 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName); 276 const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
276 const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName); 277 const base::FilePath kDBDir = kFSDir.Append(kOriginDatabaseName);
277 EXPECT_FALSE(file_util::PathExists(kFSDir)); 278 EXPECT_FALSE(file_util::PathExists(kFSDir));
278 EXPECT_TRUE(file_util::CreateDirectory(kFSDir)); 279 EXPECT_TRUE(file_util::CreateDirectory(kFSDir));
279 280
280 const std::string kOrigin = "foo.example.com"; 281 const std::string kOrigin = "foo.example.com";
281 base::FilePath path; 282 base::FilePath path;
282 283
283 scoped_ptr<FileSystemOriginDatabase> database( 284 scoped_ptr<SandboxOriginDatabase> database(
284 new FileSystemOriginDatabase(kFSDir)); 285 new SandboxOriginDatabase(kFSDir));
285 EXPECT_FALSE(database->HasOriginPath(kOrigin)); 286 EXPECT_FALSE(database->HasOriginPath(kOrigin));
286 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path)); 287 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
287 EXPECT_FALSE(path.empty()); 288 EXPECT_FALSE(path.empty());
288 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path)); 289 EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
289 EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path))); 290 EXPECT_TRUE(file_util::CreateDirectory(kFSDir.Append(path)));
290 database.reset(); 291 database.reset();
291 292
292 DeleteDatabaseFile(kDBDir, kLevelDBFileTypes[i]); 293 DeleteDatabaseFile(kDBDir, kLevelDBFileTypes[i]);
293 294
294 database.reset(new FileSystemOriginDatabase(kFSDir)); 295 database.reset(new SandboxOriginDatabase(kFSDir));
295 std::vector<FileSystemOriginDatabase::OriginRecord> origins_in_db; 296 std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
296 EXPECT_TRUE(database->ListAllOrigins(&origins_in_db)); 297 EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
297 298
298 const std::string kOrigin2("piyo.example.org"); 299 const std::string kOrigin2("piyo.example.org");
299 EXPECT_FALSE(database->HasOriginPath(kOrigin2)); 300 EXPECT_FALSE(database->HasOriginPath(kOrigin2));
300 EXPECT_TRUE(database->GetPathForOrigin(kOrigin2, &path)); 301 EXPECT_TRUE(database->GetPathForOrigin(kOrigin2, &path));
301 EXPECT_FALSE(path.empty()); 302 EXPECT_FALSE(path.empty());
302 EXPECT_TRUE(database->HasOriginPath(kOrigin2)); 303 EXPECT_TRUE(database->HasOriginPath(kOrigin2));
303 } 304 }
304 } 305 }
305 306
306 } // namespace fileapi 307 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/fileapi/sandbox_origin_database.cc ('k') | webkit/fileapi/webkit_fileapi.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698