From 3fe69c504cf89c8cd150da232abc34eb6a300f08 Mon Sep 17 00:00:00 2001 From: Per K Date: Fri, 23 Feb 2024 17:08:41 +0100 Subject: [PATCH] Update MockPeerConnectionInterface and fake with missing methods. Goal is to make PeerConnectionInterface methods pure virtual. This is a split of cl https://webrtc-review.googlesource.com/c/src/+/340143 in order to be able to fix Chromium test RTCPeerConnectionHandlerTest.OnRenegotiationNeeded Bug: none Change-Id: I5eac4d9a96c1b594c9e2b3505ef2466046065dc8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340481 Auto-Submit: Per Kjellander Commit-Queue: Harald Alvestrand Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#41798} --- api/test/mock_peerconnectioninterface.h | 9 +++++++++ pc/test/fake_peer_connection_base.h | 4 ++++ pc/test/mock_peer_connection_internal.h | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h index 22a77d7dfe..814d1b1420 100644 --- a/api/test/mock_peerconnectioninterface.h +++ b/api/test/mock_peerconnectioninterface.h @@ -160,6 +160,10 @@ class MockPeerConnectionInterface : public webrtc::PeerConnectionInterface { (std::unique_ptr, rtc::scoped_refptr), (override)); + MOCK_METHOD(bool, + ShouldFireNegotiationNeededEvent, + (uint32_t event_id), + (override)); MOCK_METHOD(PeerConnectionInterface::RTCConfiguration, GetConfiguration, (), @@ -195,6 +199,10 @@ class MockPeerConnectionInterface : public webrtc::PeerConnectionInterface { (override)); MOCK_METHOD(PeerConnectionState, peer_connection_state, (), (override)); MOCK_METHOD(IceGatheringState, ice_gathering_state, (), (override)); + MOCK_METHOD(void, + AddAdaptationResource, + (rtc::scoped_refptr), + (override)); MOCK_METHOD(absl::optional, can_trickle_ice_candidates, (), (override)); MOCK_METHOD(bool, StartRtcEventLog, @@ -206,6 +214,7 @@ class MockPeerConnectionInterface : public webrtc::PeerConnectionInterface { (override)); MOCK_METHOD(void, StopRtcEventLog, (), (override)); MOCK_METHOD(void, Close, (), (override)); + MOCK_METHOD(rtc::Thread*, signaling_thread, (), (const override)); }; static_assert( diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h index 9e4ed6d175..8422f0b749 100644 --- a/pc/test/fake_peer_connection_base.h +++ b/pc/test/fake_peer_connection_base.h @@ -177,6 +177,8 @@ class FakePeerConnectionBase : public PeerConnectionInternal { rtc::scoped_refptr observer) override {} + bool ShouldFireNegotiationNeededEvent(uint32_t event_id) { return true; } + RTCConfiguration GetConfiguration() override { return RTCConfiguration(); } RTCError SetConfiguration( @@ -229,6 +231,8 @@ class FakePeerConnectionBase : public PeerConnectionInternal { absl::optional can_trickle_ice_candidates() { return absl::nullopt; } + void AddAdaptationResource(rtc::scoped_refptr resource) {} + bool StartRtcEventLog(std::unique_ptr output, int64_t output_period_ms) override { return false; diff --git a/pc/test/mock_peer_connection_internal.h b/pc/test/mock_peer_connection_internal.h index b5f47cc46a..e586008e1b 100644 --- a/pc/test/mock_peer_connection_internal.h +++ b/pc/test/mock_peer_connection_internal.h @@ -153,6 +153,10 @@ class MockPeerConnectionInternal : public PeerConnectionInternal { (std::unique_ptr, rtc::scoped_refptr), (override)); + MOCK_METHOD(bool, + ShouldFireNegotiationNeededEvent, + (uint32_t event_id), + (override)); MOCK_METHOD(PeerConnectionInterface::RTCConfiguration, GetConfiguration, (), @@ -192,6 +196,10 @@ class MockPeerConnectionInternal : public PeerConnectionInternal { (override)); MOCK_METHOD(PeerConnectionState, peer_connection_state, (), (override)); MOCK_METHOD(IceGatheringState, ice_gathering_state, (), (override)); + MOCK_METHOD(void, + AddAdaptationResource, + (rtc::scoped_refptr), + (override)); MOCK_METHOD(absl::optional, can_trickle_ice_candidates, (), (override)); MOCK_METHOD(bool, StartRtcEventLog,