Index: webkit/appcache/appcache_database_unittest.cc |
=================================================================== |
--- webkit/appcache/appcache_database_unittest.cc (revision 112534) |
+++ webkit/appcache/appcache_database_unittest.cc (working copy) |
@@ -322,7 +322,7 @@ |
EXPECT_EQ(kOrigin2, record.origin); |
} |
-TEST(AppCacheDatabaseTest, FallbackNameSpaceRecords) { |
+TEST(AppCacheDatabaseTest, NamespaceRecords) { |
const FilePath kEmptyPath; |
AppCacheDatabase db(kEmptyPath); |
EXPECT_TRUE(db.LazyOpen(true)); |
@@ -339,86 +339,87 @@ |
const GURL kBarFallbackEntry("http://bar/entry"); |
const GURL kBarOrigin(kBarNameSpace1.GetOrigin()); |
- const AppCacheDatabase::FallbackNameSpaceRecord kZeroRecord; |
- AppCacheDatabase::FallbackNameSpaceRecord record; |
- std::vector<AppCacheDatabase::FallbackNameSpaceRecord> records; |
+ const AppCacheDatabase::NamespaceRecord kZeroRecord; |
+ AppCacheDatabase::NamespaceRecord record; |
+ std::vector<AppCacheDatabase::NamespaceRecord> intercepts; |
+ std::vector<AppCacheDatabase::NamespaceRecord> records; |
jennb
2011/12/05 23:23:07
Rename to fallbacks?
michaeln
2011/12/06 19:41:24
Done.
|
// Behavior with an empty table |
- EXPECT_TRUE(db.FindFallbackNameSpacesForCache(1, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForCache(1, &intercepts, &records)); |
EXPECT_TRUE(records.empty()); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForOrigin(kFooOrigin, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForOrigin(kFooOrigin, &intercepts, &records)); |
EXPECT_TRUE(records.empty()); |
- EXPECT_TRUE(db.DeleteFallbackNameSpacesForCache(1)); |
+ EXPECT_TRUE(db.DeleteNamespacesForCache(1)); |
// Two records for two differenent caches in the Foo origin. |
record.cache_id = 1; |
record.origin = kFooOrigin; |
record.namespace_url = kFooNameSpace1; |
- record.fallback_entry_url = kFooFallbackEntry; |
- EXPECT_TRUE(db.InsertFallbackNameSpace(&record)); |
- EXPECT_FALSE(db.InsertFallbackNameSpace(&record)); |
+ record.target_url = kFooFallbackEntry; |
+ EXPECT_TRUE(db.InsertNamespace(&record)); |
+ EXPECT_FALSE(db.InsertNamespace(&record)); |
record.cache_id = 2; |
record.origin = kFooOrigin; |
record.namespace_url = kFooNameSpace2; |
- record.fallback_entry_url = kFooFallbackEntry; |
- EXPECT_TRUE(db.InsertFallbackNameSpace(&record)); |
+ record.target_url = kFooFallbackEntry; |
+ EXPECT_TRUE(db.InsertNamespace(&record)); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForCache(1, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForCache(1, &intercepts, &records)); |
EXPECT_EQ(1U, records.size()); |
EXPECT_EQ(1, records[0].cache_id); |
EXPECT_EQ(kFooOrigin, records[0].origin); |
EXPECT_EQ(kFooNameSpace1, records[0].namespace_url); |
- EXPECT_EQ(kFooFallbackEntry, records[0].fallback_entry_url); |
+ EXPECT_EQ(kFooFallbackEntry, records[0].target_url); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForCache(2, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForCache(2, &intercepts, &records)); |
EXPECT_EQ(1U, records.size()); |
EXPECT_EQ(2, records[0].cache_id); |
EXPECT_EQ(kFooOrigin, records[0].origin); |
EXPECT_EQ(kFooNameSpace2, records[0].namespace_url); |
- EXPECT_EQ(kFooFallbackEntry, records[0].fallback_entry_url); |
+ EXPECT_EQ(kFooFallbackEntry, records[0].target_url); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForOrigin(kFooOrigin, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForOrigin(kFooOrigin, &intercepts, &records)); |
EXPECT_EQ(2U, records.size()); |
EXPECT_EQ(1, records[0].cache_id); |
EXPECT_EQ(kFooOrigin, records[0].origin); |
EXPECT_EQ(kFooNameSpace1, records[0].namespace_url); |
- EXPECT_EQ(kFooFallbackEntry, records[0].fallback_entry_url); |
+ EXPECT_EQ(kFooFallbackEntry, records[0].target_url); |
EXPECT_EQ(2, records[1].cache_id); |
EXPECT_EQ(kFooOrigin, records[1].origin); |
EXPECT_EQ(kFooNameSpace2, records[1].namespace_url); |
- EXPECT_EQ(kFooFallbackEntry, records[1].fallback_entry_url); |
+ EXPECT_EQ(kFooFallbackEntry, records[1].target_url); |
- EXPECT_TRUE(db.DeleteFallbackNameSpacesForCache(1)); |
+ EXPECT_TRUE(db.DeleteNamespacesForCache(1)); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForOrigin(kFooOrigin, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForOrigin(kFooOrigin, &intercepts, &records)); |
EXPECT_EQ(1U, records.size()); |
EXPECT_EQ(2, records[0].cache_id); |
EXPECT_EQ(kFooOrigin, records[0].origin); |
EXPECT_EQ(kFooNameSpace2, records[0].namespace_url); |
- EXPECT_EQ(kFooFallbackEntry, records[0].fallback_entry_url); |
+ EXPECT_EQ(kFooFallbackEntry, records[0].target_url); |
// Two more records for the same cache in the Bar origin. |
record.cache_id = 3; |
record.origin = kBarOrigin; |
record.namespace_url = kBarNameSpace1; |
- record.fallback_entry_url = kBarFallbackEntry; |
- EXPECT_TRUE(db.InsertFallbackNameSpace(&record)); |
+ record.target_url = kBarFallbackEntry; |
+ EXPECT_TRUE(db.InsertNamespace(&record)); |
record.cache_id = 3; |
record.origin = kBarOrigin; |
record.namespace_url = kBarNameSpace2; |
- record.fallback_entry_url = kBarFallbackEntry; |
- EXPECT_TRUE(db.InsertFallbackNameSpace(&record)); |
+ record.target_url = kBarFallbackEntry; |
+ EXPECT_TRUE(db.InsertNamespace(&record)); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForCache(3, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForCache(3, &intercepts, &records)); |
EXPECT_EQ(2U, records.size()); |
records.clear(); |
- EXPECT_TRUE(db.FindFallbackNameSpacesForOrigin(kBarOrigin, &records)); |
+ EXPECT_TRUE(db.FindNamespacesForOrigin(kBarOrigin, &intercepts, &records)); |
EXPECT_EQ(2U, records.size()); |
} |