Enable more tests for multiple packet number spaces.
gfe-relnote: n/a (test only change)
PiperOrigin-RevId: 252622647
Change-Id: I5465c00f62ffe336067855ad3476e93e859ec924
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);
diff --git a/quic/test_tools/quic_connection_peer.cc b/quic/test_tools/quic_connection_peer.cc
index 61ffa27..89e9466 100644
--- a/quic/test_tools/quic_connection_peer.cc
+++ b/quic/test_tools/quic_connection_peer.cc
@@ -16,11 +16,6 @@
namespace test {
// static
-void QuicConnectionPeer::SendAck(QuicConnection* connection) {
- connection->SendAck();
-}
-
-// static
void QuicConnectionPeer::SetSendAlgorithm(
QuicConnection* connection,
SendAlgorithmInterface* send_algorithm) {
diff --git a/quic/test_tools/quic_connection_peer.h b/quic/test_tools/quic_connection_peer.h
index 75350ae..3cd8520 100644
--- a/quic/test_tools/quic_connection_peer.h
+++ b/quic/test_tools/quic_connection_peer.h
@@ -32,8 +32,6 @@
public:
QuicConnectionPeer() = delete;
- static void SendAck(QuicConnection* connection);
-
static void SetSendAlgorithm(QuicConnection* connection,
SendAlgorithmInterface* send_algorithm);
