Remove usage of VoEBase::AssociateSendChannel() from WVoMC.

webrtc/call/call_unittest.cc

 /*
  *  Copyright (c) 2015 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 14 matching lines @@
       rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory = nullptr)
       : voice_engine_(decoder_factory) {
     webrtc::AudioState::Config audio_state_config;
     audio_state_config.voice_engine = &voice_engine_;
     webrtc::Call::Config config(&event_log_);
     config.audio_state = webrtc::AudioState::Create(audio_state_config);
     call_.reset(webrtc::Call::Create(config));
   }
 
   webrtc::Call* operator->() { return call_.get(); }
+  webrtc::test::MockVoiceEngine* voice_engine() { return &voice_engine_; }
 
  private:
   testing::NiceMock<webrtc::test::MockVoiceEngine> voice_engine_;
   webrtc::RtcEventLogNullImpl event_log_;
   std::unique_ptr<webrtc::Call> call_;
 };
 }  // namespace
 
 namespace webrtc {
 
@@ skipping 66 matching lines @@
         streams.push_front(stream);
       }
     }
     for (auto s : streams) {
       call->DestroyAudioReceiveStream(s);
     }
     streams.clear();
   }
 }
 
+TEST(CallTest, CreateDestroy_AssociateAudioSendReceiveStreams_RecvFirst) {
+  rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory(
+      new rtc::RefCountedObject<webrtc::MockAudioDecoderFactory>);
+  CallHelper call(decoder_factory);
+
+  constexpr int kRecvChannelId = 101;
+
+  // Set up the mock create a channel proxy which we know of, so that we can add
+  // our expectations.

[kwiberg-webrtc, 2016/11/11 13:47:40]

Bad grammar.

[the sun, 2016/11/11 20:03:39]

Done.

+  test::MockVoEChannelProxy* recv_channel_proxy = nullptr;
+  EXPECT_CALL(*call.voice_engine(), ChannelProxyFactory(testing::_))
+      .WillRepeatedly(testing::Invoke([&](int channel_id) {
+        test::MockVoEChannelProxy* channel_proxy =
+            new testing::NiceMock<test::MockVoEChannelProxy>();
+        EXPECT_CALL(*channel_proxy, GetAudioDecoderFactory())
+            .WillRepeatedly(testing::ReturnRef(decoder_factory));
+        // If being called for the send channel, save a pointer to the channel
+        // proxy for later.
+        if (channel_id == kRecvChannelId) {
+          EXPECT_FALSE(recv_channel_proxy);
+          recv_channel_proxy = channel_proxy;
+        }
+        return channel_proxy;
+      }));
+
+  AudioReceiveStream::Config recv_config;
+  recv_config.rtp.remote_ssrc = 42;
+  recv_config.rtp.local_ssrc = 777;
+  recv_config.voe_channel_id = kRecvChannelId;
+  recv_config.decoder_factory = decoder_factory;
+  AudioReceiveStream* recv_stream = call->CreateAudioReceiveStream(recv_config);
+  EXPECT_NE(recv_stream, nullptr);
+
+  EXPECT_CALL(*recv_channel_proxy, AssociateSendChannel(testing::_)).Times(1);
+  AudioSendStream::Config send_config(nullptr);
+  send_config.rtp.ssrc = 777;
+  send_config.voe_channel_id = 123;
+  AudioSendStream* send_stream = call->CreateAudioSendStream(send_config);
+  EXPECT_NE(send_stream, nullptr);
+
+  EXPECT_CALL(*recv_channel_proxy, DisassociateSendChannel()).Times(1);
+  call->DestroyAudioSendStream(send_stream);
+
+  EXPECT_CALL(*recv_channel_proxy, DisassociateSendChannel()).Times(1);
+  call->DestroyAudioReceiveStream(recv_stream);
+}
+
+TEST(CallTest, CreateDestroy_AssociateAudioSendReceiveStreams_SendFirst) {
+  rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory(
+      new rtc::RefCountedObject<webrtc::MockAudioDecoderFactory>);
+  CallHelper call(decoder_factory);
+
+  constexpr int kRecvChannelId = 101;
+
+  // Set up the mock create a channel proxy which we know of, so that we can add
+  // our expectations.

[kwiberg-webrtc, 2016/11/11 13:47:40]

Same bad grammar here.

[the sun, 2016/11/11 20:03:39]

Done.

+  test::MockVoEChannelProxy* recv_channel_proxy = nullptr;
+  EXPECT_CALL(*call.voice_engine(), ChannelProxyFactory(testing::_))
+      .WillRepeatedly(testing::Invoke([&](int channel_id) {
+        test::MockVoEChannelProxy* channel_proxy =
+            new testing::NiceMock<test::MockVoEChannelProxy>();
+        EXPECT_CALL(*channel_proxy, GetAudioDecoderFactory())
+            .WillRepeatedly(testing::ReturnRef(decoder_factory));
+        // If being called for the send channel, save a pointer to the channel
+        // proxy for later.
+        if (channel_id == kRecvChannelId) {
+          EXPECT_FALSE(recv_channel_proxy);
+          recv_channel_proxy = channel_proxy;
+          // We need to set this expectation here since the channel proxy is
+          // created as a side effect of CreateAudioReceiveStream().
+          EXPECT_CALL(*recv_channel_proxy,
+                      AssociateSendChannel(testing::_)).Times(1);
+        }
+        return channel_proxy;
+      }));
+
+  AudioSendStream::Config send_config(nullptr);
+  send_config.rtp.ssrc = 777;
+  send_config.voe_channel_id = 123;
+  AudioSendStream* send_stream = call->CreateAudioSendStream(send_config);
+  EXPECT_NE(send_stream, nullptr);
+
+  AudioReceiveStream::Config recv_config;
+  recv_config.rtp.remote_ssrc = 42;
+  recv_config.rtp.local_ssrc = 777;
+  recv_config.voe_channel_id = kRecvChannelId;
+  recv_config.decoder_factory = decoder_factory;
+  AudioReceiveStream* recv_stream = call->CreateAudioReceiveStream(recv_config);
+  EXPECT_NE(recv_stream, nullptr);
+
+  EXPECT_CALL(*recv_channel_proxy, DisassociateSendChannel()).Times(1);
+  call->DestroyAudioReceiveStream(recv_stream);
+
+  call->DestroyAudioSendStream(send_stream);
+}
+
 TEST(CallTest, CreateDestroy_FlexfecReceiveStream) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
   config.flexfec_payload_type = 118;
   config.flexfec_ssrc = 38837212;
   config.protected_media_ssrcs = {27273};
 
   FlexfecReceiveStream* stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   call->DestroyFlexfecReceiveStream(stream);
@@ skipping 51 matching lines @@
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
   for (auto s : streams) {
     call->DestroyFlexfecReceiveStream(s);
   }
 }
 
 }  // namespace webrtc