commit 3451f6e595c1f518ab741c24bc36a1f02d038376
author fayang <fayang@google.com> Tue Jun 11 08:18:12 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 11 11:36:17 2019 -0700
tree 4e547b0269812c2e096f1e930220e947194d3add
parent 92e211d05eb1e9f48fb3d6a8803d7007ab122160

Enable more tests for multiple packet number spaces.

gfe-relnote: n/a (test only change)
PiperOrigin-RevId: 252622647
Change-Id: I5465c00f62ffe336067855ad3476e93e859ec924

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index a2612b9..6cbb209 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -610,8 +610,6 @@
   TestConnection(const TestConnection&) = delete;
   TestConnection& operator=(const TestConnection&) = delete;
 
-  void SendAck() { QuicConnectionPeer::SendAck(this); }
-
   void SetSendAlgorithm(SendAlgorithmInterface* send_algorithm) {
     QuicConnectionPeer::SetSendAlgorithm(this, send_algorithm);
   }
@@ -3029,13 +3027,15 @@
 }
 
 TEST_P(QuicConnectionTest, FramePackingAckResponse) {
-  if (connection_.SupportsMultiplePacketNumberSpaces()) {
-    return;
-  }
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
   // Process a data packet to queue up a pending ack.
-  EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
-  ProcessDataPacket(1);
+  if (QuicVersionUsesCryptoFrames(connection_.transport_version())) {
+    EXPECT_CALL(visitor_, OnCryptoFrame(_)).Times(1);
+  } else {
+    EXPECT_CALL(visitor_, OnStreamFrame(_)).Times(1);
+  }
+  ProcessCryptoPacketAtLevel(1, ENCRYPTION_INITIAL);
+
   QuicPacketNumber last_packet;
   if (QuicVersionUsesCryptoFrames(connection_.transport_version())) {
     connection_.SendCryptoDataWithString("foo", 0);