commit b2486b8ca513974c0df2479d07078e80cd8481d1
author wub <wub@google.com> Fri Sep 06 21:18:24 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Sep 06 21:19:59 2019 -0700
tree 84bb3e2a1b99fa7323809cc4ac4d19e596561f91
parent 95025bf97767bf8f7ee864618135d219a2bb83a1

gfe-relnote: (n/a) Update QuicIetfFramerTest.(Application|Connection)Close to use the new QuicConnectionCloseFrame constructor. Test only, not protected.

Hopefully this fixes the chromium merge cl test failure on android-kitkat: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8903011661418205280/+/steps/net_unittests_on_Android_device_Nexus_5__with_patch_/0/stdout

PiperOrigin-RevId: 267726392
Change-Id: I1cde52084dcc0440882a8893f73e929d579c65e8

quic/core/quic_ietf_framer_test.cc

diff --git a/quic/core/quic_ietf_framer_test.cc b/quic/core/quic_ietf_framer_test.cc
index 9a2b562..8c835eb 100644
--- a/quic/core/quic_ietf_framer_test.cc
+++ b/quic/core/quic_ietf_framer_test.cc
@@ -782,7 +782,7 @@
   }
 }
 
-TEST_F(QuicIetfFramerTest, ConnectionCloseEmptyString) {
+TEST_F(QuicIetfFramerTest, ConnectionClose) {
   char packet_buffer[kNormalPacketBufferSize];
 
   // initialize a writer so that the serialized packet is placed in
@@ -790,13 +790,11 @@
   QuicDataWriter writer(sizeof(packet_buffer), packet_buffer,
                         NETWORK_BYTE_ORDER);
 
-  // empty string,
   std::string test_string = "Ich Bin Ein Jelly Donut?";
-  QuicConnectionCloseFrame sent_frame;
-  sent_frame.quic_error_code = static_cast<QuicErrorCode>(0);
-  sent_frame.error_details = test_string;
-  sent_frame.transport_close_frame_type = 123;
-  sent_frame.close_type = IETF_QUIC_TRANSPORT_CONNECTION_CLOSE;
+  QuicConnectionCloseFrame sent_frame(QUIC_VERSION_99, QUIC_NO_ERROR,
+                                      test_string,
+                                      /*transport_close_frame_type=*/123);
+
   // write the frame to the packet buffer.
   EXPECT_TRUE(QuicFramerPeer::AppendIetfConnectionCloseFrame(
       &framer_, sent_frame, &writer));
@@ -815,13 +813,13 @@
 
   // Now check that received == sent
   EXPECT_EQ(sent_frame.quic_error_code, sink_frame.quic_error_code);
-  EXPECT_EQ(sink_frame.quic_error_code, static_cast<QuicErrorCode>(0));
+  EXPECT_EQ(sink_frame.quic_error_code, QUIC_NO_ERROR);
   EXPECT_EQ(sink_frame.error_details, test_string);
   EXPECT_EQ(sink_frame.close_type, sent_frame.close_type);
   EXPECT_EQ(sent_frame.close_type, IETF_QUIC_TRANSPORT_CONNECTION_CLOSE);
 }
 
-TEST_F(QuicIetfFramerTest, ApplicationCloseEmptyString) {
+TEST_F(QuicIetfFramerTest, ApplicationClose) {
   char packet_buffer[kNormalPacketBufferSize];
 
   // initialize a writer so that the serialized packet is placed in
@@ -829,12 +827,11 @@
   QuicDataWriter writer(sizeof(packet_buffer), packet_buffer,
                         NETWORK_BYTE_ORDER);
 
-  // empty string,
   std::string test_string = "Ich Bin Ein Jelly Donut?";
-  QuicConnectionCloseFrame sent_frame;
-  sent_frame.quic_error_code = static_cast<QuicErrorCode>(0);
-  sent_frame.error_details = test_string;
-  sent_frame.close_type = IETF_QUIC_APPLICATION_CONNECTION_CLOSE;
+  QuicConnectionCloseFrame sent_frame(QUIC_VERSION_99, QUIC_LAST_ERROR,
+                                      test_string,
+                                      /*transport_close_frame_type=*/0);
+
   // write the frame to the packet buffer.
   EXPECT_TRUE(QuicFramerPeer::AppendIetfConnectionCloseFrame(
       &framer_, sent_frame, &writer));
@@ -852,7 +849,7 @@
       &framer_, &reader, IETF_QUIC_APPLICATION_CONNECTION_CLOSE, &sink_frame));
 
   // Now check that received == sent
-  EXPECT_EQ(sink_frame.quic_error_code, static_cast<QuicErrorCode>(0));
+  EXPECT_EQ(sink_frame.quic_error_code, QUIC_LAST_ERROR);
   EXPECT_EQ(sent_frame.quic_error_code, sink_frame.quic_error_code);
   EXPECT_EQ(sink_frame.error_details, test_string);
   EXPECT_EQ(sent_frame.close_type, IETF_QUIC_APPLICATION_CONNECTION_CLOSE);