Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

 // Copyright 2013 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/tools/quic/quic_server_session.h"
 
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_utils.h"
@@ skipping 92 matching lines @@
     visitor_ = QuicConnectionPeer::GetVisitor(connection_);
   }
 
   void MarkHeadersReadForStream(QuicStreamId id) {
     QuicDataStream* stream = QuicServerSessionPeer::GetDataStream(
         session_.get(), id);
     ASSERT_TRUE(stream != NULL);
     QuicDataStreamPeer::SetHeadersDecompressed(stream, true);
   }
 
+  QuicVersion version() const { return connection_->version(); }
+
   StrictMock<MockQuicServerSessionVisitor> owner_;
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
   scoped_ptr<TestQuicQuicServerSession> session_;
   QuicConnectionVisitorInterface* visitor_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests, QuicServerSessionTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
 
 TEST_P(QuicServerSessionTest, CloseStreamDueToReset) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   // Open a stream, then reset it.
   // Send two bytes of payload to open it.
   QuicStreamFrame data1(stream_id, false, 0, MakeIOVector("HT"));
   vector<QuicStreamFrame> frames;
   frames.push_back(data1);
   EXPECT_TRUE(visitor_->OnStreamFrames(frames));
   EXPECT_EQ(1u, session_->GetNumOpenStreams());
 
   // Pretend we got full headers, so we won't trigger the 'unrecoverable
   // compression context' state.
   MarkHeadersReadForStream(stream_id);
 
   // Send a reset.
   QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
   visitor_->OnRstStream(rst1);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
 
   // Send the same two bytes of payload in a new packet.
   EXPECT_TRUE(visitor_->OnStreamFrames(frames));
 
   // The stream should not be re-opened.
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
 }
 
 TEST_P(QuicServerSessionTest, NeverOpenStreamDueToReset) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   // Send a reset.
   QuicRstStreamFrame rst1(stream_id, QUIC_STREAM_NO_ERROR, 0);
   visitor_->OnRstStream(rst1);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
 
   // Send two bytes of payload.
   QuicStreamFrame data1(stream_id, false, 0, MakeIOVector("HT"));
   vector<QuicStreamFrame> frames;
   frames.push_back(data1);
 
-  if (connection_->version() > QUIC_VERSION_12) {
+  if (version() > QUIC_VERSION_12) {
     EXPECT_TRUE(visitor_->OnStreamFrames(frames));
   } else {
     // When we get data for the closed stream, it implies the far side has
     // compressed some headers.  As a result we're going to bail due to
     // unrecoverable compression context state.
     EXPECT_CALL(*connection_, SendConnectionClose(
         QUIC_STREAM_RST_BEFORE_HEADERS_DECOMPRESSED));
     EXPECT_FALSE(visitor_->OnStreamFrames(frames));
   }
 
   // The stream should never be opened, now that the reset is received.
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
 }
 
 TEST_P(QuicServerSessionTest, GoOverPrematureClosedStreamLimit) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
-  if (connection_->version() > QUIC_VERSION_12) {
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
+  if (version() > QUIC_VERSION_12) {
     // The prematurely closed stream limit is v12 specific.
     return;
   }
   QuicStreamFrame data1(stream_id, false, 0, MakeIOVector("H"));
   vector<QuicStreamFrame> frames;
   frames.push_back(data1);
 
   // Set up the stream such that it's open in OnPacket, but closes half way
   // through while on the decompression blocked list.
   session_->CloseStreamOnData();
 
   EXPECT_CALL(*connection_, SendConnectionClose(
       QUIC_STREAM_RST_BEFORE_HEADERS_DECOMPRESSED));
   EXPECT_FALSE(visitor_->OnStreamFrames(frames));
 }
 
 TEST_P(QuicServerSessionTest, AcceptClosedStream) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   vector<QuicStreamFrame> frames;
   // Send (empty) compressed headers followed by two bytes of data.
   frames.push_back(QuicStreamFrame(stream_id, false, 0,
                                    MakeIOVector("\1\0\0\0\0\0\0\0HT")));
   frames.push_back(QuicStreamFrame(stream_id + 2, false, 0,
                                    MakeIOVector("\2\0\0\0\0\0\0\0HT")));
   EXPECT_TRUE(visitor_->OnStreamFrames(frames));
 
   // Pretend we got full headers, so we won't trigger the 'unercoverable
   // compression context' state.
   MarkHeadersReadForStream(stream_id);
 
   // Send a reset.
   QuicRstStreamFrame rst(stream_id, QUIC_STREAM_NO_ERROR, 0);
   visitor_->OnRstStream(rst);
 
   // If we were tracking, we'd probably want to reject this because it's data
   // past the reset point of stream 3.  As it's a closed stream we just drop the
   // data on the floor, but accept the packet because it has data for stream 5.
   frames.clear();
   frames.push_back(QuicStreamFrame(stream_id, false, 2, MakeIOVector("TP")));
   frames.push_back(QuicStreamFrame(stream_id + 2, false, 2,
                                    MakeIOVector("TP")));
   EXPECT_TRUE(visitor_->OnStreamFrames(frames));
 }
 
 TEST_P(QuicServerSessionTest, MaxNumConnections) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
   EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                            stream_id));
   EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                            stream_id + 2));
   EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                            stream_id + 4));
   EXPECT_CALL(*connection_, SendConnectionClose(QUIC_TOO_MANY_OPEN_STREAMS));
   EXPECT_FALSE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                             stream_id + 6));
 }
 
 TEST_P(QuicServerSessionTest, MaxNumConnectionsImplicit) {
-  QuicStreamId stream_id = GetParam() == QUIC_VERSION_12 ? 3 : 5;
+  QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   EXPECT_EQ(0u, session_->GetNumOpenStreams());
   EXPECT_TRUE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                            stream_id));
   // Implicitly opens two more streams.
   EXPECT_CALL(*connection_, SendConnectionClose(QUIC_TOO_MANY_OPEN_STREAMS));
   EXPECT_FALSE(QuicServerSessionPeer::GetIncomingDataStream(session_.get(),
                                                             stream_id + 6));
 }
 
 TEST_P(QuicServerSessionTest, GetEvenIncomingError) {
   // Incoming streams on the server session must be odd.
   EXPECT_CALL(*connection_, SendConnectionClose(QUIC_INVALID_STREAM_ID));
   EXPECT_EQ(NULL,
             QuicServerSessionPeer::GetIncomingDataStream(session_.get(), 4));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net