Avoid that previous settings in APM are overwritten by WebRtcVoiceEngine

webrtc/modules/audio_processing/include/mock_audio_processing.h

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 121 matching lines @@
   virtual ~MockAudioProcessing() {}
 
   MOCK_METHOD0(Initialize, int());
   MOCK_METHOD6(Initialize, int(int capture_input_sample_rate_hz,
                                int capture_output_sample_rate_hz,
                                int render_sample_rate_hz,
                                ChannelLayout capture_input_layout,
                                ChannelLayout capture_output_layout,
                                ChannelLayout render_input_layout));
   MOCK_METHOD1(Initialize, int(const ProcessingConfig& processing_config));
-  MOCK_METHOD1(ApplyConfig, void(const Config& config));
+  virtual void ApplyConfig(const webrtc::AudioProcessing::Config& config) {
+    apm_config_ = config;
+  }

[Taylor Brandstetter, 2017/07/25 00:04:37]

This is now partly a fake and partly a mock; I think it would be better if the
test itself configured the mock's behavior, for example using "testing::SaveArg"
and "testing::ReturnPointee" to save the previously set value and return it.

[peah-webrtc, 2017/07/25 21:40:21]

Very valid point! And thanks for the suggestions about SaveArg and
ReturnPointee, I did not know about those!

I have updated the CL with a patch with that change. Please take a look!

   MOCK_METHOD1(SetExtraOptions, void(const webrtc::Config& config));
   MOCK_CONST_METHOD0(proc_sample_rate_hz, int());
   MOCK_CONST_METHOD0(proc_split_sample_rate_hz, int());
   MOCK_CONST_METHOD0(num_input_channels, size_t());
   MOCK_CONST_METHOD0(num_proc_channels, size_t());
   MOCK_CONST_METHOD0(num_output_channels, size_t());
   MOCK_CONST_METHOD0(num_reverse_channels, size_t());
   MOCK_METHOD1(set_output_will_be_muted, void(bool muted));
   MOCK_METHOD1(ProcessStream, int(AudioFrame* frame));
   MOCK_METHOD7(ProcessStream, int(const float* const* src,
@@ skipping 51 matching lines @@
   virtual MockLevelEstimator* level_estimator() const {
     return level_estimator_.get();
   }
   virtual MockNoiseSuppression* noise_suppression() const {
     return noise_suppression_.get();
   }
   virtual MockVoiceDetection* voice_detection() const {
     return voice_detection_.get();
   }
 
-  MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
+  virtual webrtc::AudioProcessing::Config GetConfig() const {
+    return apm_config_;
+  }
 
  private:
   std::unique_ptr<MockEchoCancellation> echo_cancellation_;
   std::unique_ptr<MockEchoControlMobile> echo_control_mobile_;
   std::unique_ptr<MockGainControl> gain_control_;
   std::unique_ptr<MockHighPassFilter> high_pass_filter_;
   std::unique_ptr<MockLevelEstimator> level_estimator_;
   std::unique_ptr<MockNoiseSuppression> noise_suppression_;
   std::unique_ptr<MockVoiceDetection> voice_detection_;
+  webrtc::AudioProcessing::Config apm_config_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_