Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/quic_stream_sequencer_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_stream_sequencer.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/quic_flags.h"
-#include "net/quic/quic_frame_list.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/reliable_quic_stream.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_stream_sequencer_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 524 matching lines @@
   OnFrame(3, "def");
   // Missing packet: 6, ghi.
   OnFrame(9, "jkl");
 
   vector<string> expected = {"abcdef"};
   ASSERT_TRUE(VerifyReadableRegions(expected));
 
   sequencer_->MarkConsumed(6);
 }
 
-TEST(QuicFrameListTest, FrameOverlapsBufferedData) {
-  QuicFrameList buffer;
-
-  // Ensure that FrameOverlapsBufferedData returns appropriate responses when
-  // there is existing data buffered.
-  const int kBufferedOffset = 10;
-  const int kBufferedDataLength = 3;
-  const int kNewDataLength = 3;
-  string data(kNewDataLength, '.');
-
-  // No overlap if no buffered frames.
-  EXPECT_EQ(0u, buffer.BytesBuffered());
-  size_t bytes_written;
-  // Add a buffered frame.
-  buffer.OnStreamData(
-      kBufferedOffset,
-      StringPiece(string(kBufferedDataLength, '.').data(), kBufferedDataLength),
-      QuicTime::Zero(), &bytes_written);
-
-  // New byte range partially overlaps with buffered frame, start offset
-  // preceding buffered frame.
-  EXPECT_TRUE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer, QuicStreamFrame(1, false, kBufferedOffset - 1, data)));
-  EXPECT_TRUE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer,
-      QuicStreamFrame(1, false, kBufferedOffset - kNewDataLength + 1, data)));
-
-  // New byte range partially overlaps with buffered frame, start offset inside
-  // existing buffered frame.
-  EXPECT_TRUE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer, QuicStreamFrame(1, false, kBufferedOffset + 1, data)));
-  EXPECT_TRUE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer, QuicStreamFrame(
-                   1, false, kBufferedOffset + kBufferedDataLength - 1, data)));
-
-  // New byte range entirely outside of buffered frames, start offset
-  // preceeding buffered frame.
-  EXPECT_FALSE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer,
-      QuicStreamFrame(1, false, kBufferedOffset - kNewDataLength, data)));
-
-  // New byte range entirely outside of buffered frames, start offset later than
-  // buffered frame.
-  EXPECT_FALSE(QuicStreamSequencerPeer::FrameOverlapsBufferedData(
-      &buffer,
-      QuicStreamFrame(1, false, kBufferedOffset + kBufferedDataLength, data)));
-}
-
 TEST_F(QuicStreamSequencerTest, DontAcceptOverlappingFrames) {
   // The peer should never send us non-identical stream frames which contain
   // overlapping byte ranges - if they do, we close the connection.
 
   QuicStreamFrame frame1(kClientDataStreamId1, false, 1, StringPiece("hello"));
   sequencer_->OnStreamFrame(frame1);
 
   QuicStreamFrame frame2(kClientDataStreamId1, false, 2, StringPiece("hello"));
   EXPECT_CALL(stream_, CloseConnectionWithDetails(QUIC_INVALID_STREAM_FRAME, _))
       .Times(1);
@@ skipping 78 matching lines @@
   EXPECT_EQ(timestamp, t1);
   QuicStreamSequencerTest::ConsumeData(3);
   EXPECT_EQ(0u, NumBufferedBytes());
   EXPECT_EQ(6u, sequencer_->NumBytesConsumed());
   EXPECT_EQ(0u, sequencer_->NumBytesBuffered());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net