Land Recent QUIC Changes

net/quic/reliable_quic_stream_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/reliable_quic_stream.h"
 
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 14 matching lines @@
 
 class QuicReliableTestStream : public ReliableQuicStream {
  public:
   QuicReliableTestStream(QuicStreamId id, QuicSession* session)
       : ReliableQuicStream(id, session) {
   }
   virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE {
     return 0;
   }
   using ReliableQuicStream::WriteData;
+  using ReliableQuicStream::CloseReadSide;
+  using ReliableQuicStream::CloseWriteSide;
 };
 
 class ReliableQuicStreamTest : public ::testing::TestWithParam<bool> {
  public:
   ReliableQuicStreamTest()
       : connection_(new MockConnection(1, IPEndPoint(), false)),
         session_(connection_, true),
         stream_(1, &session_) {
   }
 
@@ skipping 35 matching lines @@
       WillOnce(Return(QuicConsumedData(kDataLen - 2, false)));
   stream_.OnCanWrite();
 
   // And finally the end of the bytes_consumed
   //EXPECT_CALL(session_, WriteData(_, StrEq(&kData2[kDataLen - 2]), _, _)).
   EXPECT_CALL(session_, WriteData(_, _, _, _)).
       WillOnce(Return(QuicConsumedData(2, true)));
   stream_.OnCanWrite();
 }
 
+TEST_F(ReliableQuicStreamTest, ConnectionCloseAfterStreamClose) {
+  stream_.CloseReadSide();
+  stream_.CloseWriteSide();
+  EXPECT_EQ(QUIC_STREAM_NO_ERROR, stream_.stream_error());
+  EXPECT_EQ(QUIC_NO_ERROR, stream_.connection_error());
+  stream_.ConnectionClose(QUIC_INTERNAL_ERROR, false);
+  EXPECT_EQ(QUIC_STREAM_NO_ERROR, stream_.stream_error());
+  EXPECT_EQ(QUIC_NO_ERROR, stream_.connection_error());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net