Avoid duplicates in SPDY's write blocked list.

net/spdy/write_blocked_list_test.cc

Index: net/spdy/write_blocked_list_test.cc
diff --git a/net/spdy/write_blocked_list_test.cc b/net/spdy/write_blocked_list_test.cc
index edb309e818b1b82d385bebcd046049821436bb43..ef5ea5084182b949e65e313c19a619277ea93bef 100644
--- a/net/spdy/write_blocked_list_test.cc
+++ b/net/spdy/write_blocked_list_test.cc
@@ -26,8 +26,14 @@ namespace test {
 namespace {
 typedef WriteBlockedList<int> IntWriteBlockedList;
 
-TEST(WriteBlockedListTest, GetHighestPriority) {
+class WriteBlockedListTest : public ::testing::TestWithParam<bool> {
+ public:
+  WriteBlockedListTest() : list(GetParam()) {}
+
   IntWriteBlockedList list;
+};
+
+TEST_P(WriteBlockedListTest, GetHighestPriority) {
   EXPECT_FALSE(list.HasWriteBlockedStreams());
   list.PushBack(1, 1);
   EXPECT_TRUE(list.HasWriteBlockedStreams());
@@ -37,19 +43,16 @@ TEST(WriteBlockedListTest, GetHighestPriority) {
   EXPECT_EQ(0, list.GetHighestPriorityWriteBlockedList());
 }
 
-TEST(WriteBlockedListTest, HasWriteBlockedStreamsOfGreaterThanPriority) {
-  IntWriteBlockedList list;
+TEST_P(WriteBlockedListTest, HasWriteBlockedStreamsOfGreaterThanPriority) {
   list.PushBack(1, 4);
   EXPECT_TRUE(list.HasWriteBlockedStreamsGreaterThanPriority(5));
   EXPECT_FALSE(list.HasWriteBlockedStreamsGreaterThanPriority(4));
-  list.PushBack(1, 2);
+  list.PushBack(2, 2);
   EXPECT_TRUE(list.HasWriteBlockedStreamsGreaterThanPriority(3));
   EXPECT_FALSE(list.HasWriteBlockedStreamsGreaterThanPriority(2));
 }
 
-TEST(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
-  IntWriteBlockedList list;
-
+TEST_P(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
   list.PushBack(1, 4);
   EXPECT_TRUE(list.HasWriteBlockedStreams());
 
@@ -66,63 +69,100 @@ TEST(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
   EXPECT_TRUE(list.HasWriteBlockedStreams());
 }
 
-TEST(WriteBlockedListTest, PopFront) {
-  IntWriteBlockedList list;
-
+TEST_P(WriteBlockedListTest, PopFront) {
   list.PushBack(1, 4);
   EXPECT_EQ(1u, list.NumBlockedStreams());
   list.PushBack(2, 4);
   list.PushBack(1, 4);
   list.PushBack(3, 4);
-  EXPECT_EQ(4u, list.NumBlockedStreams());
+  if (GetParam()) {
+    EXPECT_EQ(3u, list.NumBlockedStreams());
+  } else {
+    EXPECT_EQ(4u, list.NumBlockedStreams());
+  }
 
   EXPECT_EQ(1, list.PopFront(4));
   EXPECT_EQ(2, list.PopFront(4));
   EXPECT_EQ(1, list.PopFront(4));
+  if (!GetParam()) {
+    EXPECT_EQ(1, list.PopFront(4));
+  }
   EXPECT_EQ(1u, list.NumBlockedStreams());
   EXPECT_EQ(3, list.PopFront(4));
 }
 
-TEST(WriteBlockedListTest, UpdateStreamPriorityInWriteBlockedList) {
-  IntWriteBlockedList list;
-
-  list.PushBack(1, 1);
-  list.PushBack(2, 2);
-  list.PushBack(3, 3);
-  list.PushBack(1, 3);
-  list.PushBack(1, 3);
-  EXPECT_EQ(5u, list.NumBlockedStreams());
-  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-  EXPECT_EQ(3u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-  list.UpdateStreamPriorityInWriteBlockedList(1, 1, 2);
-  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-  list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
-  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-  // Redundant update.
-  list.UpdateStreamPriorityInWriteBlockedList(1, 3, 3);
-  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-  // No entries for given stream_id / old_priority pair.
-  list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
-  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
-
-  // Update multiple entries.
-  list.UpdateStreamPriorityInWriteBlockedList(1, 3, 4);
-  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
-
-  EXPECT_EQ(3, list.PopFront(1));
-  EXPECT_EQ(2, list.PopFront(2));
-  EXPECT_EQ(1, list.PopFront(2));
-  EXPECT_EQ(1, list.PopFront(4));
-  EXPECT_EQ(0u, list.NumBlockedStreams());
+TEST_P(WriteBlockedListTest, UpdateStreamPriorityInWriteBlockedList) {
+  if (GetParam()) {
+    list.PushBack(1, 1);
+    list.PushBack(2, 2);
+    list.PushBack(3, 3);
+    list.PushBack(1, 3);  // Re-prioritizes stream 1 at priority 3.
+    list.PushBack(1, 3);  // No effect.
+    EXPECT_EQ(3u, list.NumBlockedStreams());
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 2);
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+    // Redundant update.
+    list.UpdateStreamPriorityInWriteBlockedList(1, 2, 2);
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+
+    // No entries for given stream_id / old_priority pair.
+    list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
+
+    EXPECT_EQ(3, list.PopFront(1));
+    EXPECT_EQ(2, list.PopFront(2));
+    EXPECT_EQ(1, list.PopFront(2));
+    EXPECT_EQ(0u, list.NumBlockedStreams());
+  } else {
+    list.PushBack(1, 1);
+    list.PushBack(2, 2);
+    list.PushBack(3, 3);
+    list.PushBack(1, 3);
+    list.PushBack(1, 3);
+    EXPECT_EQ(5u, list.NumBlockedStreams());
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    EXPECT_EQ(3u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+    list.UpdateStreamPriorityInWriteBlockedList(1, 1, 2);
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+    // Redundant update.
+    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 3);
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+    // No entries for given stream_id / old_priority pair.
+    list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
+
+    // Update multiple entries.
+    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 4);
+    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
+
+    EXPECT_EQ(3, list.PopFront(1));
+    EXPECT_EQ(2, list.PopFront(2));
+    EXPECT_EQ(1, list.PopFront(2));
+    EXPECT_EQ(1, list.PopFront(4));
+    EXPECT_EQ(0u, list.NumBlockedStreams());
+  }
 }
 
 }  // namespace