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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/cache_storage/cache_storage_index_unittest.cc

Issue 3002693002: Revert of [CacheStorage] Pad and bin opaque resource sizes. (Closed)
Patch Set: Created 3 years, 4 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 | « content/browser/cache_storage/cache_storage_index.cc ('k') | content/browser/cache_storage/cache_storage_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/cache_storage/cache_storage_index_unittest.cc
diff --git a/content/browser/cache_storage/cache_storage_index_unittest.cc b/content/browser/cache_storage/cache_storage_index_unittest.cc
index bfecca15dbdf101242d1287cf12cf188a09f85a9..4e6db8e3c3fce7ae4030a7abd09f875ce136a7bc 100644
--- a/content/browser/cache_storage/cache_storage_index_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_index_unittest.cc
@@ -14,9 +14,7 @@
public:
void SetUp() override {}
void TearDown() override {}
- CacheStorageIndexTest() : padding_key_("abcd1234") {}
-
- const std::string padding_key_;
+ CacheStorageIndexTest() = default;
private:
DISALLOW_COPY_AND_ASSIGN(CacheStorageIndexTest);
@@ -26,62 +24,41 @@
CacheStorageIndex index;
EXPECT_EQ(0u, index.num_entries());
EXPECT_TRUE(index.ordered_cache_metadata().empty());
- EXPECT_EQ(0u, index.GetPaddedStorageSize());
+ EXPECT_EQ(0u, index.GetStorageSize());
}
TEST_F(CacheStorageIndexTest, TestSetCacheSize) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
+ index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
+ index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
+ index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index.GetStorageSize());
EXPECT_TRUE(index.SetCacheSize("baz", 2000));
- EXPECT_EQ(12 + 2 + 19 + 3 + 2000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(2031, index.GetStorageSize());
EXPECT_FALSE(index.SetCacheSize("baz", 2000));
- EXPECT_EQ(12 + 2 + 19 + 3 + 2000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(2031, index.GetStorageSize());
- EXPECT_EQ(2000, index.GetCacheSizeForTesting("baz"));
- EXPECT_EQ(CacheStorage::kSizeUnknown,
- index.GetCacheSizeForTesting("<not-present>"));
-}
-
-TEST_F(CacheStorageIndexTest, TestSetCachePadding) {
- CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
- EXPECT_EQ(3u, index.num_entries());
- ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
-
- EXPECT_TRUE(index.SetCachePadding("baz", 80));
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 80, index.GetPaddedStorageSize());
-
- EXPECT_FALSE(index.SetCachePadding("baz", 80));
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 80, index.GetPaddedStorageSize());
-
- EXPECT_EQ(80, index.GetCachePaddingForTesting("baz"));
- EXPECT_EQ(CacheStorage::kSizeUnknown,
- index.GetCachePaddingForTesting("<not-present>"));
+ EXPECT_EQ(2000, index.GetCacheSize("baz"));
+ EXPECT_EQ(CacheStorage::kSizeUnknown, index.GetCacheSize("<not-present>"));
}
TEST_F(CacheStorageIndexTest, TestDoomCache) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
+ index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
+ index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
+ index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index.GetStorageSize());
index.DoomCache("bar");
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031 - 19, index.GetStorageSize());
index.RestoreDoomedCache();
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
@@ -89,108 +66,99 @@
EXPECT_EQ("foo", (it++)->name);
EXPECT_EQ("bar", (it++)->name);
EXPECT_EQ("baz", (it++)->name);
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index.GetStorageSize());
index.DoomCache("foo");
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031 - 12, index.GetStorageSize());
index.FinalizeDoomedCache();
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031 - 12, index.GetStorageSize());
}
TEST_F(CacheStorageIndexTest, TestDelete) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
+ index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
+ index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
+ index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(19 + 2 + 12 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index.GetStorageSize());
auto it = index.ordered_cache_metadata().begin();
EXPECT_EQ("bar", it->name);
EXPECT_EQ(19u, it->size);
- EXPECT_EQ(2u, it->padding);
it++;
EXPECT_EQ("foo", it->name);
EXPECT_EQ(12u, it->size);
- EXPECT_EQ(3u, it->padding);
it++;
EXPECT_EQ("baz", it->name);
EXPECT_EQ(1000u, it->size);
- EXPECT_EQ(4u, it->padding);
index.Delete("bar");
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1012, index.GetStorageSize());
it = index.ordered_cache_metadata().begin();
EXPECT_EQ("foo", it->name);
EXPECT_EQ(12u, it->size);
- EXPECT_EQ(3u, it->padding);
it++;
EXPECT_EQ("baz", it->name);
EXPECT_EQ(1000u, it->size);
- EXPECT_EQ(4u, it->padding);
index.Delete("baz");
EXPECT_EQ(1u, index.num_entries());
ASSERT_EQ(1u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 3, index.GetPaddedStorageSize());
+ EXPECT_EQ(12, index.GetStorageSize());
it = index.ordered_cache_metadata().begin();
EXPECT_EQ("foo", it->name);
EXPECT_EQ(12u, it->size);
- EXPECT_EQ(3u, it->padding);
}
TEST_F(CacheStorageIndexTest, TestInsert) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
+ index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
+ index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
+ index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index.GetStorageSize());
}
TEST_F(CacheStorageIndexTest, TestMoveOperator) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12, 2, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19, 3, padding_key_));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000, 4, padding_key_));
+ index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
+ index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
+ index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
CacheStorageIndex index2;
index2 = std::move(index);
EXPECT_EQ(3u, index2.num_entries());
EXPECT_EQ(3u, index2.ordered_cache_metadata().size());
- ASSERT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index2.GetPaddedStorageSize());
+ ASSERT_EQ(1031, index2.GetStorageSize());
EXPECT_EQ(0u, index.num_entries());
EXPECT_TRUE(index.ordered_cache_metadata().empty());
- EXPECT_EQ(0u, index.GetPaddedStorageSize());
+ EXPECT_EQ(0u, index.GetStorageSize());
auto it = index2.ordered_cache_metadata().begin();
EXPECT_EQ("foo", it->name);
EXPECT_EQ(12u, it->size);
- EXPECT_EQ(2u, it->padding);
it++;
EXPECT_EQ("bar", it->name);
EXPECT_EQ(19u, it->size);
- EXPECT_EQ(3u, it->padding);
it++;
EXPECT_EQ("baz", it->name);
EXPECT_EQ(1000u, it->size);
- EXPECT_EQ(4u, it->padding);
EXPECT_EQ(3u, index2.num_entries());
ASSERT_EQ(3u, index2.ordered_cache_metadata().size());
- EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index2.GetPaddedStorageSize());
+ EXPECT_EQ(1031, index2.GetStorageSize());
}
} // namespace content
« no previous file with comments | « content/browser/cache_storage/cache_storage_index.cc ('k') | content/browser/cache_storage/cache_storage_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698