Moves HpackEntry index computation into the container class HpackHeaderTable.

net/spdy/hpack_header_table_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/hpack_header_table.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
  public:
   explicit HpackHeaderTablePeer(HpackHeaderTable* table)
       : table_(table) {}
 
   const HpackHeaderTable::EntryTable& dynamic_entries() {
     return table_->dynamic_entries_;
   }
   const HpackHeaderTable::EntryTable& static_entries() {
     return table_->static_entries_;
   }
-  const HpackEntry::OrderedSet& index() {
+  const HpackHeaderTable::OrderedEntrySet& index() {
     return table_->index_;
   }
   std::vector<HpackEntry*> EvictionSet(StringPiece name, StringPiece value) {
     HpackHeaderTable::EntryTable::iterator begin, end;
     table_->EvictionSet(name, value, &begin, &end);
     std::vector<HpackEntry*> result;
     for (; begin != end; ++begin) {
       result.push_back(&(*begin));
     }
     return result;
   }
   size_t total_insertions() {
     return table_->total_insertions_;
   }
   size_t dynamic_entries_count() {
-    return table_->dynamic_entries_count_;
+    return table_->dynamic_entries_.size();
   }
   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 AddStaticEntry(StringPiece name, StringPiece value) {
+    table_->static_entries_.push_back(
+        HpackEntry(name, value, true, table_->total_insertions_++));
+  }
+
+  void AddDynamicEntry(StringPiece name, StringPiece value) {
+    table_->dynamic_entries_.push_back(
+        HpackEntry(name, value, false, table_->total_insertions_++));
+  }
+
  private:
   HpackHeaderTable* table_;
 };
 
 }  // namespace test
 
 namespace {
 
 class HpackHeaderTableTest : public ::testing::Test {
  protected:
   typedef std::vector<HpackEntry> HpackEntryVector;
 
   HpackHeaderTableTest()
       : table_(),
-        peer_(&table_) {}
+        peer_(&table_),
+        name_("header-name"),
+        value_("header value") {}
 
   // Returns an entry whose Size() is equal to the given one.
   static HpackEntry MakeEntryOfSize(uint32 size) {
     EXPECT_GE(size, HpackEntry::kSizeOverhead);
     string name((size - HpackEntry::kSizeOverhead) / 2, 'n');
     string value(size - HpackEntry::kSizeOverhead - name.size(), 'v');
     HpackEntry entry(name, value);
     EXPECT_EQ(size, entry.Size());
     return entry;
   }
@@ skipping 26 matching lines @@
 
       HpackEntry* entry = table_.TryAddEntry(it->name(), it->value());
       EXPECT_NE(entry, static_cast<HpackEntry*>(NULL));
     }
 
     for (size_t i = 0; i != entries.size(); ++i) {
       size_t index = entries.size() - i;
       HpackEntry* entry = table_.GetByIndex(index);
       EXPECT_EQ(entries[i].name(), entry->name());
       EXPECT_EQ(entries[i].value(), entry->value());
-      EXPECT_EQ(index, entry->Index());
+      EXPECT_EQ(index, table_.IndexOf(entry));
     }
   }
 
+  HpackEntry StaticEntry() {
+    peer_.AddStaticEntry(name_, value_);
+    return peer_.static_entries().back();
+  }
+  HpackEntry DynamicEntry() {
+    peer_.AddDynamicEntry(name_, value_);
+    return peer_.dynamic_entries().back();
+  }
+
   HpackHeaderTable table_;
   test::HpackHeaderTablePeer peer_;
