Index: webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc |
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc |
index 9d98855d4af9deda2b4b85da37ef9f9965b41474..6c8075611b9202b955f238b5c0d4c9ff1d7827d8 100644 |
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc |
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc |
@@ -18,6 +18,7 @@ |
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" |
#include "webrtc/rtc_base/checks.h" |
+#include "webrtc/test/gmock.h" |
#include "webrtc/test/gtest.h" |
#include "webrtc/test/testsupport/fileutils.h" |
@@ -352,9 +353,7 @@ void RtcEventLogTestHelper::VerifyAudioSendStreamConfig( |
void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log, |
size_t index, |
PacketDirection direction, |
- const uint8_t* header, |
- size_t header_size, |
- size_t total_size) { |
+ const rtp::Packet& expected_packet) { |
const rtclog::Event& event = parsed_log.events_[index]; |
ASSERT_TRUE(IsValidBasicEvent(event)); |
ASSERT_EQ(rtclog::Event::RTP_EVENT, event.type()); |
@@ -362,12 +361,12 @@ void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log, |
ASSERT_TRUE(rtp_packet.has_incoming()); |
EXPECT_EQ(direction == kIncomingPacket, rtp_packet.incoming()); |
ASSERT_TRUE(rtp_packet.has_packet_length()); |
- EXPECT_EQ(total_size, rtp_packet.packet_length()); |
+ EXPECT_EQ(expected_packet.size(), rtp_packet.packet_length()); |
+ size_t header_size = expected_packet.headers_size(); |
ASSERT_TRUE(rtp_packet.has_header()); |
- ASSERT_EQ(header_size, rtp_packet.header().size()); |
- for (size_t i = 0; i < header_size; i++) { |
- EXPECT_EQ(header[i], static_cast<uint8_t>(rtp_packet.header()[i])); |
- } |
+ EXPECT_THAT(testing::make_tuple(expected_packet.data(), header_size), |
+ testing::ElementsAreArray(rtp_packet.header().data(), |
+ rtp_packet.header().size())); |
// Check consistency of the parser. |
PacketDirection parsed_direction; |
@@ -376,9 +375,9 @@ void RtcEventLogTestHelper::VerifyRtpEvent(const ParsedRtcEventLog& parsed_log, |
parsed_log.GetRtpHeader(index, &parsed_direction, parsed_header, |
&parsed_header_size, &parsed_total_size); |
EXPECT_EQ(direction, parsed_direction); |
- ASSERT_EQ(header_size, parsed_header_size); |
- EXPECT_EQ(0, std::memcmp(header, parsed_header, header_size)); |
- EXPECT_EQ(total_size, parsed_total_size); |
+ EXPECT_THAT(testing::make_tuple(expected_packet.data(), header_size), |
+ testing::ElementsAreArray(parsed_header, parsed_header_size)); |
+ EXPECT_EQ(expected_packet.size(), parsed_total_size); |
} |
void RtcEventLogTestHelper::VerifyRtcpEvent(const ParsedRtcEventLog& parsed_log, |