| Index: net/quic/quic_reliable_client_stream_test.cc
|
| diff --git a/net/quic/quic_reliable_client_stream_test.cc b/net/quic/quic_reliable_client_stream_test.cc
|
| index 124513b58b52b0239584561e819116cdaea7583f..d249dffd6153569389438274751b505898688138 100644
|
| --- a/net/quic/quic_reliable_client_stream_test.cc
|
| +++ b/net/quic/quic_reliable_client_stream_test.cc
|
| @@ -85,15 +85,17 @@ class QuicReliableClientStreamTest
|
| SpdyHeaderBlock headers_;
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(Version, QuicReliableClientStreamTest,
|
| +INSTANTIATE_TEST_CASE_P(Version,
|
| + QuicReliableClientStreamTest,
|
| ::testing::ValuesIn(QuicSupportedVersions()));
|
|
|
| TEST_P(QuicReliableClientStreamTest, OnFinRead) {
|
| InitializeHeaders();
|
| string uncompressed_headers =
|
| SpdyUtils::SerializeUncompressedHeaders(headers_);
|
| - EXPECT_CALL(delegate_, OnDataReceived(StrEq(uncompressed_headers.data()),
|
| - uncompressed_headers.size()));
|
| + EXPECT_CALL(delegate_,
|
| + OnDataReceived(StrEq(uncompressed_headers.data()),
|
| + uncompressed_headers.size()));
|
| QuicStreamOffset offset = 0;
|
| stream_->OnStreamHeaders(uncompressed_headers);
|
| stream_->OnStreamHeadersComplete(false, uncompressed_headers.length());
|
| @@ -114,12 +116,10 @@ TEST_P(QuicReliableClientStreamTest, ProcessData) {
|
|
|
| TEST_P(QuicReliableClientStreamTest, ProcessDataWithError) {
|
| const char data[] = "hello world!";
|
| - EXPECT_CALL(delegate_,
|
| - OnDataReceived(StrEq(data),
|
| - arraysize(data))).WillOnce(Return(ERR_UNEXPECTED));
|
| + EXPECT_CALL(delegate_, OnDataReceived(StrEq(data), arraysize(data)))
|
| + .WillOnce(Return(ERR_UNEXPECTED));
|
| EXPECT_CALL(delegate_, OnClose(QUIC_NO_ERROR));
|
|
|
| -
|
| EXPECT_EQ(0u, stream_->ProcessData(data, arraysize(data)));
|
| }
|
|
|
| @@ -137,11 +137,13 @@ TEST_P(QuicReliableClientStreamTest, WriteStreamData) {
|
| const size_t kDataLen = arraysize(kData1);
|
|
|
| // All data written.
|
| - EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)).WillOnce(
|
| - Return(QuicConsumedData(kDataLen, true)));
|
| + EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _))
|
| + .WillOnce(Return(QuicConsumedData(kDataLen, true)));
|
| TestCompletionCallback callback;
|
| - EXPECT_EQ(OK, stream_->WriteStreamData(base::StringPiece(kData1, kDataLen),
|
| - true, callback.callback()));
|
| + EXPECT_EQ(
|
| + OK,
|
| + stream_->WriteStreamData(
|
| + base::StringPiece(kData1, kDataLen), true, callback.callback()));
|
| }
|
|
|
| TEST_P(QuicReliableClientStreamTest, WriteStreamDataAsync) {
|
| @@ -152,17 +154,18 @@ TEST_P(QuicReliableClientStreamTest, WriteStreamDataAsync) {
|
| const size_t kDataLen = arraysize(kData1);
|
|
|
| // No data written.
|
| - EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)).WillOnce(
|
| - Return(QuicConsumedData(0, false)));
|
| + EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _))
|
| + .WillOnce(Return(QuicConsumedData(0, false)));
|
| TestCompletionCallback callback;
|
| - EXPECT_EQ(ERR_IO_PENDING,
|
| - stream_->WriteStreamData(base::StringPiece(kData1, kDataLen),
|
| - true, callback.callback()));
|
| + EXPECT_EQ(
|
| + ERR_IO_PENDING,
|
| + stream_->WriteStreamData(
|
| + base::StringPiece(kData1, kDataLen), true, callback.callback()));
|
| ASSERT_FALSE(callback.have_result());
|
|
|
| // All data written.
|
| - EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _)).WillOnce(
|
| - Return(QuicConsumedData(kDataLen, true)));
|
| + EXPECT_CALL(session_, WritevData(stream_->id(), _, _, _, _))
|
| + .WillOnce(Return(QuicConsumedData(kDataLen, true)));
|
| stream_->OnCanWrite();
|
| ASSERT_TRUE(callback.have_result());
|
| EXPECT_EQ(OK, callback.WaitForResult());
|
|
|