diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/pc/peer_connection_media_unittest.cc | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/pc/peer_connection_media_unittest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/third_party/libwebrtc/pc/peer_connection_media_unittest.cc b/third_party/libwebrtc/pc/peer_connection_media_unittest.cc index 387094cc4f..b892eacb78 100644 --- a/third_party/libwebrtc/pc/peer_connection_media_unittest.cc +++ b/third_party/libwebrtc/pc/peer_connection_media_unittest.cc @@ -66,7 +66,6 @@ #ifdef WEBRTC_ANDROID #include "pc/test/android_test_initializer.h" #endif -#include "rtc_base/gunit.h" #include "rtc_base/virtual_socket_server.h" #include "test/gmock.h" @@ -78,6 +77,7 @@ using RTCOfferAnswerOptions = PeerConnectionInterface::RTCOfferAnswerOptions; using ::testing::Bool; using ::testing::Combine; using ::testing::ElementsAre; +using ::testing::HasSubstr; using ::testing::NotNull; using ::testing::Values; @@ -175,8 +175,7 @@ class PeerConnectionMediaBaseTest : public ::testing::Test { factory_dependencies.task_queue_factory = CreateDefaultTaskQueueFactory(); EnableFakeMedia(factory_dependencies, std::move(media_engine)); factory_dependencies.event_log_factory = - std::make_unique<RtcEventLogFactory>( - factory_dependencies.task_queue_factory.get()); + std::make_unique<RtcEventLogFactory>(); auto pc_factory = CreateModularPeerConnectionFactory(std::move(factory_dependencies)); @@ -287,8 +286,8 @@ TEST_P(PeerConnectionMediaTest, std::string error; ASSERT_FALSE(callee->SetRemoteDescription(caller->CreateOffer(), &error)); - EXPECT_PRED_FORMAT2(AssertStartsWith, error, - "Failed to set remote offer sdp: Failed to create"); + EXPECT_THAT(error, + HasSubstr("Failed to set remote offer sdp: Failed to create")); } TEST_P(PeerConnectionMediaTest, @@ -298,8 +297,8 @@ TEST_P(PeerConnectionMediaTest, std::string error; ASSERT_FALSE(caller->SetLocalDescription(caller->CreateOffer(), &error)); - EXPECT_PRED_FORMAT2(AssertStartsWith, error, - "Failed to set local offer sdp: Failed to create"); + EXPECT_THAT(error, + HasSubstr("Failed to set local offer sdp: Failed to create")); } std::vector<std::string> GetIds( |