zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nesting of Naggy/Strict/NiceMock

Browse Source 
This will soon become a compile-time error. Fix class hierarchies that
wrap StrictMock in a NiceMock or vice-versa by removing redundant
wrappings and removing inheritance from Nice/StrictMock and fixing the
call sites as appropriate.

Bug: b/173702213
Change-Id: Ic90b1f270c180f7308f40e52e358a8f6a6baad86
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196461
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32783}
This commit is contained in:
Alex Konradi
2020-12-03 11:30:34 -05:00
committed by Commit Bot
parent 47fa08f90d
commit c20baf6067
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/voip/voip_engine_factory_unittest.cc
View File

@ -28,7 +28,7 @@ TEST(VoipEngineFactoryTest, CreateEngineWithMockModules) {
config.decoder_factory = new rtc::RefCountedObject<MockAudioDecoderFactory>(); config.decoder_factory = new rtc::RefCountedObject<MockAudioDecoderFactory>();
config.task_queue_factory = CreateDefaultTaskQueueFactory(); config.task_queue_factory = CreateDefaultTaskQueueFactory();
config.audio_processing = config.audio_processing =
new rtc::RefCountedObject<test::MockAudioProcessing>(); new rtc::RefCountedObject<testing::NiceMock<test::MockAudioProcessing>>();
config.audio_device_module = test::MockAudioDeviceModule::CreateNice(); config.audio_device_module = test::MockAudioDeviceModule::CreateNice();
auto voip_engine = CreateVoipEngine(std::move(config)); auto voip_engine = CreateVoipEngine(std::move(config));

3
audio/audio_receive_stream_unittest.cc
View File

@ -36,6 +36,7 @@ namespace {
using ::testing::_; using ::testing::_;
using ::testing::FloatEq; using ::testing::FloatEq;
using ::testing::NiceMock;
using ::testing::Return; using ::testing::Return;
AudioDecodingCallStats MakeAudioDecodeStatsForTest() { AudioDecodingCallStats MakeAudioDecodeStatsForTest() {
@ -86,7 +87,7 @@ struct ConfigHelper {
config.audio_processing = config.audio_processing =
use_null_audio_processing use_null_audio_processing
? nullptr ? nullptr
: new rtc::RefCountedObject<MockAudioProcessing>(); : new rtc::RefCountedObject<NiceMock<MockAudioProcessing>>();
config.audio_device_module = config.audio_device_module =
new rtc::RefCountedObject<testing::NiceMock<MockAudioDeviceModule>>(); new rtc::RefCountedObject<testing::NiceMock<MockAudioDeviceModule>>();
audio_state_ = AudioState::Create(config); audio_state_ = AudioState::Create(config);

3
audio/audio_send_stream_unittest.cc
View File

@ -48,6 +48,7 @@ using ::testing::Field;
using ::testing::InSequence; using ::testing::InSequence;
using ::testing::Invoke; using ::testing::Invoke;
using ::testing::Ne; using ::testing::Ne;
using ::testing::NiceMock;
using ::testing::Return; using ::testing::Return;
using ::testing::StrEq; using ::testing::StrEq;
@ -153,7 +154,7 @@ struct ConfigHelper {
audio_processing_( audio_processing_(
use_null_audio_processing use_null_audio_processing
? nullptr ? nullptr
: new rtc::RefCountedObject<MockAudioProcessing>()), : new rtc::RefCountedObject<NiceMock<MockAudioProcessing>>()),
bitrate_allocator_(&limit_observer_), bitrate_allocator_(&limit_observer_),
worker_queue_(task_queue_factory_->CreateTaskQueue( worker_queue_(task_queue_factory_->CreateTaskQueue(
"ConfigHelper_worker_queue", "ConfigHelper_worker_queue",

2
audio/voip/test/voip_core_unittest.cc
View File

@ -39,7 +39,7 @@ class VoipCoreTest : public ::testing::Test {
auto encoder_factory = CreateBuiltinAudioEncoderFactory(); auto encoder_factory = CreateBuiltinAudioEncoderFactory();
auto decoder_factory = CreateBuiltinAudioDecoderFactory(); auto decoder_factory = CreateBuiltinAudioDecoderFactory();
rtc::scoped_refptr<AudioProcessing> audio_processing = rtc::scoped_refptr<AudioProcessing> audio_processing =
new rtc::RefCountedObject<test::MockAudioProcessing>(); new rtc::RefCountedObject<NiceMock<test::MockAudioProcessing>>();
auto process_thread = std::make_unique<NiceMock<MockProcessThread>>(); auto process_thread = std::make_unique<NiceMock<MockProcessThread>>();
// Hold the pointer to use for testing. // Hold the pointer to use for testing.

4
call/call_unittest.cc
View File

@ -41,6 +41,7 @@ namespace {
using ::testing::_; using ::testing::_;
using ::testing::Contains; using ::testing::Contains;
using ::testing::NiceMock;
using ::testing::StrictMock; using ::testing::StrictMock;
struct CallHelper { struct CallHelper {
@ -52,7 +53,8 @@ struct CallHelper {
audio_state_config.audio_processing = audio_state_config.audio_processing =
use_null_audio_processing use_null_audio_processing
? nullptr ? nullptr
: new rtc::RefCountedObject<webrtc::test::MockAudioProcessing>(); : new rtc::RefCountedObject<
NiceMock<webrtc::test::MockAudioProcessing>>();
audio_state_config.audio_device_module = audio_state_config.audio_device_module =
new rtc::RefCountedObject<webrtc::test::MockAudioDeviceModule>(); new rtc::RefCountedObject<webrtc::test::MockAudioDeviceModule>();
webrtc::Call::Config config(&event_log_); webrtc::Call::Config config(&event_log_);

2
modules/audio_processing/include/mock_audio_processing.h
View File

@ -67,7 +67,7 @@ class MockEchoControl : public EchoControl {
MOCK_METHOD(bool, ActiveProcessing, (), (const, override)); MOCK_METHOD(bool, ActiveProcessing, (), (const, override));
}; };
class MockAudioProcessing : public ::testing::NiceMock<AudioProcessing> { class MockAudioProcessing : public AudioProcessing {
public: public:
MockAudioProcessing() {} MockAudioProcessing() {}