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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/hpack_header_table_test.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/spdy/hpack_header_table.cc ('k') | net/spdy/hpack_huffman_aggregator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/hpack_header_table_test.cc
diff --git a/net/spdy/hpack_header_table_test.cc b/net/spdy/hpack_header_table_test.cc
index 90d8135240a294f33217f8328a7fc9c33607fabf..f549130ece83fac5ee8d45fd6d92a871d13c929b 100644
--- a/net/spdy/hpack_header_table_test.cc
+++ b/net/spdy/hpack_header_table_test.cc
@@ -25,8 +25,7 @@ namespace test {
class HpackHeaderTablePeer {
public:
- explicit HpackHeaderTablePeer(HpackHeaderTable* table)
- : table_(table) {}
+ explicit HpackHeaderTablePeer(HpackHeaderTable* table) : table_(table) {}
const HpackHeaderTable::EntryTable& dynamic_entries() {
return table_->dynamic_entries_;
@@ -34,9 +33,7 @@ class HpackHeaderTablePeer {
const HpackHeaderTable::EntryTable& static_entries() {
return table_->static_entries_;
}
- const HpackEntry::OrderedSet& index() {
- return table_->index_;
- }
+ const HpackEntry::OrderedSet& index() { return table_->index_; }
std::vector<HpackEntry*> EvictionSet(StringPiece name, StringPiece value) {
HpackHeaderTable::EntryTable::iterator begin, end;
table_->EvictionSet(name, value, &begin, &end);
@@ -46,21 +43,15 @@ class HpackHeaderTablePeer {
}
return result;
}
- size_t total_insertions() {
- return table_->total_insertions_;
- }
- size_t dynamic_entries_count() {
- return table_->dynamic_entries_count_;
- }
+ size_t total_insertions() { return table_->total_insertions_; }
+ size_t dynamic_entries_count() { return table_->dynamic_entries_count_; }
size_t EvictionCountForEntry(StringPiece name, StringPiece value) {
return table_->EvictionCountForEntry(name, value);
}
size_t EvictionCountToReclaim(size_t reclaim_size) {
return table_->EvictionCountToReclaim(reclaim_size);
}
- void Evict(size_t count) {
- return table_->Evict(count);
- }
+ void Evict(size_t count) { return table_->Evict(count); }
private:
HpackHeaderTable* table_;
@@ -74,9 +65,7 @@ class HpackHeaderTableTest : public ::testing::Test {
protected:
typedef std::vector<HpackEntry> HpackEntryVector;
- HpackHeaderTableTest()
- : table_(),
- peer_(&table_) {}
+ HpackHeaderTableTest() : table_(), peer_(&table_) {}
// Returns an entry whose Size() is equal to the given one.
static HpackEntry MakeEntryOfSize(uint32 size) {
@@ -108,7 +97,8 @@ class HpackHeaderTableTest : public ::testing::Test {
// expecting no eviction to happen.
void AddEntriesExpectNoEviction(const HpackEntryVector& entries) {
for (HpackEntryVector::const_iterator it = entries.begin();
- it != entries.end(); ++it) {
+ it != entries.end();
+ ++it) {
HpackHeaderTable::EntryTable::iterator begin, end;
table_.EvictionSet(it->name(), it->value(), &begin, &end);
@@ -194,15 +184,16 @@ TEST_F(HpackHeaderTableTest, EntryIndexing) {
// Static entries are queryable by name & value.
EXPECT_EQ(first_static_entry, table_.GetByName(first_static_entry->name()));
- EXPECT_EQ(first_static_entry, table_.GetByNameAndValue(
- first_static_entry->name(), first_static_entry->value()));
+ EXPECT_EQ(first_static_entry,
+ table_.GetByNameAndValue(first_static_entry->name(),
+ first_static_entry->value()));
// Create a mix of entries which duplicate names, and names & values of both
// dynamic and static entries.
HpackEntry* entry1 = table_.TryAddEntry(first_static_entry->name(),
first_static_entry->value());
- HpackEntry* entry2 = table_.TryAddEntry(first_static_entry->name(),
- "Value Four");
+ HpackEntry* entry2 =
+ table_.TryAddEntry(first_static_entry->name(), "Value Four");
HpackEntry* entry3 = table_.TryAddEntry("key-1", "Value One");
HpackEntry* entry4 = table_.TryAddEntry("key-2", "Value Three");
HpackEntry* entry5 = table_.TryAddEntry("key-1", "Value Two");
@@ -231,10 +222,11 @@ TEST_F(HpackHeaderTableTest, EntryIndexing) {
EXPECT_EQ(entry5, table_.GetByNameAndValue("key-1", "Value Two"));
EXPECT_EQ(entry6, table_.GetByNameAndValue("key-2", "Value Three"));
EXPECT_EQ(entry7, table_.GetByNameAndValue("key-2", "Value Four"));
- EXPECT_EQ(entry1, table_.GetByNameAndValue(first_static_entry->name(),
- first_static_entry->value()));
- EXPECT_EQ(entry2, table_.GetByNameAndValue(first_static_entry->name(),
- "Value Four"));
+ EXPECT_EQ(entry1,
+ table_.GetByNameAndValue(first_static_entry->name(),
+ first_static_entry->value()));
+ EXPECT_EQ(entry2,
+ table_.GetByNameAndValue(first_static_entry->name(), "Value Four"));
EXPECT_EQ(NULL, table_.GetByNameAndValue("key-1", "Not Present"));
EXPECT_EQ(NULL, table_.GetByNameAndValue("not-present", "Value One"));
@@ -242,15 +234,15 @@ TEST_F(HpackHeaderTableTest, EntryIndexing) {
// |entry2| remains queryable.
peer_.Evict(1);
EXPECT_EQ(first_static_entry,
- table_.GetByNameAndValue(first_static_entry->name(),
- first_static_entry->value()));
- EXPECT_EQ(entry2, table_.GetByNameAndValue(first_static_entry->name(),
- "Value Four"));
+ table_.GetByNameAndValue(first_static_entry->name(),
+ first_static_entry->value()));
+ EXPECT_EQ(entry2,
+ table_.GetByNameAndValue(first_static_entry->name(), "Value Four"));
// Evict |entry2|. Queries by its name & value are not found.
peer_.Evict(1);
- EXPECT_EQ(NULL, table_.GetByNameAndValue(first_static_entry->name(),
- "Value Four"));
+ EXPECT_EQ(NULL,
+ table_.GetByNameAndValue(first_static_entry->name(), "Value Four"));
}
TEST_F(HpackHeaderTableTest, SetSizes) {
@@ -272,7 +264,7 @@ TEST_F(HpackHeaderTableTest, SetSizes) {
// Changing SETTINGS_HEADER_TABLE_SIZE doesn't affect table_.max_size(),
// iff SETTINGS_HEADER_TABLE_SIZE >= |max_size|.
EXPECT_EQ(kDefaultHeaderTableSizeSetting, table_.settings_size_bound());
- table_.SetSettingsHeaderTableSize(kDefaultHeaderTableSizeSetting*2);
+ table_.SetSettingsHeaderTableSize(kDefaultHeaderTableSizeSetting * 2);
EXPECT_EQ(max_size, table_.max_size());
table_.SetSettingsHeaderTableSize(max_size + 1);
EXPECT_EQ(max_size, table_.max_size());
@@ -373,12 +365,12 @@ TEST_F(HpackHeaderTableTest, TryAddEntryBasic) {
// size down to evict an entry one at a time. Make sure the eviction
// happens as expected.
TEST_F(HpackHeaderTableTest, SetMaxSize) {
- HpackEntryVector entries = MakeEntriesOfTotalSize(
- kDefaultHeaderTableSizeSetting / 2);
+ HpackEntryVector entries =
+ MakeEntriesOfTotalSize(kDefaultHeaderTableSizeSetting / 2);
AddEntriesExpectNoEviction(entries);
- for (HpackEntryVector::iterator it = entries.begin();
- it != entries.end(); ++it) {
+ for (HpackEntryVector::iterator it = entries.begin(); it != entries.end();
+ ++it) {
size_t expected_count = distance(it, entries.end());
EXPECT_EQ(expected_count, peer_.dynamic_entries().size());
@@ -408,11 +400,11 @@ TEST_F(HpackHeaderTableTest, TryAddEntryEviction) {
MakeEntryOfSize(table_.max_size() - survivor_entry->Size());
// All entries but the first are to be evicted.
- EXPECT_EQ(peer_.dynamic_entries().size() - 1, peer_.EvictionSet(
- long_entry.name(), long_entry.value()).size());
+ EXPECT_EQ(peer_.dynamic_entries().size() - 1,
+ peer_.EvictionSet(long_entry.name(), long_entry.value()).size());
- HpackEntry* new_entry = table_.TryAddEntry(long_entry.name(),
- long_entry.value());
+ HpackEntry* new_entry =
+ table_.TryAddEntry(long_entry.name(), long_entry.value());
EXPECT_EQ(1u, new_entry->Index());
EXPECT_EQ(2u, peer_.dynamic_entries().size());
EXPECT_EQ(table_.GetByIndex(2), survivor_entry);
@@ -428,11 +420,11 @@ TEST_F(HpackHeaderTableTest, TryAddTooLargeEntry) {
HpackEntry long_entry = MakeEntryOfSize(table_.max_size() + 1);
// All entries are to be evicted.
- EXPECT_EQ(peer_.dynamic_entries().size(), peer_.EvictionSet(
- long_entry.name(), long_entry.value()).size());
+ EXPECT_EQ(peer_.dynamic_entries().size(),
+ peer_.EvictionSet(long_entry.name(), long_entry.value()).size());
- HpackEntry* new_entry = table_.TryAddEntry(long_entry.name(),
- long_entry.value());
+ HpackEntry* new_entry =
+ table_.TryAddEntry(long_entry.name(), long_entry.value());
EXPECT_EQ(new_entry, static_cast<HpackEntry*>(NULL));
EXPECT_EQ(0u, peer_.dynamic_entries().size());
}
« net/base/mime_util_unittest.cc ('K') | « net/spdy/hpack_header_table.cc ('k') | net/spdy/hpack_huffman_aggregator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698