From aeff995ca8e18a0bbdc2376668415195f808fc91 Mon Sep 17 00:00:00 2001 From: Victor Boivie Date: Wed, 28 Apr 2021 13:54:45 +0200 Subject: [PATCH] Make RTCPSenderTest test more robust to ordering The test assumed a certain order in report blocks, which can have changed with tasks to use unordered collections. This commit makes the test more robust. Bug: webrtc:12689 Change-Id: Ie0087dcb7dc955d70aa39208848bb99fd2f1750b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/216386 Reviewed-by: Danil Chapovalov Commit-Queue: Victor Boivie Cr-Commit-Position: refs/heads/master@{#33863} --- modules/rtp_rtcp/source/rtcp_sender_unittest.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index 90523a7770..81eee4a5b0 100644 --- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -28,7 +28,9 @@ using ::testing::_; using ::testing::ElementsAre; +using ::testing::Eq; using ::testing::Invoke; +using ::testing::Property; using ::testing::SizeIs; namespace webrtc { @@ -276,11 +278,11 @@ TEST_F(RtcpSenderTest, SendRrWithTwoReportBlocks) { EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpRr)); EXPECT_EQ(1, parser()->receiver_report()->num_packets()); EXPECT_EQ(kSenderSsrc, parser()->receiver_report()->sender_ssrc()); - EXPECT_EQ(2U, parser()->receiver_report()->report_blocks().size()); - EXPECT_EQ(kRemoteSsrc, - parser()->receiver_report()->report_blocks()[0].source_ssrc()); - EXPECT_EQ(kRemoteSsrc + 1, - parser()->receiver_report()->report_blocks()[1].source_ssrc()); + EXPECT_THAT( + parser()->receiver_report()->report_blocks(), + UnorderedElementsAre( + Property(&rtcp::ReportBlock::source_ssrc, Eq(kRemoteSsrc)), + Property(&rtcp::ReportBlock::source_ssrc, Eq(kRemoteSsrc + 1)))); } TEST_F(RtcpSenderTest, SendSdes) {