commit 3085da8b0539c076ca909f7bf82d6e5e362549c3
author ianswett <ianswett@google.com> Thu Apr 04 07:24:24 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 04 09:14:24 2019 -0700
tree 202230ab1fab4427366cc7eb8dfaa327377ebf05
parent d9467b578a7b699887b398f6d5501e3c63d85c38

Remove QuicTestUtils::GetPacketLengthForOneStream and change three QUIC tests to instead send full sized packets followed by a partially full packet.

gfe-relnote: n/a (Test only)
PiperOrigin-RevId: 241926261
Change-Id: I84dc9dedb30a809cb800bc4e0c3460c7383415af

quic/core/quic_packet_creator_test.cc

diff --git a/quic/core/quic_packet_creator_test.cc b/quic/core/quic_packet_creator_test.cc
index 45f2651..1cdc3e4 100644
--- a/quic/core/quic_packet_creator_test.cc
+++ b/quic/core/quic_packet_creator_test.cc
@@ -1197,18 +1197,9 @@
   }
   creator_.set_encryption_level(ENCRYPTION_FORWARD_SECURE);
   // A string larger than fits into a frame.
-  size_t payload_length;
-  creator_.SetMaxPacketLength(GetPacketLengthForOneStream(
-      client_framer_.transport_version(),
-      QuicPacketCreatorPeer::SendVersionInPacket(&creator_),
-      !kIncludeDiversificationNonce,
-      creator_.GetDestinationConnectionIdLength(),
-      creator_.GetSourceConnectionIdLength(),
-      QuicPacketCreatorPeer::GetPacketNumberLength(&creator_),
-      QuicPacketCreatorPeer::GetRetryTokenLengthLength(&creator_),
-      QuicPacketCreatorPeer::GetLengthLength(&creator_), &payload_length));
   QuicFrame frame;
-  const std::string too_long_payload(payload_length * 2, 'a');
+  size_t payload_length = creator_.max_packet_length();
+  const std::string too_long_payload(payload_length, 'a');
   MakeIOVector(too_long_payload, &iov_);
   EXPECT_CALL(delegate_, OnSerializedPacket(_))
       .WillOnce(Invoke(this, &QuicPacketCreatorTest::SaveSerializedPacket));
@@ -1217,9 +1208,8 @@
   ASSERT_TRUE(creator_.ConsumeData(stream_id, &iov_, 1u, iov_.iov_len, 0u, 0u,
                                    true, false, NOT_RETRANSMISSION, &frame));
   size_t consumed = frame.stream_frame.data_length;
-  EXPECT_EQ(payload_length, consumed);
-  const std::string payload(payload_length, 'a');
-  CheckStreamFrame(frame, stream_id, payload, 0u, false);
+  // The entire payload could not be consumed.
+  EXPECT_GT(payload_length, consumed);
   creator_.Flush();
   DeleteSerializedPacket();
 }