Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/quic_protocol_test.cc

 // Copyright (c) 2012 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/quic/quic_protocol.h"
 
 #include <sstream>
 
 #include "base/stl_util.h"
 #include "net/quic/quic_flags.h"
@@ skipping 359 matching lines @@
   queue.Add(1);
   queue.Add(50, 100);
   oss << queue;
 }
 
 // Tests that the iterators returned from a packet queue iterate over the queue.
 TEST(PacketNumberQueueTest, Iterators) {
   PacketNumberQueue queue;
   queue.Add(1, 100);
 
-  const std::vector<QuicPacketNumber> actual(queue.begin(), queue.end());
+  const std::vector<QuicPacketNumber> actual_numbers(queue.begin(),
+                                                     queue.end());
+  const std::vector<Interval<QuicPacketNumber>> actual_intervals(
+      queue.begin_intervals(), queue.end_intervals());
 
-  std::vector<QuicPacketNumber> expected;
+  std::vector<QuicPacketNumber> expected_numbers;
   for (int i = 1; i < 100; ++i) {
-    expected.push_back(i);
+    expected_numbers.push_back(i);
   }
 
-  EXPECT_EQ(expected, actual);
+  std::vector<Interval<QuicPacketNumber>> expected_intervals;
+  expected_intervals.push_back(Interval<QuicPacketNumber>(1, 100));
+
+  EXPECT_EQ(expected_intervals, actual_intervals);
+  EXPECT_EQ(expected_numbers, actual_numbers);
 
   PacketNumberQueue::const_iterator it_low = queue.lower_bound(10);
   EXPECT_EQ(10u, *it_low);
 
   it_low = queue.lower_bound(101);
   EXPECT_TRUE(queue.end() == it_low);
 }
 
 TEST(PacketNumberQueueTest, IntervalLengthAndRemoveInterval) {
   PacketNumberQueue queue;
@@ skipping 17 matching lines @@
   EXPECT_EQ(2u, queue.NumIntervals());
   EXPECT_TRUE(queue.Contains(10));
   EXPECT_TRUE(queue.Contains(11));
   EXPECT_TRUE(queue.Contains(20));
   EXPECT_TRUE(queue.Contains(21));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net