Use IsStreamError() and friends gMock matchers in quic/core/http. gfe-relnote: n/a, test-only change. PiperOrigin-RevId: 282789060 Change-Id: I6af5f0076b3bea2fad005b20f741ee2db8a337ca
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc index 26215bb..c01bbba 100644 --- a/quic/core/http/end_to_end_test.cc +++ b/quic/core/http/end_to_end_test.cc
@@ -1642,8 +1642,9 @@ session, GetNthServerInitiatedBidirectionalId(0)); client_->SendCustomSynchronousRequest(headers, body); - EXPECT_EQ(QUIC_STREAM_CONNECTION_ERROR, client_->stream_error()); - EXPECT_EQ(QUIC_INVALID_STREAM_ID, client_->connection_error()); + EXPECT_THAT(client_->stream_error(), + IsStreamError(QUIC_STREAM_CONNECTION_ERROR)); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_INVALID_STREAM_ID)); } // Test that if the server will close the connection if the client attempts @@ -1668,11 +1669,11 @@ ->client_session() ->connection() ->transport_version())) { - EXPECT_EQ(QUIC_HEADERS_STREAM_DATA_DECOMPRESS_FAILURE, - client_->connection_error()); + EXPECT_THAT(client_->connection_error(), + IsError(QUIC_HEADERS_STREAM_DATA_DECOMPRESS_FAILURE)); } else { - EXPECT_EQ(QUIC_HEADERS_TOO_LARGE, client_->stream_error()); - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->stream_error(), IsStreamError(QUIC_HEADERS_TOO_LARGE)); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } } @@ -1693,8 +1694,8 @@ client_->SendCustomSynchronousRequest(headers, large_body); EXPECT_EQ("bad", client_->response_body()); EXPECT_EQ("500", client_->response_headers()->find(":status")->second); - EXPECT_EQ(QUIC_STREAM_NO_ERROR, client_->stream_error()); - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->stream_error(), IsQuicStreamNoError()); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } // TODO(rch): this test seems to cause net_unittests timeouts :| @@ -1771,8 +1772,8 @@ client_->WaitForResponse(); EXPECT_TRUE(client_->connected()); - EXPECT_EQ(QUIC_REFUSED_STREAM, client_->stream_error()); - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->stream_error(), IsStreamError(QUIC_REFUSED_STREAM)); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } TEST_P(EndToEndTest, SetIndependentMaxIncomingDynamicStreamsLimits) { @@ -2106,7 +2107,7 @@ } // It should be completely fine to RST a stream before any data has been // received for that stream. - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } TEST_P(EndToEndTest, ConnectionMigrationClientIPChanged) { @@ -2620,7 +2621,7 @@ // The request should fail. EXPECT_EQ("", client_->SendSynchronousRequest("/foo")); EXPECT_TRUE(client_->response_headers()->empty()); - EXPECT_EQ(QUIC_PUBLIC_RESET, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_PUBLIC_RESET)); } // Send a public reset from the server for a different connection ID. @@ -2666,7 +2667,7 @@ // ID. EXPECT_EQ("", client_->SendSynchronousRequest("/foo")); EXPECT_TRUE(client_->response_headers()->empty()); - EXPECT_EQ(QUIC_PUBLIC_RESET, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_PUBLIC_RESET)); return; } // The connection should be unaffected. @@ -2761,8 +2762,8 @@ server_thread_->Pause(); QuicDispatcher* dispatcher = QuicServerPeer::GetDispatcher(server_thread_->server()); - EXPECT_EQ(QUIC_INVALID_PACKET_HEADER, - QuicDispatcherPeer::GetAndClearLastError(dispatcher)); + EXPECT_THAT(QuicDispatcherPeer::GetAndClearLastError(dispatcher), + IsError(QUIC_INVALID_PACKET_HEADER)); server_thread_->Resume(); // The connection should not be terminated. @@ -2812,8 +2813,8 @@ server_thread_->Pause(); QuicDispatcher* dispatcher = QuicServerPeer::GetDispatcher(server_thread_->server()); - EXPECT_EQ(QUIC_INVALID_PACKET_HEADER, - QuicDispatcherPeer::GetAndClearLastError(dispatcher)); + EXPECT_THAT(QuicDispatcherPeer::GetAndClearLastError(dispatcher), + IsError(QUIC_INVALID_PACKET_HEADER)); server_thread_->Resume(); // The connection should not be terminated. @@ -2850,8 +2851,8 @@ server_thread_->Pause(); QuicDispatcher* dispatcher = QuicServerPeer::GetDispatcher(server_thread_->server()); - EXPECT_EQ(QUIC_NO_ERROR, - QuicDispatcherPeer::GetAndClearLastError(dispatcher)); + EXPECT_THAT(QuicDispatcherPeer::GetAndClearLastError(dispatcher), + IsQuicNoError()); server_thread_->Resume(); // The connection should not be terminated. @@ -3569,8 +3570,8 @@ client_->SendMessage(headers, ""); client_->WaitForResponse(); - EXPECT_EQ(QUIC_HEADERS_STREAM_DATA_DECOMPRESS_FAILURE, - client_->connection_error()); + EXPECT_THAT(client_->connection_error(), + IsError(QUIC_HEADERS_STREAM_DATA_DECOMPRESS_FAILURE)); } class WindowUpdateObserver : public QuicConnectionDebugVisitor { @@ -3647,7 +3648,7 @@ client_.reset(CreateQuicClient(client_writer_)); EXPECT_EQ("", client_->SendSynchronousRequest("/foo")); - EXPECT_EQ(QUIC_HANDSHAKE_FAILED, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_HANDSHAKE_FAILED)); } // Regression test for b/116200989. @@ -3684,7 +3685,7 @@ // Second, a /big_response request with big response should fail. EXPECT_LT(client_->SendSynchronousRequest("/big_response").length(), kBigResponseBodySize); - EXPECT_EQ(QUIC_PUBLIC_RESET, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_PUBLIC_RESET)); } // Regression test of b/70782529. @@ -3756,7 +3757,7 @@ // return whether it is successful. ASSERT_FALSE(Initialize() && client_->client()->WaitForCryptoHandshakeConfirmed()); - EXPECT_EQ(QUIC_HANDSHAKE_TIMEOUT, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_HANDSHAKE_TIMEOUT)); } // TODO: reenable once we have a way to make this run faster. @@ -3768,7 +3769,7 @@ pre_shared_key_server_ = "foobar"; ASSERT_FALSE(Initialize() && client_->client()->WaitForCryptoHandshakeConfirmed()); - EXPECT_EQ(QUIC_HANDSHAKE_TIMEOUT, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_HANDSHAKE_TIMEOUT)); } // TODO: reenable once we have a way to make this run faster. @@ -3780,7 +3781,7 @@ pre_shared_key_client_ = "foobar"; ASSERT_FALSE(Initialize() && client_->client()->WaitForCryptoHandshakeConfirmed()); - EXPECT_EQ(QUIC_HANDSHAKE_TIMEOUT, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_HANDSHAKE_TIMEOUT)); } TEST_P(EndToEndTest, RequestAndStreamRstInOnePacket) { @@ -3815,7 +3816,7 @@ client_->WaitForDelayedAcks(); // The real expectation is the test does not crash or timeout. - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } TEST_P(EndToEndTest, ResetStreamOnTtlExpires) { @@ -3832,7 +3833,7 @@ std::string body(1024 * 1024, 'a'); stream->WriteOrBufferBody(body, true); client_->WaitForResponse(); - EXPECT_EQ(QUIC_STREAM_TTL_EXPIRED, client_->stream_error()); + EXPECT_THAT(client_->stream_error(), IsStreamError(QUIC_STREAM_TTL_EXPIRED)); } TEST_P(EndToEndTest, SendMessages) { @@ -3899,7 +3900,7 @@ client_session->GetCurrentLargestMessagePayload() + 1), &storage)) .status); - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); } class EndToEndPacketReorderingTest : public EndToEndTest { @@ -4048,7 +4049,7 @@ client_->WaitForDelayedAcks(); // The real expectation is the test does not crash or timeout. - EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsQuicNoError()); // And that the stop-sending code is received. QuicSimpleClientStream* client_stream = static_cast<QuicSimpleClientStream*>(client_->latest_created_stream()); @@ -4139,7 +4140,7 @@ EXPECT_EQ("", client_->SendSynchronousRequest("/foo")); // Verify ZERO_RTT_PROTECTED connection close is successfully processed by // client which switches to FORWARD_SECURE. - EXPECT_EQ(QUIC_PACKET_WRITE_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_PACKET_WRITE_ERROR)); } class BadShloPacketWriter2 : public QuicPacketWriterWrapper { @@ -4197,7 +4198,7 @@ EXPECT_EQ("", client_->SendSynchronousRequest("/foo")); // Verify ZERO_RTT_PROTECTED connection close is successfully processed by // client. - EXPECT_EQ(QUIC_PACKET_WRITE_ERROR, client_->connection_error()); + EXPECT_THAT(client_->connection_error(), IsError(QUIC_PACKET_WRITE_ERROR)); } // Test that the stream id manager closes the connection if a stream @@ -4227,8 +4228,9 @@ QuicSessionPeer::SetNextOutgoingBidirectionalStreamId( session, GetNthClientInitiatedBidirectionalId(max_number_of_streams + 1)); client_->SendCustomSynchronousRequest(headers, body); - EXPECT_EQ(QUIC_STREAM_CONNECTION_ERROR, client_->stream_error()); - EXPECT_EQ(QUIC_INVALID_STREAM_ID, GetClientSession()->error()); + EXPECT_THAT(client_->stream_error(), + IsStreamError(QUIC_STREAM_CONNECTION_ERROR)); + EXPECT_THAT(GetClientSession()->error(), IsError(QUIC_INVALID_STREAM_ID)); EXPECT_EQ(IETF_QUIC_TRANSPORT_CONNECTION_CLOSE, GetClientSession()->close_type()); EXPECT_TRUE(
diff --git a/quic/core/http/http_decoder_test.cc b/quic/core/http/http_decoder_test.cc index 965cdfd..751ca58 100644 --- a/quic/core/http/http_decoder_test.cc +++ b/quic/core/http/http_decoder_test.cc
@@ -15,6 +15,7 @@ #include "net/third_party/quiche/src/quic/platform/api/quic_str_cat.h" #include "net/third_party/quiche/src/quic/platform/api/quic_test.h" #include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h" +#include "net/third_party/quiche/src/quic/test_tools/quic_test_utils.h" using ::testing::_; using ::testing::Eq; @@ -133,7 +134,7 @@ }; TEST_F(HttpDecoderTest, InitialState) { - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -171,7 +172,7 @@ EXPECT_EQ(total_length, decoder_.ProcessInput(input.get(), total_length)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); ASSERT_EQ("", decoder_.error_detail()); EXPECT_EQ(frame_type, current_frame_type()); } @@ -189,19 +190,19 @@ EXPECT_CALL(visitor_, OnCancelPushFrame(CancelPushFrame({1}))) .WillOnce(Return(false)); EXPECT_EQ(input.size(), ProcessInputWithGarbageAppended(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnCancelPushFrame(CancelPushFrame({1}))); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnCancelPushFrame(CancelPushFrame({1}))); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -233,7 +234,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. @@ -242,7 +243,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("Headers"))); EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. @@ -257,7 +258,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFramePayload(QuicStringPiece("s"))); EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process push id incrementally and append headers with last byte of push id. @@ -267,7 +268,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()); ProcessInputCharByChar(input.substr(0, 9)); EXPECT_EQ(8u, ProcessInput(input.substr(9))); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -286,7 +287,7 @@ decoder.ProcessInput(input.data(), input.size()); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("PUSH_PROMISE frame malformed.", decoder.error_detail()); } { @@ -298,7 +299,7 @@ decoder.ProcessInput(&c, 1); } - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("PUSH_PROMISE frame malformed.", decoder.error_detail()); } } @@ -314,19 +315,19 @@ EXPECT_CALL(visitor_, OnMaxPushIdFrame(MaxPushIdFrame({1}))) .WillOnce(Return(false)); EXPECT_EQ(input.size(), ProcessInputWithGarbageAppended(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnMaxPushIdFrame(MaxPushIdFrame({1}))); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnMaxPushIdFrame(MaxPushIdFrame({1}))); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -341,19 +342,19 @@ EXPECT_CALL(visitor_, OnDuplicatePushFrame(DuplicatePushFrame({1}))) .WillOnce(Return(false)); EXPECT_EQ(input.size(), ProcessInputWithGarbageAppended(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnDuplicatePushFrame(DuplicatePushFrame({1}))); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnDuplicatePushFrame(DuplicatePushFrame({1}))); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -386,21 +387,21 @@ EXPECT_CALL(visitor_, OnPriorityFrame(frame)).WillOnce(Return(false)); processed_bytes = ProcessInputWithGarbageAppended(remaining_input); EXPECT_EQ(remaining_input.size(), processed_bytes); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnPriorityFrameStart(2)); EXPECT_CALL(visitor_, OnPriorityFrame(frame)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnPriorityFrameStart(2)); EXPECT_CALL(visitor_, OnPriorityFrame(frame)); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); std::string input2 = QuicTextUtils::HexDecode( @@ -417,7 +418,7 @@ EXPECT_CALL(visitor_, OnPriorityFrameStart(2)); EXPECT_CALL(visitor_, OnPriorityFrame(frame2)); EXPECT_EQ(input2.size(), ProcessInput(input2)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -462,7 +463,7 @@ QuicByteCount processed_bytes = decoder.ProcessInput(input.data(), input.size()); EXPECT_EQ(input.size(), processed_bytes); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ(test_data.error_message, decoder.error_detail()); } } @@ -495,21 +496,21 @@ EXPECT_CALL(visitor_, OnSettingsFrame(frame)).WillOnce(Return(false)); processed_bytes = ProcessInputWithGarbageAppended(remaining_input); EXPECT_EQ(remaining_input.size(), processed_bytes); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnSettingsFrameStart(2)); EXPECT_CALL(visitor_, OnSettingsFrame(frame)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnSettingsFrameStart(2)); EXPECT_CALL(visitor_, OnSettingsFrame(frame)); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -543,7 +544,7 @@ QuicByteCount processed_bytes = decoder.ProcessInput(input.data(), input.size()); EXPECT_EQ(input.size(), processed_bytes); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ(test_data.error_message, decoder.error_detail()); } } @@ -562,7 +563,7 @@ EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Duplicate SETTINGS identifier.", decoder_.error_detail()); } @@ -587,7 +588,7 @@ EXPECT_CALL(visitor_, OnDataFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. @@ -595,7 +596,7 @@ EXPECT_CALL(visitor_, OnDataFramePayload(QuicStringPiece("Data!"))); EXPECT_CALL(visitor_, OnDataFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. @@ -607,7 +608,7 @@ EXPECT_CALL(visitor_, OnDataFramePayload(QuicStringPiece("!"))); EXPECT_CALL(visitor_, OnDataFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -621,21 +622,21 @@ std::string header = std::string(buffer.get(), header_length); // Partially send only 1 byte of the header to process. EXPECT_EQ(1u, decoder_.ProcessInput(header.data(), 1)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Send the rest of the header. EXPECT_CALL(visitor_, OnDataFrameStart(3)); EXPECT_EQ(header_length - 1, decoder_.ProcessInput(header.data() + 1, header_length - 1)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Send data. EXPECT_CALL(visitor_, OnDataFramePayload(QuicStringPiece(input))); EXPECT_CALL(visitor_, OnDataFrameEnd()); EXPECT_EQ(2048u, decoder_.ProcessInput(input.data(), 2048)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -661,7 +662,7 @@ EXPECT_EQ(1u, decoder_.ProcessInput(&c, 1)); } - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); EXPECT_EQ(frame_type, current_frame_type()); } @@ -677,19 +678,19 @@ EXPECT_CALL(visitor_, OnGoAwayFrame(GoAwayFrame({1}))) .WillOnce(Return(false)); EXPECT_EQ(input.size(), ProcessInputWithGarbageAppended(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnGoAwayFrame(GoAwayFrame({1}))); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnGoAwayFrame(GoAwayFrame({1}))); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -715,7 +716,7 @@ EXPECT_CALL(visitor_, OnHeadersFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. @@ -723,7 +724,7 @@ EXPECT_CALL(visitor_, OnHeadersFramePayload(QuicStringPiece("Headers"))); EXPECT_CALL(visitor_, OnHeadersFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. @@ -737,7 +738,7 @@ EXPECT_CALL(visitor_, OnHeadersFramePayload(QuicStringPiece("s"))); EXPECT_CALL(visitor_, OnHeadersFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -753,21 +754,21 @@ EXPECT_CALL(visitor_, OnDataFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnDataFrameStart(2)); EXPECT_CALL(visitor_, OnDataFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnDataFrameStart(2)); EXPECT_CALL(visitor_, OnDataFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -783,21 +784,21 @@ EXPECT_CALL(visitor_, OnHeadersFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. EXPECT_CALL(visitor_, OnHeadersFrameStart(2)); EXPECT_CALL(visitor_, OnHeadersFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. EXPECT_CALL(visitor_, OnHeadersFrameStart(2)); EXPECT_CALL(visitor_, OnHeadersFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -815,7 +816,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()).WillOnce(Return(false)); EXPECT_EQ(0u, ProcessInputWithGarbageAppended("")); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the full frame. @@ -823,7 +824,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFramePushId(1, 1)); EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); // Process the frame incrementally. @@ -831,7 +832,7 @@ EXPECT_CALL(visitor_, OnPushPromiseFramePushId(1, 1)); EXPECT_CALL(visitor_, OnPushPromiseFrameEnd()); ProcessInputCharByChar(input); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -843,7 +844,7 @@ // Process the full frame. EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(2u, ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Frame is too large", decoder_.error_detail()); } @@ -858,7 +859,7 @@ writer.WriteStringPiece("Malformed payload"); EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(5u, decoder_.ProcessInput(input, QUIC_ARRAYSIZE(input))); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Frame is too large", decoder_.error_detail()); } @@ -890,7 +891,7 @@ processed_bytes = ProcessInput(remaining_input); EXPECT_EQ(remaining_input.size(), processed_bytes); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -944,7 +945,7 @@ QuicStringPiece input(test_data.input); decoder.ProcessInput(input.data(), input.size()); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ(test_data.error_message, decoder.error_detail()); } { @@ -955,7 +956,7 @@ for (auto c : input) { decoder.ProcessInput(&c, 1); } - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder.error()); + EXPECT_THAT(decoder.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ(test_data.error_message, decoder.error_detail()); } } @@ -968,7 +969,7 @@ EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Unable to read push_id", decoder_.error_detail()); } @@ -983,7 +984,7 @@ EXPECT_CALL(visitor_, OnSettingsFrame(empty_frame)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); } @@ -995,7 +996,7 @@ EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Corrupt PUSH_PROMISE frame.", decoder_.error_detail()); } @@ -1006,7 +1007,7 @@ EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Unable to read GOAWAY stream_id", decoder_.error_detail()); } @@ -1017,7 +1018,7 @@ EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Unable to read push_id", decoder_.error_detail()); } @@ -1028,7 +1029,7 @@ EXPECT_CALL(visitor_, OnError(&decoder_)); EXPECT_EQ(input.size(), ProcessInput(input)); - EXPECT_EQ(QUIC_INVALID_FRAME_DATA, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsError(QUIC_INVALID_FRAME_DATA)); EXPECT_EQ("Unable to read push_id", decoder_.error_detail()); } @@ -1040,7 +1041,7 @@ EXPECT_CALL(visitor_, OnGoAwayFrame(frame)); EXPECT_GT(length, 0u); EXPECT_EQ(length, decoder_.ProcessInput(buffer.get(), length)); - EXPECT_EQ(QUIC_NO_ERROR, decoder_.error()); + EXPECT_THAT(decoder_.error(), IsQuicNoError()); EXPECT_EQ("", decoder_.error_detail()); }
diff --git a/quic/core/http/quic_spdy_client_stream_test.cc b/quic/core/http/quic_spdy_client_stream_test.cc index c9cd8d2..dd1cade 100644 --- a/quic/core/http/quic_spdy_client_stream_test.cc +++ b/quic/core/http/quic_spdy_client_stream_test.cc
@@ -112,7 +112,8 @@ auto headers = AsHeaderList(headers_); stream_->OnStreamHeaderList(false, headers.uncompressed_header_bytes(), headers); - EXPECT_EQ(QUIC_BAD_APPLICATION_PAYLOAD, stream_->stream_error()); + EXPECT_THAT(stream_->stream_error(), + IsStreamError(QUIC_BAD_APPLICATION_PAYLOAD)); } TEST_P(QuicSpdyClientStreamTest, TestFraming) { @@ -172,7 +173,7 @@ stream_->OnStreamHeaderList(false, headers.uncompressed_header_bytes(), headers); // The headers should parse successfully. - EXPECT_EQ(QUIC_STREAM_NO_ERROR, stream_->stream_error()); + EXPECT_THAT(stream_->stream_error(), IsQuicStreamNoError()); EXPECT_EQ("200", stream_->response_headers().find(":status")->second); EXPECT_EQ(200, stream_->response_code()); std::unique_ptr<char[]> buffer;
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index a8deb18..3178beb 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -97,7 +97,7 @@ error = session()->config()->ProcessPeerHello(msg, CLIENT, &error_details); } - EXPECT_EQ(QUIC_NO_ERROR, error); + EXPECT_THAT(error, IsQuicNoError()); session()->OnConfigNegotiated(); session()->connection()->SetDefaultEncryptionLevel( ENCRYPTION_FORWARD_SECURE);
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc index d7c6b93..1fefd97 100644 --- a/quic/core/http/quic_spdy_stream_test.cc +++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -364,7 +364,7 @@ stream_->OnStreamHeaderList(false, 1 << 20, headers); if (!UsesHttp3()) { - EXPECT_EQ(QUIC_HEADERS_TOO_LARGE, stream_->stream_error()); + EXPECT_THAT(stream_->stream_error(), IsStreamError(QUIC_HEADERS_TOO_LARGE)); } }