Index: blimp/net/stream_packet_reader_unittest.cc |
diff --git a/blimp/net/stream_packet_reader_unittest.cc b/blimp/net/stream_packet_reader_unittest.cc |
index a076a41c5eac2ca09f5d04ef00152b6cbcf9e9f2..3341a673f982bc2b5991c047c4aecf6f8cdaa57f 100644 |
--- a/blimp/net/stream_packet_reader_unittest.cc |
+++ b/blimp/net/stream_packet_reader_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/sys_byteorder.h" |
+#include "blimp/net/blimp_connection_statistics.h" |
#include "blimp/net/common.h" |
#include "blimp/net/stream_packet_reader.h" |
#include "blimp/net/test_common.h" |
@@ -34,7 +35,7 @@ class StreamPacketReaderTest : public testing::Test { |
StreamPacketReaderTest() |
: buffer_(new net::GrowableIOBuffer), |
test_msg_("U WOT M8"), |
- data_reader_(&socket_) {} |
+ data_reader_(&socket_, &statistics_) {} |
~StreamPacketReaderTest() override {} |
@@ -47,6 +48,7 @@ class StreamPacketReaderTest : public testing::Test { |
net::TestCompletionCallback callback_; |
testing::StrictMock<MockStreamSocket> socket_; |
testing::InSequence sequence_; |
+ BlimpConnectionStatistics statistics_; |
StreamPacketReader data_reader_; |
}; |
@@ -156,9 +158,13 @@ TEST_F(StreamPacketReaderTest, ReadMultipleMessagesSync) { |
ReadPacket(); |
ASSERT_EQ(static_cast<int>(test_msg_.size()), callback_.WaitForResult()); |
+ EXPECT_EQ(static_cast<int>(test_msg_.size()), |
+ statistics_.Get(BlimpConnectionStatistics::BYTES_RECEIVED)); |
ReadPacket(); |
ASSERT_EQ(static_cast<int>(test_msg2.size()), callback_.WaitForResult()); |
+ EXPECT_EQ(static_cast<int>(test_msg_.size() + test_msg2.size()), |
+ statistics_.Get(BlimpConnectionStatistics::BYTES_RECEIVED)); |
EXPECT_TRUE(BufferStartsWith(buffer_.get(), test_msg2.size(), test_msg2)); |
EXPECT_FALSE(callback_.have_result()); |
@@ -313,7 +319,8 @@ TEST_F(StreamPacketReaderTest, ReadPayloadErrorAsync) { |
TEST_F(StreamPacketReaderTest, ReaderDeletedDuringAsyncHeaderRead) { |
net::CompletionCallback cb; |
net::TestCompletionCallback test_cb; |
- std::unique_ptr<StreamPacketReader> reader(new StreamPacketReader(&socket_)); |
+ std::unique_ptr<StreamPacketReader> reader( |
+ new StreamPacketReader(&socket_, &statistics_)); |
EXPECT_CALL(socket_, Read(NotNull(), kPacketHeaderSizeBytes, _)) |
.WillOnce(DoAll(FillBufferFromString<0>(EncodeHeader(test_msg_.size())), |
@@ -328,7 +335,8 @@ TEST_F(StreamPacketReaderTest, ReaderDeletedDuringAsyncHeaderRead) { |
// StreamPacketReader object was destroyed. |
TEST_F(StreamPacketReaderTest, ReaderDeletedDuringAsyncPayloadRead) { |
net::CompletionCallback cb; |
- std::unique_ptr<StreamPacketReader> reader(new StreamPacketReader(&socket_)); |
+ std::unique_ptr<StreamPacketReader> reader( |
+ new StreamPacketReader(&socket_, &statistics_)); |
EXPECT_CALL(socket_, Read(NotNull(), kPacketHeaderSizeBytes, _)) |
.WillOnce(DoAll(FillBufferFromString<0>(EncodeHeader(test_msg_.size())), |