commit a6cd68809b72547117a861cbd0780058e261a3d7
author bnc <bnc@google.com> Wed Nov 27 08:46:01 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 27 08:46:39 2019 -0800
tree 3440b8f68520b7bf9defb42d50864ef68d4c3faf
parent 1389583ad9b094320afd63219bec28bdd4ff073c

Use IsStreamError() and friends gMock matchers in a few tests.

gfe-relnote: n/a, test-only change.
PiperOrigin-RevId: 282776774
Change-Id: I5a8ac676cbc01c9999115f2d8f1ba54cfb28d1cb

quic/quic_transport/quic_transport_integration_test.cc

diff --git a/quic/quic_transport/quic_transport_integration_test.cc b/quic/quic_transport/quic_transport_integration_test.cc
index dfccb14..715bd9f 100644
--- a/quic/quic_transport/quic_transport_integration_test.cc
+++ b/quic/quic_transport/quic_transport_integration_test.cc
@@ -226,10 +226,10 @@
   EXPECT_FALSE(server_->session()->IsSessionReady());
   EXPECT_FALSE(client_->session()->connection()->connected());
   EXPECT_FALSE(server_->session()->connection()->connected());
-  EXPECT_EQ(client_->session()->error(),
-            QUIC_TRANSPORT_INVALID_CLIENT_INDICATION);
-  EXPECT_EQ(server_->session()->error(),
-            QUIC_TRANSPORT_INVALID_CLIENT_INDICATION);
+  EXPECT_THAT(client_->session()->error(),
+              IsError(QUIC_TRANSPORT_INVALID_CLIENT_INDICATION));
+  EXPECT_THAT(server_->session()->error(),
+              IsError(QUIC_TRANSPORT_INVALID_CLIENT_INDICATION));
 }
 
 TEST_F(QuicTransportIntegrationTest, SendOutgoingStreams) {

quic/test_tools/quic_stream_sequencer_buffer_peer.cc

diff --git a/quic/test_tools/quic_stream_sequencer_buffer_peer.cc b/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
index 36d2b04..b3bf224 100644
--- a/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
+++ b/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
@@ -7,6 +7,7 @@
 #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_test.h"
+#include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h"
 
 typedef quic::QuicStreamSequencerBuffer::BufferBlock BufferBlock;
 
@@ -28,8 +29,8 @@
   dest.iov_base = dest_buffer, dest.iov_len = size;
   size_t bytes_read;
   std::string error_details;
-  EXPECT_EQ(QUIC_NO_ERROR,
-            buffer_->Readv(&dest, 1, &bytes_read, &error_details));
+  EXPECT_THAT(buffer_->Readv(&dest, 1, &bytes_read, &error_details),
+              IsQuicNoError());
   return bytes_read;
 }