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

Side by Side Diff: webkit/quota/quota_database_unittest.cc

Issue 10700035: When fetching origins from the quota database, include the ones where the modification time exactly… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unit test Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/quota/quota_database.cc ('k') | no next file » | 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 <iterator> 6 #include <iterator>
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 EXPECT_TRUE(db.GetOriginsModifiedSince( 219 EXPECT_TRUE(db.GetOriginsModifiedSince(
220 kStorageTypeTemporary, &origins, base::Time())); 220 kStorageTypeTemporary, &origins, base::Time()));
221 EXPECT_TRUE(origins.empty()); 221 EXPECT_TRUE(origins.empty());
222 222
223 const GURL kOrigin1("http://a/"); 223 const GURL kOrigin1("http://a/");
224 const GURL kOrigin2("http://b/"); 224 const GURL kOrigin2("http://b/");
225 const GURL kOrigin3("http://c/"); 225 const GURL kOrigin3("http://c/");
226 226
227 // Report last mod time for the test origins. 227 // Report last mod time for the test origins.
228 EXPECT_TRUE(db.SetOriginLastModifiedTime( 228 EXPECT_TRUE(db.SetOriginLastModifiedTime(
229 kOrigin1, kStorageTypeTemporary, base::Time::FromInternalValue(10))); 229 kOrigin1, kStorageTypeTemporary, base::Time::FromInternalValue(0)));
230 EXPECT_TRUE(db.SetOriginLastModifiedTime( 230 EXPECT_TRUE(db.SetOriginLastModifiedTime(
231 kOrigin2, kStorageTypeTemporary, base::Time::FromInternalValue(20))); 231 kOrigin2, kStorageTypeTemporary, base::Time::FromInternalValue(10)));
232 EXPECT_TRUE(db.SetOriginLastModifiedTime( 232 EXPECT_TRUE(db.SetOriginLastModifiedTime(
233 kOrigin3, kStorageTypeTemporary, base::Time::FromInternalValue(30))); 233 kOrigin3, kStorageTypeTemporary, base::Time::FromInternalValue(20)));
234 234
235 EXPECT_TRUE(db.GetOriginsModifiedSince( 235 EXPECT_TRUE(db.GetOriginsModifiedSince(
236 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(15))); 236 kStorageTypeTemporary, &origins, base::Time()));
237 EXPECT_EQ(3U, origins.size());
238 EXPECT_EQ(1U, origins.count(kOrigin1));
239 EXPECT_EQ(1U, origins.count(kOrigin2));
240 EXPECT_EQ(1U, origins.count(kOrigin3));
241
242 EXPECT_TRUE(db.GetOriginsModifiedSince(
243 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(5)));
237 EXPECT_EQ(2U, origins.size()); 244 EXPECT_EQ(2U, origins.size());
238 EXPECT_EQ(0U, origins.count(kOrigin1)); 245 EXPECT_EQ(0U, origins.count(kOrigin1));
239 EXPECT_EQ(1U, origins.count(kOrigin2)); 246 EXPECT_EQ(1U, origins.count(kOrigin2));
240 EXPECT_EQ(1U, origins.count(kOrigin3)); 247 EXPECT_EQ(1U, origins.count(kOrigin3));
241 248
242 EXPECT_TRUE(db.GetOriginsModifiedSince( 249 EXPECT_TRUE(db.GetOriginsModifiedSince(
243 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(25))); 250 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(15)));
244 EXPECT_EQ(1U, origins.size()); 251 EXPECT_EQ(1U, origins.size());
245 EXPECT_EQ(0U, origins.count(kOrigin1)); 252 EXPECT_EQ(0U, origins.count(kOrigin1));
246 EXPECT_EQ(0U, origins.count(kOrigin2)); 253 EXPECT_EQ(0U, origins.count(kOrigin2));
247 EXPECT_EQ(1U, origins.count(kOrigin3)); 254 EXPECT_EQ(1U, origins.count(kOrigin3));
248 255
249 EXPECT_TRUE(db.GetOriginsModifiedSince( 256 EXPECT_TRUE(db.GetOriginsModifiedSince(
250 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(35))); 257 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(25)));
251 EXPECT_TRUE(origins.empty()); 258 EXPECT_TRUE(origins.empty());
252 259
253 // Update origin1's mod time but for persistent storage. 260 // Update origin1's mod time but for persistent storage.
254 EXPECT_TRUE(db.SetOriginLastModifiedTime( 261 EXPECT_TRUE(db.SetOriginLastModifiedTime(
255 kOrigin1, kStorageTypePersistent, base::Time::FromInternalValue(40))); 262 kOrigin1, kStorageTypePersistent, base::Time::FromInternalValue(30)));
256 263
257 // Must have no effects on temporary origins info. 264 // Must have no effects on temporary origins info.
258 EXPECT_TRUE(db.GetOriginsModifiedSince( 265 EXPECT_TRUE(db.GetOriginsModifiedSince(
259 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(15))); 266 kStorageTypeTemporary, &origins, base::Time::FromInternalValue(5)));
260 EXPECT_EQ(2U, origins.size()); 267 EXPECT_EQ(2U, origins.size());
261 EXPECT_EQ(0U, origins.count(kOrigin1)); 268 EXPECT_EQ(0U, origins.count(kOrigin1));
262 EXPECT_EQ(1U, origins.count(kOrigin2)); 269 EXPECT_EQ(1U, origins.count(kOrigin2));
263 EXPECT_EQ(1U, origins.count(kOrigin3)); 270 EXPECT_EQ(1U, origins.count(kOrigin3));
264 271
265 // One more update for persistent origin2. 272 // One more update for persistent origin2.
266 EXPECT_TRUE(db.SetOriginLastModifiedTime( 273 EXPECT_TRUE(db.SetOriginLastModifiedTime(
267 kOrigin2, kStorageTypePersistent, base::Time::FromInternalValue(50))); 274 kOrigin2, kStorageTypePersistent, base::Time::FromInternalValue(40)));
268 275
269 EXPECT_TRUE(db.GetOriginsModifiedSince( 276 EXPECT_TRUE(db.GetOriginsModifiedSince(
270 kStorageTypePersistent, &origins, base::Time::FromInternalValue(35))); 277 kStorageTypePersistent, &origins, base::Time::FromInternalValue(25)));
271 EXPECT_EQ(2U, origins.size()); 278 EXPECT_EQ(2U, origins.size());
272 EXPECT_EQ(1U, origins.count(kOrigin1)); 279 EXPECT_EQ(1U, origins.count(kOrigin1));
273 EXPECT_EQ(1U, origins.count(kOrigin2)); 280 EXPECT_EQ(1U, origins.count(kOrigin2));
274 EXPECT_EQ(0U, origins.count(kOrigin3)); 281 EXPECT_EQ(0U, origins.count(kOrigin3));
275 282
276 EXPECT_TRUE(db.GetOriginsModifiedSince( 283 EXPECT_TRUE(db.GetOriginsModifiedSince(
277 kStorageTypePersistent, &origins, base::Time::FromInternalValue(45))); 284 kStorageTypePersistent, &origins, base::Time::FromInternalValue(35)));
278 EXPECT_EQ(1U, origins.size()); 285 EXPECT_EQ(1U, origins.size());
279 EXPECT_EQ(0U, origins.count(kOrigin1)); 286 EXPECT_EQ(0U, origins.count(kOrigin1));
280 EXPECT_EQ(1U, origins.count(kOrigin2)); 287 EXPECT_EQ(1U, origins.count(kOrigin2));
281 EXPECT_EQ(0U, origins.count(kOrigin3)); 288 EXPECT_EQ(0U, origins.count(kOrigin3));
282 } 289 }
283 290
284 void RegisterInitialOriginInfo(const FilePath& kDbFile) { 291 void RegisterInitialOriginInfo(const FilePath& kDbFile) {
285 QuotaDatabase db(kDbFile); 292 QuotaDatabase db(kDbFile);
286 293
287 const GURL kOrigins[] = { 294 const GURL kOrigins[] = {
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 } 570 }
564 571
565 TEST_F(QuotaDatabaseTest, DumpOriginInfoTable) { 572 TEST_F(QuotaDatabaseTest, DumpOriginInfoTable) {
566 ScopedTempDir data_dir; 573 ScopedTempDir data_dir;
567 ASSERT_TRUE(data_dir.CreateUniqueTempDir()); 574 ASSERT_TRUE(data_dir.CreateUniqueTempDir());
568 const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db"); 575 const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
569 DumpOriginInfoTable(kDbFile); 576 DumpOriginInfoTable(kDbFile);
570 DumpOriginInfoTable(FilePath()); 577 DumpOriginInfoTable(FilePath());
571 } 578 }
572 } // namespace quota 579 } // namespace quota
OLDNEW
« no previous file with comments | « webkit/quota/quota_database.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698