From e2c780ea24a010c3497d1b3b1dd1b273dd4b3608 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Tue, 26 Apr 2022 14:43:42 +0000 Subject: [PATCH] Reland "Add canonical mock for MediaStreamInterface" This reverts commit fc61750523120d0d7d7b02e4f6af7fb607a6b824. Reason for revert: Fixed downstream project. Original change's description: > Revert "Add canonical mock for MediaStreamInterface" > > This reverts commit e217217bf3782dbd3ea27be33d5ebd26ae0500ca. > > Reason for revert: break upstream project (name collision) > > Original change's description: > > Add canonical mock for MediaStreamInterface > > > > Needed to let upstream APIs integrate changes more easily. > > > > Bug: webrtc:13980 > > Change-Id: I6cd46f75d56597c10e08d0d66e16089516f5129c > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259821 > > Commit-Queue: Harald Alvestrand > > Reviewed-by: Niels Moller > > Cr-Commit-Position: refs/heads/main@{#36613} > > Bug: webrtc:13980 > Change-Id: I18b91327225e0f844af5dd86c9b4ca8d6301d03e > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259860 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com > Commit-Queue: Harald Alvestrand > Cr-Commit-Position: refs/heads/main@{#36614} Bug: webrtc:13980 Change-Id: I84dbe5ec754389d30e5d22f9f9553fd9e9ee5bd5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260115 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#36660} --- api/test/mock_media_stream_interface.h | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h index 17a30a877e..209962358d 100644 --- a/api/test/mock_media_stream_interface.h +++ b/api/test/mock_media_stream_interface.h @@ -84,6 +84,52 @@ class MockAudioTrack final : public rtc::RefCountedObject { MockAudioTrack() = default; }; +class MockMediaStream : public MediaStreamInterface { + public: + MOCK_METHOD(std::string, id, (), (const override)); + MOCK_METHOD(AudioTrackVector, GetAudioTracks, (), (override)); + MOCK_METHOD(VideoTrackVector, GetVideoTracks, (), (override)); + MOCK_METHOD(rtc::scoped_refptr, + FindAudioTrack, + (const std::string& track_id), + (override)); + MOCK_METHOD(rtc::scoped_refptr, + FindVideoTrack, + (const std::string& track_id), + (override)); + MOCK_METHOD(bool, + AddTrack, + (rtc::scoped_refptr track), + (override)); + MOCK_METHOD(bool, + AddTrack, + (rtc::scoped_refptr track), + (override)); + MOCK_METHOD(bool, + RemoveTrack, + (rtc::scoped_refptr track), + (override)); + MOCK_METHOD(bool, + RemoveTrack, + (rtc::scoped_refptr track), + (override)); + // Old AddTrack/RemoveTrack methods - slated for removal + MOCK_METHOD(bool, AddTrack, (AudioTrackInterface * track), (override)); + MOCK_METHOD(bool, AddTrack, (VideoTrackInterface * track), (override)); + MOCK_METHOD(bool, RemoveTrack, (AudioTrackInterface * track), (override)); + MOCK_METHOD(bool, RemoveTrack, (VideoTrackInterface * track), (override)); + MOCK_METHOD(void, + RegisterObserver, + (ObserverInterface * observer), + (override)); + MOCK_METHOD(void, + UnregisterObserver, + (ObserverInterface * observer), + (override)); +}; + +static_assert(!std::is_abstract_v>, ""); + } // namespace webrtc #endif // API_TEST_MOCK_MEDIA_STREAM_INTERFACE_H_