In test/ replace mock macros with unified MOCK_METHOD macro

Bug: webrtc:11564
Change-Id: I75496d2f9f5612c4677057ce6fab2a55efa8674a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175129
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31267}
This commit is contained in:
Danil Chapovalov
2020-05-14 19:50:01 +02:00
committed by Commit Bot
parent 42748d8e22
commit 54706d68f6
8 changed files with 81 additions and 62 deletions

View File

@ -24,23 +24,29 @@ namespace webrtc {
class MockAudioEncoderFactory
: public ::testing::NiceMock<AudioEncoderFactory> {
public:
MOCK_METHOD0(GetSupportedEncoders, std::vector<AudioCodecSpec>());
MOCK_METHOD1(QueryAudioEncoder,
absl::optional<AudioCodecInfo>(const SdpAudioFormat& format));
MOCK_METHOD(std::vector<AudioCodecSpec>,
GetSupportedEncoders,
(),
(override));
MOCK_METHOD(absl::optional<AudioCodecInfo>,
QueryAudioEncoder,
(const SdpAudioFormat& format),
(override));
std::unique_ptr<AudioEncoder> MakeAudioEncoder(
int payload_type,
const SdpAudioFormat& format,
absl::optional<AudioCodecPairId> codec_pair_id) {
absl::optional<AudioCodecPairId> codec_pair_id) override {
std::unique_ptr<AudioEncoder> return_value;
MakeAudioEncoderMock(payload_type, format, codec_pair_id, &return_value);
return return_value;
}
MOCK_METHOD4(MakeAudioEncoderMock,
void(int payload_type,
const SdpAudioFormat& format,
absl::optional<AudioCodecPairId> codec_pair_id,
std::unique_ptr<AudioEncoder>* return_value));
MOCK_METHOD(void,
MakeAudioEncoderMock,
(int payload_type,
const SdpAudioFormat& format,
absl::optional<AudioCodecPairId> codec_pair_id,
std::unique_ptr<AudioEncoder>*));
// Creates a MockAudioEncoderFactory with no formats and that may not be
// invoked to create a codec - useful for initializing a voice engine, for