+  string name_, value_;
 };
 
 TEST_F(HpackHeaderTableTest, StaticTableInitialization) {
   EXPECT_EQ(0u, table_.size());
   EXPECT_EQ(kDefaultHeaderTableSizeSetting, table_.max_size());
   EXPECT_EQ(kDefaultHeaderTableSizeSetting, table_.settings_size_bound());
 
   EXPECT_EQ(0u, peer_.dynamic_entries_count());
   EXPECT_EQ(0u, table_.reference_set().size());
   EXPECT_EQ(peer_.static_entries().size(), peer_.total_insertions());
 
   // Static entries have been populated and inserted into the table & index.
   EXPECT_NE(0u, peer_.static_entries().size());
   EXPECT_EQ(peer_.index().size(), peer_.static_entries().size());
   for (size_t i = 0; i != peer_.static_entries().size(); ++i) {
     const HpackEntry* entry = &peer_.static_entries()[i];
 
     EXPECT_TRUE(entry->IsStatic());
     EXPECT_EQ(entry, table_.GetByIndex(i + 1));
     EXPECT_EQ(entry, table_.GetByNameAndValue(entry->name(), entry->value()));
   }
 }
 
 TEST_F(HpackHeaderTableTest, BasicDynamicEntryInsertionAndEviction) {
   size_t static_count = peer_.total_insertions();
   HpackEntry* first_static_entry = table_.GetByIndex(1);
 
-  EXPECT_EQ(1u, first_static_entry->Index());
+  EXPECT_EQ(1u, table_.IndexOf(first_static_entry));
 
   HpackEntry* entry = table_.TryAddEntry("header-key", "Header Value");
   EXPECT_EQ("header-key", entry->name());
   EXPECT_EQ("Header Value", entry->value());
   EXPECT_FALSE(entry->IsStatic());
 
   // Table counts were updated appropriately.
   EXPECT_EQ(entry->Size(), table_.size());
   EXPECT_EQ(1u, peer_.dynamic_entries_count());
   EXPECT_EQ(peer_.dynamic_entries().size(), peer_.dynamic_entries_count());
   EXPECT_EQ(static_count + 1, peer_.total_insertions());
   EXPECT_EQ(static_count + 1, peer_.index().size());
 
   // Index() of entries reflects the insertion.
-  EXPECT_EQ(1u, entry->Index());
-  EXPECT_EQ(2u, first_static_entry->Index());
+  EXPECT_EQ(1u, table_.IndexOf(entry));
+  EXPECT_EQ(2u, table_.IndexOf(first_static_entry));
   EXPECT_EQ(entry, table_.GetByIndex(1));
   EXPECT_EQ(first_static_entry, table_.GetByIndex(2));
 
   // Evict |entry|. Table counts are again updated appropriately.
   peer_.Evict(1);
   EXPECT_EQ(0u, table_.size());
   EXPECT_EQ(0u, peer_.dynamic_entries_count());
   EXPECT_EQ(peer_.dynamic_entries().size(), peer_.dynamic_entries_count());
   EXPECT_EQ(static_count + 1, peer_.total_insertions());
   EXPECT_EQ(static_count, peer_.index().size());
 
   // Index() of |first_static_entry| reflects the eviction.
-  EXPECT_EQ(1u, first_static_entry->Index());
+  EXPECT_EQ(1u, table_.IndexOf(first_static_entry));
   EXPECT_EQ(first_static_entry, table_.GetByIndex(1));
 }
 
 TEST_F(HpackHeaderTableTest, EntryIndexing) {
   HpackEntry* first_static_entry = table_.GetByIndex(1);
 
   // 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()));
@@ skipping 207 matching lines @@
   HpackEntry* survivor_entry = table_.GetByIndex(1);
   HpackEntry long_entry =
       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());
 
   HpackEntry* new_entry = table_.TryAddEntry(long_entry.name(),
                                              long_entry.value());
-  EXPECT_EQ(1u, new_entry->Index());
+  EXPECT_EQ(1u, table_.IndexOf(new_entry));
   EXPECT_EQ(2u, peer_.dynamic_entries().size());
   EXPECT_EQ(table_.GetByIndex(2), survivor_entry);
   EXPECT_EQ(table_.GetByIndex(1), new_entry);
 }
 
 // Fill a header table with entries, and then add an entry bigger than
 // the entire table. Make sure no entry remains in the table.
 TEST_F(HpackHeaderTableTest, TryAddTooLargeEntry) {
   HpackEntryVector entries = MakeEntriesOfTotalSize(table_.max_size());
   AddEntriesExpectNoEviction(entries);
 
   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());
 
   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());
 }
 
+TEST_F(HpackHeaderTableTest, ComparatorNameOrdering) {
+  HpackEntry entry1(StaticEntry());
+  name_[0]--;
+  HpackEntry entry2(StaticEntry());
+
+  HpackHeaderTable::EntryComparator comparator(&table_);
+  EXPECT_FALSE(comparator(&entry1, &entry2));
+  EXPECT_TRUE(comparator(&entry2, &entry1));
+}
+
+TEST_F(HpackHeaderTableTest, ComparatorValueOrdering) {
+  HpackEntry entry1(StaticEntry());
+  value_[0]--;
+  HpackEntry entry2(StaticEntry());
+
+  HpackHeaderTable::EntryComparator comparator(&table_);
+  EXPECT_FALSE(comparator(&entry1, &entry2));
+  EXPECT_TRUE(comparator(&entry2, &entry1));
+}
+
+TEST_F(HpackHeaderTableTest, ComparatorIndexOrdering) {
+  HpackEntry entry1(StaticEntry());
+  HpackEntry entry2(StaticEntry());
+
+  HpackHeaderTable::EntryComparator comparator(&table_);
+  EXPECT_TRUE(comparator(&entry1, &entry2));
+  EXPECT_FALSE(comparator(&entry2, &entry1));
+
+  HpackEntry entry3(DynamicEntry());
+  HpackEntry entry4(DynamicEntry());
+
+  // |entry4| has lower index than |entry3|.
+  EXPECT_TRUE(comparator(&entry4, &entry3));
+  EXPECT_FALSE(comparator(&entry3, &entry4));
+
+  // |entry3| has lower index than |entry1|.
+  EXPECT_TRUE(comparator(&entry3, &entry1));
+  EXPECT_FALSE(comparator(&entry1, &entry3));
+
+  // |entry1| & |entry2| ordering is preserved, though each Index() has changed.
+  EXPECT_TRUE(comparator(&entry1, &entry2));
+  EXPECT_FALSE(comparator(&entry2, &entry1));
+}
+
+TEST_F(HpackHeaderTableTest, ComparatorEqualityOrdering) {
+  HpackEntry entry1(StaticEntry());
+  HpackEntry entry2(DynamicEntry());
+
+  HpackHeaderTable::EntryComparator comparator(&table_);
+  EXPECT_FALSE(comparator(&entry1, &entry1));
+  EXPECT_FALSE(comparator(&entry2, &entry2));
+}
+
 }  // namespace
 
 }  // namespace net