commit ea74008ed61de8d07bb0a3db6efd2e8b840fde5a
author QUICHE team <quiche-dev@google.com> Mon Mar 11 17:58:43 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 11 17:59:13 2019 -0700
tree 6cfb1d2bff18aba7681bd58d2bde2f32d4d31fea
parent 4d9d629f241c23699eaea4d2d41e98a06359cbe6

Use QuicVersionUsesCryptoFrames instead of checking against QUIC_VERSION_47

gfe-relnote: refactor QUIC_VERSION_47 checks. No behavior change
PiperOrigin-RevId: 237924704
Change-Id: Iaf70e71f64fbcc51f500e3919c2f026b146d7ab6

quic/core/quic_crypto_stream_test.cc

diff --git a/quic/core/quic_crypto_stream_test.cc b/quic/core/quic_crypto_stream_test.cc
index 263910b..a33b986 100644
--- a/quic/core/quic_crypto_stream_test.cc
+++ b/quic/core/quic_crypto_stream_test.cc
@@ -100,7 +100,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, ProcessRawData) {
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     stream_->OnStreamFrame(QuicStreamFrame(
         QuicUtils::GetCryptoStreamId(connection_->transport_version()),
         /*fin=*/false,
@@ -127,7 +127,7 @@
 
   EXPECT_CALL(*connection_, CloseConnection(QUIC_CRYPTO_TAGS_OUT_OF_ORDER,
                                             testing::_, testing::_));
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     stream_->OnStreamFrame(QuicStreamFrame(
         QuicUtils::GetCryptoStreamId(connection_->transport_version()),
         /*fin=*/false, /*offset=*/0, bad));
@@ -142,7 +142,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, RetransmitCryptoData) {
-  if (connection_->transport_version() >= QUIC_VERSION_47) {
+  if (QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   InSequence s;
@@ -201,7 +201,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, RetransmitCryptoDataInCryptoFrames) {
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   EXPECT_CALL(*connection_, SendCryptoData(_, _, _)).Times(0);
@@ -253,7 +253,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, NeuterUnencryptedStreamData) {
-  if (connection_->transport_version() >= QUIC_VERSION_47) {
+  if (QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   // Send [0, 1350) in ENCRYPTION_NONE.
@@ -295,7 +295,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, NeuterUnencryptedCryptoData) {
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   // Send [0, 1350) in ENCRYPTION_NONE.
@@ -338,7 +338,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, RetransmitStreamData) {
-  if (connection_->transport_version() >= QUIC_VERSION_47) {
+  if (QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   InSequence s;
@@ -411,7 +411,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, RetransmitStreamDataWithCryptoFrames) {
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   InSequence s;
@@ -470,7 +470,7 @@
 
 // Regression test for b/115926584.
 TEST_F(QuicCryptoStreamTest, HasUnackedCryptoData) {
-  if (connection_->transport_version() >= QUIC_VERSION_47) {
+  if (QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   std::string data(1350, 'a');
@@ -499,7 +499,7 @@
 }
 
 TEST_F(QuicCryptoStreamTest, HasUnackedCryptoDataWithCryptoFrames) {
-  if (connection_->transport_version() < QUIC_VERSION_47) {
+  if (!QuicVersionUsesCryptoFrames(connection_->transport_version())) {
     return;
   }
   // Send [0, 1350) in ENCRYPTION_NONE.