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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/disk_cache/simple/simple_index_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/disk_cache/simple/simple_index_file_win.cc ('k') | net/disk_cache/simple/simple_synchronous_entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/simple/simple_index_unittest.cc
diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc
index 0afbaa2a058dadea7f5bb8be89e264e93030baef..6fc3e1353dcf01594e9f0912978b459e91e15dd5 100644
--- a/net/disk_cache/simple/simple_index_unittest.cc
+++ b/net/disk_cache/simple/simple_index_unittest.cc
@@ -32,8 +32,7 @@ const int kTestEntrySize = 789;
} // namespace
-
-class EntryMetadataTest : public testing::Test {
+class EntryMetadataTest : public testing::Test {
public:
EntryMetadata NewEntryMetadataWithValues() {
return EntryMetadata(kTestLastUsedTime, kTestEntrySize);
@@ -91,11 +90,10 @@ class MockSimpleIndexFile : public SimpleIndexFile,
SimpleIndex::EntrySet disk_write_entry_set_;
};
-class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
+class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
protected:
SimpleIndexTest()
- : hashes_(base::Bind(&HashesInitializer)),
- doom_entries_calls_(0) {}
+ : hashes_(base::Bind(&HashesInitializer)), doom_entries_calls_(0) {}
static uint64 HashesInitializer(size_t hash_index) {
return disk_cache::simple_util::GetEntryHashKey(
@@ -105,8 +103,8 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
virtual void SetUp() OVERRIDE {
scoped_ptr<MockSimpleIndexFile> index_file(new MockSimpleIndexFile());
index_file_ = index_file->AsWeakPtr();
- index_.reset(new SimpleIndex(NULL, this, net::DISK_CACHE,
- index_file.PassAs<SimpleIndexFile>()));
+ index_.reset(new SimpleIndex(
+ NULL, this, net::DISK_CACHE, index_file.PassAs<SimpleIndexFile>()));
index_->Initialize(base::Time());
}
@@ -115,16 +113,17 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
const base::Time initial_time = base::Time::Now();
do {
base::PlatformThread::YieldCurrentThread();
- } while (base::Time::Now() -
- initial_time < base::TimeDelta::FromSeconds(1));
+ } while (base::Time::Now() - initial_time <
+ base::TimeDelta::FromSeconds(1));
}
// From SimpleIndexDelegate:
virtual void DoomEntries(std::vector<uint64>* entry_hashes,
const net::CompletionCallback& callback) OVERRIDE {
- std::for_each(entry_hashes->begin(), entry_hashes->end(),
- std::bind1st(std::mem_fun(&SimpleIndex::Remove),
- index_.get()));
+ std::for_each(
+ entry_hashes->begin(),
+ entry_hashes->end(),
+ std::bind1st(std::mem_fun(&SimpleIndex::Remove), index_.get()));
last_doom_entry_hashes_ = *entry_hashes;
++doom_entries_calls_;
}
@@ -141,8 +140,8 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
void InsertIntoIndexFileReturn(uint64 hash_key,
base::Time last_used_time,
int entry_size) {
- index_file_->load_result()->entries.insert(std::make_pair(
- hash_key, EntryMetadata(last_used_time, entry_size)));
+ index_file_->load_result()->entries.insert(
+ std::make_pair(hash_key, EntryMetadata(last_used_time, entry_size)));
}
void ReturnIndexFile() {
@@ -159,7 +158,6 @@ class SimpleIndexTest : public testing::Test, public SimpleIndexDelegate {
}
int doom_entries_calls() const { return doom_entries_calls_; }
-
const simple_util::ImmutableArray<uint64, 16> hashes_;
scoped_ptr<SimpleIndex> index_;
base::WeakPtr<MockSimpleIndexFile> index_file_;
@@ -366,12 +364,10 @@ TEST_F(SimpleIndexTest, GetEntryCount) {
TEST_F(SimpleIndexTest, BasicInit) {
base::Time now(base::Time::Now());
- InsertIntoIndexFileReturn(hashes_.at<1>(),
- now - base::TimeDelta::FromDays(2),
- 10u);
- InsertIntoIndexFileReturn(hashes_.at<2>(),
- now - base::TimeDelta::FromDays(3),
- 100u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<1>(), now - base::TimeDelta::FromDays(2), 10u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<2>(), now - base::TimeDelta::FromDays(3), 100u);
ReturnIndexFile();
@@ -399,9 +395,8 @@ TEST_F(SimpleIndexTest, RemoveBeforeInit) {
const uint64 kHash1 = hashes_.at<1>();
index()->Remove(kHash1);
- InsertIntoIndexFileReturn(kHash1,
- base::Time::Now() - base::TimeDelta::FromDays(2),
- 10u);
+ InsertIntoIndexFileReturn(
+ kHash1, base::Time::Now() - base::TimeDelta::FromDays(2), 10u);
ReturnIndexFile();
EXPECT_FALSE(index()->Has(kHash1));
@@ -413,9 +408,8 @@ TEST_F(SimpleIndexTest, InsertBeforeInit) {
const uint64 kHash1 = hashes_.at<1>();
index()->Insert(kHash1);
- InsertIntoIndexFileReturn(kHash1,
- base::Time::Now() - base::TimeDelta::FromDays(2),
- 10u);
+ InsertIntoIndexFileReturn(
+ kHash1, base::Time::Now() - base::TimeDelta::FromDays(2), 10u);
ReturnIndexFile();
EntryMetadata metadata;
@@ -432,9 +426,8 @@ TEST_F(SimpleIndexTest, InsertRemoveBeforeInit) {
index()->Insert(kHash1);
index()->Remove(kHash1);
- InsertIntoIndexFileReturn(kHash1,
- base::Time::Now() - base::TimeDelta::FromDays(2),
- 10u);
+ InsertIntoIndexFileReturn(
+ kHash1, base::Time::Now() - base::TimeDelta::FromDays(2), 10u);
ReturnIndexFile();
EXPECT_FALSE(index()->Has(kHash1));
@@ -446,9 +439,8 @@ TEST_F(SimpleIndexTest, RemoveInsertBeforeInit) {
index()->Remove(kHash1);
index()->Insert(kHash1);
- InsertIntoIndexFileReturn(kHash1,
- base::Time::Now() - base::TimeDelta::FromDays(2),
- 10u);
+ InsertIntoIndexFileReturn(
+ kHash1, base::Time::Now() - base::TimeDelta::FromDays(2), 10u);
ReturnIndexFile();
EntryMetadata metadata;
@@ -465,26 +457,21 @@ TEST_F(SimpleIndexTest, AllInitConflicts) {
base::Time now(base::Time::Now());
index()->Remove(hashes_.at<1>());
- InsertIntoIndexFileReturn(hashes_.at<1>(),
- now - base::TimeDelta::FromDays(2),
- 10u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<1>(), now - base::TimeDelta::FromDays(2), 10u);
index()->Insert(hashes_.at<2>());
- InsertIntoIndexFileReturn(hashes_.at<2>(),
- now - base::TimeDelta::FromDays(3),
- 100u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<2>(), now - base::TimeDelta::FromDays(3), 100u);
index()->Insert(hashes_.at<3>());
index()->Remove(hashes_.at<3>());
- InsertIntoIndexFileReturn(hashes_.at<3>(),
- now - base::TimeDelta::FromDays(4),
- 1000u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<3>(), now - base::TimeDelta::FromDays(4), 1000u);
index()->Remove(hashes_.at<4>());
index()->Insert(hashes_.at<4>());
- InsertIntoIndexFileReturn(hashes_.at<4>(),
- now - base::TimeDelta::FromDays(5),
- 10000u);
- InsertIntoIndexFileReturn(hashes_.at<5>(),
- now - base::TimeDelta::FromDays(6),
- 100000u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<4>(), now - base::TimeDelta::FromDays(5), 10000u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<5>(), now - base::TimeDelta::FromDays(6), 100000u);
ReturnIndexFile();
@@ -518,9 +505,8 @@ TEST_F(SimpleIndexTest, AllInitConflicts) {
TEST_F(SimpleIndexTest, BasicEviction) {
base::Time now(base::Time::Now());
index()->SetMaxSize(1000);
- InsertIntoIndexFileReturn(hashes_.at<1>(),
- now - base::TimeDelta::FromDays(2),
- 475u);
+ InsertIntoIndexFileReturn(
+ hashes_.at<1>(), now - base::TimeDelta::FromDays(2), 475u);
index()->Insert(hashes_.at<2>());
index()->UpdateEntrySize(hashes_.at<2>(), 475);
ReturnIndexFile();
« net/base/mime_util_unittest.cc ('K') | « net/disk_cache/simple/simple_index_file_win.cc ('k') | net/disk_cache/simple/simple_synchronous_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698