mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace mock macros with unified MOCK_METHOD macro

Browse source 
Bug: webrtc:11564
Change-Id: I6398b052ec85d2f739755723629bc5da98fb30e3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176180
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31376}
This commit is contained in:
Danil Chapovalov 2020-05-27 13:41:34 +02:00 committed by Commit Bot
parent 8edfe6e667
commit ed5d594730
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
logging/rtc_event_log/mock/mock_rtc_event_log.h
View file

@ -21,20 +21,20 @@ namespace webrtc {
class MockRtcEventLog : public RtcEventLog {
public:
MockRtcEventLog();
~MockRtcEventLog();
~MockRtcEventLog() override;
virtual bool StartLogging(std::unique_ptr<RtcEventLogOutput> output,
int64_t output_period_ms) {
return StartLoggingProxy(output.get(), output_period_ms);
}
MOCK_METHOD2(StartLoggingProxy, bool(RtcEventLogOutput*, int64_t));
MOCK_METHOD(bool,
StartLogging,
(std::unique_ptr<RtcEventLogOutput> output,
int64_t output_period_ms),
(override));
MOCK_METHOD0(StopLogging, void());
MOCK_METHOD(void, StopLogging, (), (override));
virtual void Log(std::unique_ptr<RtcEvent> event) {
void Log(std::unique_ptr<RtcEvent> event) override {
return LogProxy(event.get());
}
MOCK_METHOD1(LogProxy, void(RtcEvent*));
MOCK_METHOD(void, LogProxy, (RtcEvent*));
};
} // namespace webrtc

5
modules/desktop_capture/mock_desktop_capturer_callback.h
View file

@ -22,8 +22,9 @@ class MockDesktopCapturerCallback : public DesktopCapturer::Callback {
MockDesktopCapturerCallback();
~MockDesktopCapturerCallback() override;
MOCK_METHOD2(OnCaptureResultPtr,
void(DesktopCapturer::Result result,
MOCK_METHOD(void,
OnCaptureResultPtr,
(DesktopCapturer::Result result,
std::unique_ptr<DesktopFrame>* frame));
void OnCaptureResult(DesktopCapturer::Result result,
std::unique_ptr<DesktopFrame> frame) final;

6
modules/utility/source/process_thread_impl_unittest.cc
View file

@ -37,9 +37,9 @@ static const int kEventWaitTimeout = 500;
class MockModule : public Module {
public:
MOCK_METHOD0(TimeUntilNextProcess, int64_t());
MOCK_METHOD0(Process, void());
MOCK_METHOD1(ProcessThreadAttached, void(ProcessThread*));
MOCK_METHOD(int64_t, TimeUntilNextProcess, (), (override));
MOCK_METHOD(void, Process, (), (override));
MOCK_METHOD(void, ProcessThreadAttached, (ProcessThread*), (override));
};
class RaiseEventTask : public QueuedTask {