From a1714f3e9271134b2b1f7a2a81840858fe9cf804 Mon Sep 17 00:00:00 2001 From: Guy Hershenbaum Date: Mon, 16 Oct 2023 12:22:20 +0300 Subject: [PATCH] Fix usages of RTC_DCHECK to GTEST macros to ensure tests pass in release builds as well Using RTC_DCHECK for test validation is wrong to begin with (gets compiled out in non-debug builds, which measn we may miss validations), but becomes extra problematic when we include code with side-effects inside the DCHECK, which results in release-build tests having a different flow than intended Bug: webrtc:15572 Change-Id: I89d5b55f903b9d93fe4a929548d1b9fcde8941be Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/323182 Commit-Queue: Danil Chapovalov Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#41005} --- .../rtcp_packet/transport_feedback_unittest.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc index 4248a4d3ee..356d7a2340 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc @@ -60,11 +60,11 @@ MATCHER(IsValidFeedback, "") { TransportFeedback Parse(rtc::ArrayView buffer) { rtcp::CommonHeader header; - RTC_DCHECK(header.Parse(buffer.data(), buffer.size())); - RTC_DCHECK_EQ(header.type(), TransportFeedback::kPacketType); - RTC_DCHECK_EQ(header.fmt(), TransportFeedback::kFeedbackMessageType); + EXPECT_TRUE(header.Parse(buffer.data(), buffer.size())); + EXPECT_EQ(header.type(), TransportFeedback::kPacketType); + EXPECT_EQ(header.fmt(), TransportFeedback::kFeedbackMessageType); TransportFeedback feedback; - RTC_DCHECK(feedback.Parse(header)); + EXPECT_TRUE(feedback.Parse(header)); return feedback; } @@ -89,7 +89,7 @@ class FeedbackTester { temp_timestamps = GenerateReceiveTimestamps(received_seq); received_ts = temp_timestamps; } - RTC_DCHECK_EQ(received_seq.size(), received_ts.size()); + ASSERT_EQ(received_seq.size(), received_ts.size()); expected_deltas_.clear(); feedback_.emplace(include_timestamps_); @@ -150,7 +150,7 @@ class FeedbackTester { std::vector GenerateReceiveTimestamps( rtc::ArrayView seq_nums) { - RTC_DCHECK(!seq_nums.empty()); + RTC_CHECK(!seq_nums.empty()); uint16_t last_seq = seq_nums[0]; Timestamp time = Timestamp::Zero(); std::vector result;