summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/mock_appcache_storage_unittest.cc
diff options
context:
space:
mode:
authorjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 22:57:48 +0000
committerjennb@chromium.org <jennb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 22:57:48 +0000
commit63f359f721c6f7ddc20c274b8e3e2b5df7b95a88 (patch)
tree17316cf5369ef8cf0627d2244b05e3948e27d7a7 /webkit/appcache/mock_appcache_storage_unittest.cc
parent712257e6ca930697de2a5c1d5e0a4311262e5a2c (diff)
downloadchromium_src-63f359f721c6f7ddc20c274b8e3e2b5df7b95a88.zip
chromium_src-63f359f721c6f7ddc20c274b8e3e2b5df7b95a88.tar.gz
chromium_src-63f359f721c6f7ddc20c274b8e3e2b5df7b95a88.tar.bz2
Change store group and newest cache API so that storage failure does not require storage clients to revert changes to group and so it's not racey.TEST=existing tests updatedBUG=none
Review URL: http://codereview.chromium.org/384029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/mock_appcache_storage_unittest.cc')
-rw-r--r--webkit/appcache/mock_appcache_storage_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc
index 911ec7c..404df50 100644
--- a/webkit/appcache/mock_appcache_storage_unittest.cc
+++ b/webkit/appcache/mock_appcache_storage_unittest.cc
@@ -210,7 +210,6 @@ TEST_F(MockAppCacheStorageTest, StoreNewGroup) {
int64 cache_id = storage->NewCacheId();
scoped_refptr<AppCache> cache = new AppCache(&service, cache_id);
cache->set_complete(true);
- group->AddCache(cache);
// Hold a ref to the cache simulate the UpdateJob holding that ref,
// and hold a ref to the group to simulate the CacheHost holding that ref.
@@ -218,7 +217,7 @@ TEST_F(MockAppCacheStorageTest, StoreNewGroup) {
MockStorageDelegate delegate;
EXPECT_TRUE(storage->stored_caches_.empty());
EXPECT_TRUE(storage->stored_groups_.empty());
- storage->StoreGroupAndNewestCache(group, &delegate);
+ storage->StoreGroupAndNewestCache(group, cache, &delegate);
EXPECT_FALSE(delegate.stored_group_success_);
EXPECT_TRUE(storage->stored_caches_.empty());
EXPECT_TRUE(storage->stored_groups_.empty());
@@ -226,6 +225,7 @@ TEST_F(MockAppCacheStorageTest, StoreNewGroup) {
EXPECT_TRUE(delegate.stored_group_success_);
EXPECT_FALSE(storage->stored_caches_.empty());
EXPECT_FALSE(storage->stored_groups_.empty());
+ EXPECT_EQ(cache, group->newest_complete_cache());
}
TEST_F(MockAppCacheStorageTest, StoreExistingGroup) {
@@ -248,8 +248,6 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) {
int64 new_cache_id = storage->NewCacheId();
scoped_refptr<AppCache> new_cache = new AppCache(&service, new_cache_id);
new_cache->set_complete(true);
- group->AddCache(new_cache);
- EXPECT_EQ(new_cache.get(), group->newest_complete_cache());
// Hold our refs to simulate the UpdateJob holding these refs.
// Conduct the test.
@@ -258,7 +256,7 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) {
EXPECT_EQ(size_t(1), storage->stored_groups_.size());
EXPECT_TRUE(storage->IsCacheStored(old_cache));
EXPECT_FALSE(storage->IsCacheStored(new_cache));
- storage->StoreGroupAndNewestCache(group, &delegate);
+ storage->StoreGroupAndNewestCache(group, new_cache, &delegate);
EXPECT_FALSE(delegate.stored_group_success_);
EXPECT_EQ(size_t(1), storage->stored_caches_.size());
EXPECT_EQ(size_t(1), storage->stored_groups_.size());
@@ -270,6 +268,7 @@ TEST_F(MockAppCacheStorageTest, StoreExistingGroup) {
EXPECT_EQ(size_t(1), storage->stored_groups_.size());
EXPECT_FALSE(storage->IsCacheStored(old_cache));
EXPECT_TRUE(storage->IsCacheStored(new_cache));
+ EXPECT_EQ(new_cache.get(), group->newest_complete_cache());
}
TEST_F(MockAppCacheStorageTest, MakeGroupObsolete) {