From d8111e2169c902dd8fe6bbeadb0cde1dc7c08003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 22 Aug 2018 10:43:14 +0200 Subject: [PATCH] Delete unused class MockPeerConnection. It appears to be unused since cl https://webrtc-review.googlesource.com/46940. Also note that there's a recently added class MockPeerConnectionInterface, under api/test/, which may be more suitable for new tests. Bug: None Change-Id: I6cd9bd2ec8847605f478663b709cd80c54895707 Reviewed-on: https://webrtc-review.googlesource.com/95421 Reviewed-by: Mirko Bonadei Reviewed-by: Steve Anton Commit-Queue: Steve Anton Cr-Commit-Position: refs/heads/master@{#24459} --- pc/BUILD.gn | 1 - pc/test/mock_peerconnection.h | 205 ---------------------------------- 2 files changed, 206 deletions(-) delete mode 100644 pc/test/mock_peerconnection.h diff --git a/pc/BUILD.gn b/pc/BUILD.gn index 2453fa1c8f..da5a1c2135 100644 --- a/pc/BUILD.gn +++ b/pc/BUILD.gn @@ -393,7 +393,6 @@ if (rtc_include_tests) { "test/fakevideotracksource.h", "test/framegeneratorcapturervideotracksource.h", "test/mock_datachannel.h", - "test/mock_peerconnection.h", "test/mock_rtpreceiverinternal.h", "test/mock_rtpsenderinternal.h", "test/mockpeerconnectionobservers.h", diff --git a/pc/test/mock_peerconnection.h b/pc/test/mock_peerconnection.h deleted file mode 100644 index d8cb5e381b..0000000000 --- a/pc/test/mock_peerconnection.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef PC_TEST_MOCK_PEERCONNECTION_H_ -#define PC_TEST_MOCK_PEERCONNECTION_H_ - -#include -#include -#include -#include -#include -#include - -#include "call/call.h" -#include "logging/rtc_event_log/rtc_event_log.h" -#include "pc/peerconnection.h" -#include "rtc_base/thread.h" -#include "test/gmock.h" - -namespace webrtc { - -// The factory isn't really used; it just satisfies the base PeerConnection. -class FakePeerConnectionFactory - : public rtc::RefCountedObject { - public: - explicit FakePeerConnectionFactory( - std::unique_ptr media_engine) - : rtc::RefCountedObject( - rtc::Thread::Current(), - rtc::Thread::Current(), - rtc::Thread::Current(), - std::move(media_engine), - std::unique_ptr(), - std::unique_ptr()) {} -}; - -class MockPeerConnection - : public rtc::RefCountedObject { - public: - // TODO(nisse): Valid overrides commented out, because the gmock - // methods don't use any override declarations, and we want to avoid - // warnings from -Winconsistent-missing-override. See - // http://crbug.com/428099. - explicit MockPeerConnection(PeerConnectionFactory* factory) - : rtc::RefCountedObject( - factory, - std::unique_ptr(), - std::unique_ptr()) {} - - // PeerConnectionInterface - MOCK_METHOD0(local_streams, rtc::scoped_refptr()); - MOCK_METHOD0(remote_streams, rtc::scoped_refptr()); - MOCK_METHOD1(AddStream, bool(MediaStreamInterface*)); - MOCK_METHOD1(RemoveStream, void(MediaStreamInterface*)); - MOCK_METHOD2(AddTrack, - RTCErrorOr>( - rtc::scoped_refptr, - const std::vector&)); - MOCK_METHOD2(AddTrack, - rtc::scoped_refptr( - MediaStreamTrackInterface*, - std::vector)); - MOCK_METHOD1(RemoveTrack, bool(RtpSenderInterface*)); - MOCK_METHOD1(AddTransceiver, - RTCErrorOr>( - rtc::scoped_refptr)); - MOCK_METHOD2(AddTransceiver, - RTCErrorOr>( - rtc::scoped_refptr, - const RtpTransceiverInit&)); - MOCK_METHOD1(AddTransceiver, - RTCErrorOr>( - cricket::MediaType)); - MOCK_METHOD2(AddTransceiver, - RTCErrorOr>( - cricket::MediaType, - const RtpTransceiverInit&)); - MOCK_METHOD2(CreateSender, - rtc::scoped_refptr(const std::string&, - const std::string&)); - MOCK_CONST_METHOD0(GetSenders, - std::vector>()); - MOCK_CONST_METHOD0(GetReceivers, - std::vector>()); - MOCK_CONST_METHOD0( - GetTransceivers, - std::vector>()); - MOCK_METHOD3(GetStats, - bool(StatsObserver*, - MediaStreamTrackInterface*, - StatsOutputLevel)); - MOCK_METHOD1(GetStats, void(RTCStatsCollectorCallback*)); - MOCK_METHOD2(GetStats, - void(rtc::scoped_refptr, - rtc::scoped_refptr)); - MOCK_METHOD2(GetStats, - void(rtc::scoped_refptr, - rtc::scoped_refptr)); - MOCK_METHOD0(ClearStatsCache, void()); - MOCK_METHOD2( - CreateDataChannel, - rtc::scoped_refptr(const std::string&, - const DataChannelInit*)); - MOCK_CONST_METHOD0(local_description, const SessionDescriptionInterface*()); - MOCK_CONST_METHOD0(remote_description, const SessionDescriptionInterface*()); - MOCK_CONST_METHOD0(current_local_description, - const SessionDescriptionInterface*()); - MOCK_CONST_METHOD0(current_remote_description, - const SessionDescriptionInterface*()); - MOCK_CONST_METHOD0(pending_local_description, - const SessionDescriptionInterface*()); - MOCK_CONST_METHOD0(pending_remote_description, - const SessionDescriptionInterface*()); - MOCK_METHOD2(CreateOffer, - void(CreateSessionDescriptionObserver*, - const MediaConstraintsInterface*)); - MOCK_METHOD2(CreateOffer, - void(CreateSessionDescriptionObserver*, - const RTCOfferAnswerOptions&)); - MOCK_METHOD2(CreateAnswer, - void(CreateSessionDescriptionObserver*, - const RTCOfferAnswerOptions&)); - MOCK_METHOD2(CreateAnswer, - void(CreateSessionDescriptionObserver*, - const MediaConstraintsInterface*)); - MOCK_METHOD2(SetLocalDescription, - void(SetSessionDescriptionObserver*, - SessionDescriptionInterface*)); - MOCK_METHOD2(SetRemoteDescription, - void(SetSessionDescriptionObserver*, - SessionDescriptionInterface*)); - MOCK_METHOD2(SetRemoteDescription, - void(std::unique_ptr, - rtc::scoped_refptr)); - MOCK_METHOD0(GetConfiguration, PeerConnectionInterface::RTCConfiguration()); - MOCK_METHOD2(SetConfiguration, - bool(const PeerConnectionInterface::RTCConfiguration&, - RTCError*)); - MOCK_METHOD1(SetConfiguration, - bool(const PeerConnectionInterface::RTCConfiguration&)); - MOCK_METHOD1(AddIceCandidate, bool(const IceCandidateInterface*)); - MOCK_METHOD1(RemoveIceCandidates, - bool(const std::vector&)); - MOCK_METHOD1(SetBitrate, RTCError(const BitrateSettings&)); - MOCK_METHOD1(SetBitrate, RTCError(const BitrateParameters&)); - MOCK_METHOD1(SetBitrateAllocationStrategy, - void(std::unique_ptr)); - MOCK_METHOD1(SetAudioPlayout, void(bool)); - MOCK_METHOD1(SetAudioRecording, void(bool)); - MOCK_METHOD0(signaling_state, SignalingState()); - MOCK_METHOD0(ice_connection_state, IceConnectionState()); - MOCK_METHOD0(ice_gathering_state, IceGatheringState()); - MOCK_METHOD2(StartRtcEventLog, bool(rtc::PlatformFile, int64_t)); - MOCK_METHOD2(StartRtcEventLog, - bool(std::unique_ptr, int64_t)); - MOCK_METHOD0(StopRtcEventLog, void()); - MOCK_METHOD0(Close, void()); - - // PeerConnectionInternal - MOCK_CONST_METHOD0(network_thread, rtc::Thread*()); - MOCK_CONST_METHOD0(worker_thread, rtc::Thread*()); - MOCK_CONST_METHOD0(signaling_thread, rtc::Thread*()); - MOCK_CONST_METHOD0(session_id, std::string()); - MOCK_CONST_METHOD0(initial_offerer, bool()); - MOCK_CONST_METHOD0(GetTransceiversInternal, - std::vector>>()); - MOCK_METHOD2(GetLocalTrackIdBySsrc, bool(uint32_t, std::string*)); - MOCK_METHOD2(GetRemoteTrackIdBySsrc, bool(uint32_t, std::string*)); - MOCK_METHOD0(SignalDataChannelCreated, sigslot::signal1&()); - MOCK_CONST_METHOD0(rtp_data_channel, cricket::RtpDataChannel*()); - MOCK_CONST_METHOD0(sctp_data_channels, - std::vector>()); - MOCK_CONST_METHOD0(sctp_content_name, absl::optional()); - MOCK_CONST_METHOD0(sctp_transport_name, absl::optional()); - MOCK_CONST_METHOD0(GetPooledCandidateStats, cricket::CandidateStatsList()); - - typedef std::map TransportNamesByMid; - MOCK_CONST_METHOD0(GetTransportNamesByMid, TransportNamesByMid()); - - typedef std::map TransportStatsByNames; - MOCK_METHOD1(GetTransportStatsByNames, - TransportStatsByNames(const std::set&)); - MOCK_METHOD0(GetCallStats, Call::Stats()); - MOCK_METHOD2(GetLocalCertificate, - bool(const std::string&, - rtc::scoped_refptr*)); - MOCK_METHOD1(GetRemoteSSLCertChain, - std::unique_ptr(const std::string&)); - MOCK_CONST_METHOD1(IceRestartPending, bool(const std::string&)); - MOCK_CONST_METHOD1(NeedsIceRestart, bool(const std::string&)); - MOCK_METHOD2(GetSslRole, - bool(const std::string& content_name, rtc::SSLRole*)); -}; - -} // namespace webrtc - -#endif // PC_TEST_MOCK_PEERCONNECTION_H_