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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2901083002: [CacheStorage] Pad and bin opaque resource sizes. (Closed)
Patch Set: s/also also/also/ and EXPECT_GT ↔ EXPECT_LT 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 4e6db8e3c3fce7ae4030a7abd09f875ce136a7bc..bfecca15dbdf101242d1287cf12cf188a09f85a9 100644
--- a/content/browser/cache_storage/cache_storage_index_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_index_unittest.cc
@@ -14,7 +14,9 @@ class CacheStorageIndexTest : public testing::Test {
public:
void SetUp() override {}
void TearDown() override {}
- CacheStorageIndexTest() = default;
+ CacheStorageIndexTest() : padding_key_("abcd1234") {}
+
+ const std::string padding_key_;
private:
DISALLOW_COPY_AND_ASSIGN(CacheStorageIndexTest);
@@ -24,41 +26,62 @@ TEST_F(CacheStorageIndexTest, TestDefaultConstructor) {
CacheStorageIndex index;
EXPECT_EQ(0u, index.num_entries());
EXPECT_TRUE(index.ordered_cache_metadata().empty());
- EXPECT_EQ(0u, index.GetStorageSize());
+ EXPECT_EQ(0u, index.GetPaddedStorageSize());
}
TEST_F(CacheStorageIndexTest, TestSetCacheSize) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
+ 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(1031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
EXPECT_TRUE(index.SetCacheSize("baz", 2000));
- EXPECT_EQ(2031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 2000 + 4, index.GetPaddedStorageSize());
EXPECT_FALSE(index.SetCacheSize("baz", 2000));
- EXPECT_EQ(2031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 2000 + 4, index.GetPaddedStorageSize());
+
+ 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(2000, index.GetCacheSize("baz"));
- EXPECT_EQ(CacheStorage::kSizeUnknown, index.GetCacheSize("<not-present>"));
+ EXPECT_EQ(80, index.GetCachePaddingForTesting("baz"));
+ EXPECT_EQ(CacheStorage::kSizeUnknown,
+ index.GetCachePaddingForTesting("<not-present>"));
}
TEST_F(CacheStorageIndexTest, TestDoomCache) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
+ 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(1031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
index.DoomCache("bar");
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(1031 - 19, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 1000 + 4, index.GetPaddedStorageSize());
index.RestoreDoomedCache();
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
@@ -66,99 +89,108 @@ TEST_F(CacheStorageIndexTest, TestDoomCache) {
EXPECT_EQ("foo", (it++)->name);
EXPECT_EQ("bar", (it++)->name);
EXPECT_EQ("baz", (it++)->name);
- EXPECT_EQ(1031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
index.DoomCache("foo");
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(1031 - 12, index.GetStorageSize());
+ EXPECT_EQ(19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
index.FinalizeDoomedCache();
EXPECT_EQ(2u, index.num_entries());
ASSERT_EQ(2u, index.ordered_cache_metadata().size());
- EXPECT_EQ(1031 - 12, index.GetStorageSize());
+ EXPECT_EQ(19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
}
TEST_F(CacheStorageIndexTest, TestDelete) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
+ 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_));
EXPECT_EQ(3u, index.num_entries());
ASSERT_EQ(3u, index.ordered_cache_metadata().size());
- EXPECT_EQ(1031, index.GetStorageSize());
+ EXPECT_EQ(19 + 2 + 12 + 3 + 1000 + 4, index.GetPaddedStorageSize());
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(1012, index.GetStorageSize());
+ EXPECT_EQ(12 + 3 + 1000 + 4, index.GetPaddedStorageSize());
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, index.GetStorageSize());
+ EXPECT_EQ(12 + 3, index.GetPaddedStorageSize());
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));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
+ 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(1031, index.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index.GetPaddedStorageSize());
}
TEST_F(CacheStorageIndexTest, TestMoveOperator) {
CacheStorageIndex index;
- index.Insert(CacheStorageIndex::CacheMetadata("foo", 12));
- index.Insert(CacheStorageIndex::CacheMetadata("bar", 19));
- index.Insert(CacheStorageIndex::CacheMetadata("baz", 1000));
+ 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_));
CacheStorageIndex index2;
index2 = std::move(index);
EXPECT_EQ(3u, index2.num_entries());
EXPECT_EQ(3u, index2.ordered_cache_metadata().size());
- ASSERT_EQ(1031, index2.GetStorageSize());
+ ASSERT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index2.GetPaddedStorageSize());
EXPECT_EQ(0u, index.num_entries());
EXPECT_TRUE(index.ordered_cache_metadata().empty());
- EXPECT_EQ(0u, index.GetStorageSize());
+ EXPECT_EQ(0u, index.GetPaddedStorageSize());
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(1031, index2.GetStorageSize());
+ EXPECT_EQ(12 + 2 + 19 + 3 + 1000 + 4, index2.GetPaddedStorageSize());
}
} // 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