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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/quota/quota_database_unittest.cc

Issue 7322005: Revert 91690 - Implement QM::GetOriginsModifiedSince for browser data deleter support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/quota/quota_database.cc ('k') | webkit/quota/quota_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/quota/quota_database_unittest.cc
===================================================================
--- webkit/quota/quota_database_unittest.cc (revision 91690)
+++ webkit/quota/quota_database_unittest.cc (working copy)
@@ -7,7 +7,6 @@
#include <set>
#include "app/sql/connection.h"
-#include "app/sql/meta_table.h"
#include "app/sql/statement.h"
#include "app/sql/transaction.h"
#include "base/bind.h"
@@ -19,7 +18,6 @@
#include "webkit/quota/mock_special_storage_policy.h"
#include "webkit/quota/quota_database.h"
-namespace quota {
namespace {
const base::Time kZeroTime;
@@ -32,17 +30,75 @@
return error;
}
};
-
} // namespace
+namespace quota {
+
class QuotaDatabaseTest : public testing::Test {
protected:
typedef QuotaDatabase::QuotaTableEntry QuotaTableEntry;
typedef QuotaDatabase::QuotaTableCallback QuotaTableCallback;
- typedef QuotaDatabase::OriginInfoTableEntry OriginInfoTableEntry;
- typedef QuotaDatabase::OriginInfoTableCallback
- OriginInfoTableCallback;
+ typedef QuotaDatabase::LastAccessTimeTableEntry LastAccessTimeTableEntry;
+ typedef QuotaDatabase::LastAccessTimeTableCallback
+ LastAccessTimeTableCallback;
+ template <typename Iterator>
+ bool AssignQuotaTable(
+ QuotaDatabase* quota_database, Iterator itr, Iterator end) {
+ if (!quota_database->LazyOpen(true))
+ return false;
+
+ for (; itr != end; ++itr) {
+ const char* kSql =
+ "INSERT INTO HostQuotaTable"
+ " (host, type, quota)"
+ " VALUES (?, ?, ?)";
+ sql::Statement statement;
+ statement.Assign(
+ quota_database->db_->GetCachedStatement(
+ SQL_FROM_HERE, kSql));
+ EXPECT_TRUE(statement.is_valid());
+
+ statement.BindString(0, itr->host);
+ statement.BindInt(1, static_cast<int>(itr->type));
+ statement.BindInt64(2, itr->quota);
+ if (!statement.Run())
+ return false;
+ }
+
+ quota_database->Commit();
+ return true;
+ }
+
+ template <typename Iterator>
+ bool AssignLastAccessTimeTable(
+ QuotaDatabase* quota_database, Iterator itr, Iterator end) {
+ if (!quota_database->LazyOpen(true))
+ return false;
+
+ for (; itr != end; ++itr) {
+ const char* kSql =
+ "INSERT INTO OriginLastAccessTable"
+ " (origin, type, used_count, last_access_time)"
+ " VALUES (?, ?, ?, ?)";
+ sql::Statement statement;
+ statement.Assign(
+ quota_database->db_->GetCachedStatement(
+ SQL_FROM_HERE, kSql));
+ EXPECT_TRUE(statement.is_valid());
+
+ statement.BindString(0, itr->origin.spec());
+ statement.BindInt(1, static_cast<int>(itr->type));
+ statement.BindInt(2, itr->used_count);
+ statement.BindInt64(3, itr->last_access_time.ToInternalValue());
+ if (!statement.Run())
+ return false;
+ }
+
+ quota_database->Commit();
+ return true;
+ }
+
void LazyOpen(const FilePath& kDbFile) {
QuotaDatabase db(kDbFile);
EXPECT_FALSE(db.LazyOpen(false));
@@ -51,28 +107,6 @@
EXPECT_TRUE(kDbFile.empty() || file_util::PathExists(kDbFile));
}
- void UpgradeSchemaV2toV3(const FilePath& kDbFile) {
- const QuotaTableEntry entries[] = {
- { "a", kStorageTypeTemporary, 1 },
- { "b", kStorageTypeTemporary, 2 },
- { "c", kStorageTypePersistent, 3 },
- };
-
- CreateV2Database(kDbFile, entries, ARRAYSIZE_UNSAFE(entries));
-
- QuotaDatabase db(kDbFile);
- EXPECT_TRUE(db.LazyOpen(true));
- EXPECT_TRUE(db.db_.get());
-
- typedef EntryVerifier<QuotaTableEntry> Verifier;
- Verifier verifier(entries, entries + ARRAYSIZE_UNSAFE(entries));
- EXPECT_TRUE(db.DumpQuotaTable(
- new QuotaTableCallback(
- base::Bind(&Verifier::Run,
- base::Unretained(&verifier)))));
- EXPECT_TRUE(verifier.table.empty());
- }
-
void HostQuota(const FilePath& kDbFile) {
QuotaDatabase db(kDbFile);
ASSERT_TRUE(db.LazyOpen(true));
@@ -189,7 +223,7 @@
kOrigin1, kStorageTypeTemporary, base::Time::Now()));
// Delete origin/type last access time information.
- EXPECT_TRUE(db.DeleteOriginInfo(kOrigin3, kStorageTypeTemporary));
+ EXPECT_TRUE(db.DeleteOriginLastAccessTime(kOrigin3, kStorageTypeTemporary));
// Querying again to see if the deletion has worked.
exceptions.clear();
@@ -204,86 +238,18 @@
EXPECT_TRUE(origin.is_empty());
}
- void OriginLastModifiedSince(const FilePath& kDbFile) {
+ void RegisterOrigins(const FilePath& kDbFile) {
QuotaDatabase db(kDbFile);
- ASSERT_TRUE(db.LazyOpen(true));
- std::set<GURL> origins;
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypeTemporary, &origins, base::Time()));
- EXPECT_TRUE(origins.empty());
-
- const GURL kOrigin1("http://a/");
- const GURL kOrigin2("http://b/");
- const GURL kOrigin3("http://c/");
-
- // Report last mod time for the test origins.
- EXPECT_TRUE(db.SetOriginLastModifiedTime(
- kOrigin1, kStorageTypeTemporary, base::Time::FromInternalValue(10)));
- EXPECT_TRUE(db.SetOriginLastModifiedTime(
- kOrigin2, kStorageTypeTemporary, base::Time::FromInternalValue(20)));
- EXPECT_TRUE(db.SetOriginLastModifiedTime(
- kOrigin3, kStorageTypeTemporary, base::Time::FromInternalValue(30)));
-
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypeTemporary, &origins, base::Time::FromInternalValue(15)));
- EXPECT_EQ(2U, origins.size());
- EXPECT_EQ(0U, origins.count(kOrigin1));
- EXPECT_EQ(1U, origins.count(kOrigin2));
- EXPECT_EQ(1U, origins.count(kOrigin3));
-
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypeTemporary, &origins, base::Time::FromInternalValue(25)));
- EXPECT_EQ(1U, origins.size());
- EXPECT_EQ(0U, origins.count(kOrigin1));
- EXPECT_EQ(0U, origins.count(kOrigin2));
- EXPECT_EQ(1U, origins.count(kOrigin3));
-
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypeTemporary, &origins, base::Time::FromInternalValue(35)));
- EXPECT_TRUE(origins.empty());
-
- // Update origin1's mod time but for persistent storage.
- EXPECT_TRUE(db.SetOriginLastModifiedTime(
- kOrigin1, kStorageTypePersistent, base::Time::FromInternalValue(40)));
-
- // Must have no effects on temporary origins info.
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypeTemporary, &origins, base::Time::FromInternalValue(15)));
- EXPECT_EQ(2U, origins.size());
- EXPECT_EQ(0U, origins.count(kOrigin1));
- EXPECT_EQ(1U, origins.count(kOrigin2));
- EXPECT_EQ(1U, origins.count(kOrigin3));
-
- // One more update for persistent origin2.
- EXPECT_TRUE(db.SetOriginLastModifiedTime(
- kOrigin2, kStorageTypePersistent, base::Time::FromInternalValue(50)));
-
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypePersistent, &origins, base::Time::FromInternalValue(35)));
- EXPECT_EQ(2U, origins.size());
- EXPECT_EQ(1U, origins.count(kOrigin1));
- EXPECT_EQ(1U, origins.count(kOrigin2));
- EXPECT_EQ(0U, origins.count(kOrigin3));
-
- EXPECT_TRUE(db.GetOriginsModifiedSince(
- kStorageTypePersistent, &origins, base::Time::FromInternalValue(45)));
- EXPECT_EQ(1U, origins.size());
- EXPECT_EQ(0U, origins.count(kOrigin1));
- EXPECT_EQ(1U, origins.count(kOrigin2));
- EXPECT_EQ(0U, origins.count(kOrigin3));
- }
-
- void RegisterInitialOriginInfo(const FilePath& kDbFile) {
- QuotaDatabase db(kDbFile);
-
const GURL kOrigins[] = {
GURL("http://a/"),
GURL("http://b/"),
GURL("http://c/") };
std::set<GURL> origins(kOrigins, kOrigins + ARRAYSIZE_UNSAFE(kOrigins));
- EXPECT_TRUE(db.RegisterInitialOriginInfo(origins, kStorageTypeTemporary));
+ EXPECT_TRUE(db.RegisterOrigins(origins,
+ kStorageTypeTemporary,
+ base::Time()));
int used_count = -1;
EXPECT_TRUE(db.FindOriginUsedCount(GURL("http://a/"),
@@ -300,7 +266,9 @@
&used_count));
EXPECT_EQ(1, used_count);
- EXPECT_TRUE(db.RegisterInitialOriginInfo(origins, kStorageTypeTemporary));
+ EXPECT_TRUE(db.RegisterOrigins(origins,
+ kStorageTypeTemporary,
+ base::Time()));
used_count = -1;
EXPECT_TRUE(db.FindOriginUsedCount(GURL("http://a/"),
@@ -333,9 +301,7 @@
QuotaTableEntry* end = kTableEntries + ARRAYSIZE_UNSAFE(kTableEntries);
QuotaDatabase db(kDbFile);
- EXPECT_TRUE(db.LazyOpen(true));
- AssignQuotaTable(db.db_.get(), begin, end);
- db.Commit();
+ EXPECT_TRUE(AssignQuotaTable(&db, begin, end));
typedef EntryVerifier<QuotaTableEntry> Verifier;
Verifier verifier(begin, end);
@@ -346,134 +312,28 @@
EXPECT_TRUE(verifier.table.empty());
}
- void DumpOriginInfoTable(const FilePath& kDbFile) {
+ void DumpLastAccessTimeTable(const FilePath& kDbFile) {
base::Time now(base::Time::Now());
- OriginInfoTableEntry kTableEntries[] = {
- {GURL("http://go/"), kStorageTypeTemporary, 2147483647, now, now},
- {GURL("http://oo/"), kStorageTypeTemporary, 0, now, now},
- {GURL("http://gle/"), kStorageTypeTemporary, 1, now, now},
+ LastAccessTimeTableEntry kTableEntries[] = {
+ {GURL("http://go/"), kStorageTypeTemporary, 2147483647, now},
+ {GURL("http://oo/"), kStorageTypeTemporary, 0, now},
+ {GURL("http://gle/"), kStorageTypeTemporary, 1, now},
};
- OriginInfoTableEntry* begin = kTableEntries;
- OriginInfoTableEntry* end = kTableEntries + ARRAYSIZE_UNSAFE(kTableEntries);
+ LastAccessTimeTableEntry* begin = kTableEntries;
+ LastAccessTimeTableEntry* end = kTableEntries +
+ ARRAYSIZE_UNSAFE(kTableEntries);
QuotaDatabase db(kDbFile);
- EXPECT_TRUE(db.LazyOpen(true));
- AssignOriginInfoTable(db.db_.get(), begin, end);
- db.Commit();
+ EXPECT_TRUE(AssignLastAccessTimeTable(&db, begin, end));
- typedef EntryVerifier<OriginInfoTableEntry> Verifier;
+ typedef EntryVerifier<LastAccessTimeTableEntry> Verifier;
Verifier verifier(begin, end);
- EXPECT_TRUE(db.DumpOriginInfoTable(
- new OriginInfoTableCallback(
+ EXPECT_TRUE(db.DumpLastAccessTimeTable(
+ new LastAccessTimeTableCallback(
base::Bind(&Verifier::Run,
base::Unretained(&verifier)))));
EXPECT_TRUE(verifier.table.empty());
}
-
- private:
- template <typename Iterator>
- void AssignQuotaTable(sql::Connection* db, Iterator itr, Iterator end) {
- ASSERT_NE(db, (sql::Connection*)NULL);
- for (; itr != end; ++itr) {
- const char* kSql =
- "INSERT INTO HostQuotaTable"
- " (host, type, quota)"
- " VALUES (?, ?, ?)";
- sql::Statement statement;
- statement.Assign(db->GetCachedStatement(SQL_FROM_HERE, kSql));
- ASSERT_TRUE(statement.is_valid());
-
- statement.BindString(0, itr->host);
- statement.BindInt(1, static_cast<int>(itr->type));
- statement.BindInt64(2, itr->quota);
- EXPECT_TRUE(statement.Run());
- }
- }
-
- template <typename Iterator>
- void AssignOriginInfoTable(sql::Connection* db, Iterator itr, Iterator end) {
- ASSERT_NE(db, (sql::Connection*)NULL);
- for (; itr != end; ++itr) {
- const char* kSql =
- "INSERT INTO OriginInfoTable"
- " (origin, type, used_count, last_access_time, last_modified_time)"
- " VALUES (?, ?, ?, ?, ?)";
- sql::Statement statement;
- statement.Assign(db->GetCachedStatement(SQL_FROM_HERE, kSql));
- ASSERT_TRUE(statement.is_valid());
-
- statement.BindString(0, itr->origin.spec());
- statement.BindInt(1, static_cast<int>(itr->type));
- statement.BindInt(2, itr->used_count);
- statement.BindInt64(3, itr->last_access_time.ToInternalValue());
- statement.BindInt64(4, itr->last_modified_time.ToInternalValue());
- EXPECT_TRUE(statement.Run());
- }
- }
-
- bool OpenDatabase(sql::Connection* db, const FilePath& kDbFile) {
- if (kDbFile.empty()) {
- db->OpenInMemory();
- return true;
- }
- if (!file_util::CreateDirectory(kDbFile.DirName()))
- return false;
- if (!db->Open(kDbFile))
- return false;
- db->Preload();
- return true;
- }
-
- // Create V2 database and populate some data.
- void CreateV2Database(
- const FilePath& kDbFile,
- const QuotaTableEntry* entries,
- size_t entries_size) {
- scoped_ptr<sql::Connection> db(new sql::Connection);
- scoped_ptr<sql::MetaTable> meta_table(new sql::MetaTable);
-
- // V2 schema definitions.
- static const int kCurrentVersion = 2;
- static const int kCompatibleVersion = 2;
- static const char kHostQuotaTable[] = "HostQuotaTable";
- static const char kOriginLastAccessTable[] = "OriginLastAccessTable";
- static const QuotaDatabase::TableSchema kTables[] = {
- { kHostQuotaTable,
- "(host TEXT NOT NULL,"
- " type INTEGER NOT NULL,"
- " quota INTEGER,"
- " UNIQUE(host, type))" },
- { kOriginLastAccessTable,
- "(origin TEXT NOT NULL,"
- " type INTEGER NOT NULL,"
- " used_count INTEGER,"
- " last_access_time INTEGER,"
- " UNIQUE(origin, type))" },
- };
- static const QuotaDatabase::IndexSchema kIndexes[] = {
- { "HostIndex",
- kHostQuotaTable,
- "(host)",
- false },
- { "OriginLastAccessIndex",
- kOriginLastAccessTable,
- "(origin, last_access_time)",
- false },
- };
-
- ASSERT_TRUE(OpenDatabase(db.get(), kDbFile));
- EXPECT_TRUE(QuotaDatabase::CreateSchema(
- db.get(), meta_table.get(),
- kCurrentVersion, kCompatibleVersion,
- kTables, ARRAYSIZE_UNSAFE(kTables),
- kIndexes, ARRAYSIZE_UNSAFE(kIndexes)));
-
- // V2 and V3 QuotaTable are compatible, so we can simply use
- // AssignQuotaTable to poplulate v2 database here.
- db->BeginTransaction();
- AssignQuotaTable(db.get(), entries, entries + entries_size);
- db->CommitTransaction();
- }
};
TEST_F(QuotaDatabaseTest, LazyOpen) {
@@ -484,13 +344,6 @@
LazyOpen(FilePath());
}
-TEST_F(QuotaDatabaseTest, UpgradeSchema) {
- ScopedTempDir data_dir;
- ASSERT_TRUE(data_dir.CreateUniqueTempDir());
- const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
- UpgradeSchemaV2toV3(kDbFile);
-}
-
TEST_F(QuotaDatabaseTest, HostQuota) {
ScopedTempDir data_dir;
ASSERT_TRUE(data_dir.CreateUniqueTempDir());
@@ -515,14 +368,6 @@
OriginLastAccessTimeLRU(FilePath());
}
-TEST_F(QuotaDatabaseTest, OriginLastModifiedSince) {
- ScopedTempDir data_dir;
- ASSERT_TRUE(data_dir.CreateUniqueTempDir());
- const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
- OriginLastModifiedSince(kDbFile);
- OriginLastModifiedSince(FilePath());
-}
-
TEST_F(QuotaDatabaseTest, BootstrapFlag) {
ScopedTempDir data_dir;
ASSERT_TRUE(data_dir.CreateUniqueTempDir());
@@ -537,12 +382,12 @@
EXPECT_FALSE(db.IsOriginDatabaseBootstrapped());
}
-TEST_F(QuotaDatabaseTest, RegisterInitialOriginInfo) {
+TEST_F(QuotaDatabaseTest, RegisterOrigins) {
ScopedTempDir data_dir;
ASSERT_TRUE(data_dir.CreateUniqueTempDir());
const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
- RegisterInitialOriginInfo(kDbFile);
- RegisterInitialOriginInfo(FilePath());
+ RegisterOrigins(kDbFile);
+ RegisterOrigins(FilePath());
}
TEST_F(QuotaDatabaseTest, DumpQuotaTable) {
@@ -553,11 +398,11 @@
DumpQuotaTable(FilePath());
}
-TEST_F(QuotaDatabaseTest, DumpOriginInfoTable) {
+TEST_F(QuotaDatabaseTest, DumpLastAccessTimeTable) {
ScopedTempDir data_dir;
ASSERT_TRUE(data_dir.CreateUniqueTempDir());
const FilePath kDbFile = data_dir.path().AppendASCII("quota_manager.db");
- DumpOriginInfoTable(kDbFile);
- DumpOriginInfoTable(FilePath());
+ DumpLastAccessTimeTable(kDbFile);
+ DumpLastAccessTimeTable(FilePath());
}
} // namespace quota
« no previous file with comments | « webkit/quota/quota_database.cc ('k') | webkit/quota/quota_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698