Move DTMF sender to RtpSender (as opposed to WebRtcSession).

webrtc/pc/webrtcsession_unittest.cc

 /*
  *  Copyright 2012 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 416 matching lines @@
         media_controller_.get(), rtc::Thread::Current(), rtc::Thread::Current(),
         rtc::Thread::Current(), allocator_.get(), &observer_,
         std::unique_ptr<cricket::TransportController>(
             new cricket::TransportController(rtc::Thread::Current(),
                                              rtc::Thread::Current(),
                                              allocator_.get())),
         std::unique_ptr<FakeSctpTransportFactory>(
             fake_sctp_transport_factory_)));
     session_->SignalDataChannelOpenMessage.connect(
         this, &WebRtcSessionTest::OnDataChannelOpenMessage);
-    session_->GetOnDestroyedSignal()->connect(
-        this, &WebRtcSessionTest::OnSessionDestroyed);
 
     configuration_.rtcp_mux_policy = rtcp_mux_policy;
     EXPECT_EQ(PeerConnectionInterface::kIceConnectionNew,
         observer_.ice_connection_state_);
     EXPECT_EQ(PeerConnectionInterface::kIceGatheringNew,
         observer_.ice_gathering_state_);
 
     EXPECT_TRUE(session_->Initialize(options_, std::move(cert_generator),
                                      configuration_));
     session_->set_metrics_observer(metrics_observer_);
   }
 
   void OnDataChannelOpenMessage(const std::string& label,
                                 const InternalDataChannelInit& config) {
     last_data_channel_label_ = label;
     last_data_channel_config_ = config;
   }
 
-  void OnSessionDestroyed() { session_destroyed_ = true; }
-
   void Init() {
     Init(nullptr, PeerConnectionInterface::kRtcpMuxPolicyNegotiate);
   }
 
   void Init(PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy) {
     Init(nullptr, rtcp_mux_policy);
   }
 
   void InitWithBundlePolicy(
       PeerConnectionInterface::BundlePolicy bundle_policy) {
@@ skipping 26 matching lines @@
 
   // Init with DTLS with a store that will fail to generate a certificate.
   void InitWithDtlsIdentityGenFail() {
     std::unique_ptr<FakeRTCCertificateGenerator> cert_generator(
         new FakeRTCCertificateGenerator());
     cert_generator->set_should_fail(true);
     Init(std::move(cert_generator),
          PeerConnectionInterface::kRtcpMuxPolicyNegotiate);
   }
 
-  void InitWithDtmfCodec() {
-    // Add kTelephoneEventCodec for dtmf test.
-    const cricket::AudioCodec kTelephoneEventCodec(106, "telephone-event", 8000,
-                                                   0, 1);
-    std::vector<cricket::AudioCodec> codecs;
-    codecs.push_back(kTelephoneEventCodec);
-    media_engine_->SetAudioCodecs(codecs);
-    desc_factory_->set_audio_codecs(codecs, codecs);
-    Init();
-  }
-
   void InitWithGcm() {
     rtc::CryptoOptions crypto_options;
     crypto_options.enable_gcm_crypto_suites = true;
     channel_manager_->SetCryptoOptions(crypto_options);
     with_gcm_ = true;
     Init();
   }
 
   void SendAudioVideoStream1() {
     send_stream_1_ = true;
@@ skipping 664 matching lines @@
     // SetRemoteDescription to enable rtcp mux.
     SetRemoteDescriptionWithoutError(new_answer);
     EXPECT_TRUE_WAIT(observer_.oncandidatesready_, kIceCandidatesTimeout);
     EXPECT_EQ(expected_candidate_num, observer_.mline_0_candidates_.size());
     if (bundle) {
       EXPECT_EQ(0, observer_.mline_1_candidates_.size());
     } else {
       EXPECT_EQ(expected_candidate_num, observer_.mline_1_candidates_.size());
     }
   }
-  // Tests that we can only send DTMF when the dtmf codec is supported.
-  void TestCanInsertDtmf(bool can) {
-    if (can) {
-      InitWithDtmfCodec();
-    } else {
-      Init();
-    }
-    SendAudioVideoStream1();
-    CreateAndSetRemoteOfferAndLocalAnswer();
-    EXPECT_FALSE(session_->CanInsertDtmf(""));
-    EXPECT_EQ(can, session_->CanInsertDtmf(kAudioTrack1));
-  }
 
   bool ContainsVideoCodecWithName(const SessionDescriptionInterface* desc,
                                   const std::string& codec_name) {
     for (const auto& content : desc->description()->contents()) {
       if (static_cast<cricket::MediaContentDescription*>(content.description)
               ->type() == cricket::MEDIA_TYPE_VIDEO) {
         const auto* mdesc =
             static_cast<cricket::VideoContentDescription*>(content.description);
         for (const auto& codec : mdesc->codecs()) {
           if (codec.name == codec_name) {
@@ skipping 338 matching lines @@
   rtc::scoped_refptr<FakeMetricsObserver> metrics_observer_;
   // The following flags affect options created for CreateOffer/CreateAnswer.
   bool send_stream_1_ = false;
   bool send_stream_2_ = false;
   bool send_audio_ = false;
   bool send_video_ = false;
   rtc::scoped_refptr<DataChannel> data_channel_;
   // Last values received from data channel creation signal.
   std::string last_data_channel_label_;
   InternalDataChannelInit last_data_channel_config_;
-  bool session_destroyed_ = false;
   bool with_gcm_ = false;
 };
 
 TEST_P(WebRtcSessionTest, TestInitializeWithDtls) {
   InitWithDtls(GetParam());
   // SDES is disabled when DTLS is on.
   EXPECT_EQ(cricket::SEC_DISABLED, session_->SdesPolicy());
 }
 
 TEST_F(WebRtcSessionTest, TestInitializeWithoutDtls) {
@@ skipping 1919 matching lines @@
   // Trying unmodified SDP.
   SetLocalDescriptionWithoutError(offer);
 }
 
 TEST_F(WebRtcSessionTest, SetSetupGcm) {
   InitWithGcm();
   SendAudioVideoStream1();
   CreateAndSetRemoteOfferAndLocalAnswer();
 }
 
-TEST_F(WebRtcSessionTest, CanNotInsertDtmf) {
-  TestCanInsertDtmf(false);
-}
-
-TEST_F(WebRtcSessionTest, CanInsertDtmf) {
-  TestCanInsertDtmf(true);
-}
-
-TEST_F(WebRtcSessionTest, InsertDtmf) {
-  // Setup
-  Init();
-  SendAudioVideoStream1();
-  CreateAndSetRemoteOfferAndLocalAnswer();
-  FakeVoiceMediaChannel* channel = media_engine_->GetVoiceChannel(0);
-  EXPECT_EQ(0U, channel->dtmf_info_queue().size());
-
-  // Insert DTMF
-  const int expected_duration = 90;
-  session_->InsertDtmf(kAudioTrack1, 0, expected_duration);
-  session_->InsertDtmf(kAudioTrack1, 1, expected_duration);
-  session_->InsertDtmf(kAudioTrack1, 2, expected_duration);
-
-  // Verify
-  ASSERT_EQ(3U, channel->dtmf_info_queue().size());
-  const uint32_t send_ssrc = channel->send_streams()[0].first_ssrc();
-  EXPECT_TRUE(CompareDtmfInfo(channel->dtmf_info_queue()[0], send_ssrc, 0,
-                              expected_duration));
-  EXPECT_TRUE(CompareDtmfInfo(channel->dtmf_info_queue()[1], send_ssrc, 1,
-                              expected_duration));
-  EXPECT_TRUE(CompareDtmfInfo(channel->dtmf_info_queue()[2], send_ssrc, 2,
-                              expected_duration));
-}

[Taylor Brandstetter, 2017/02/01 22:10:00]

Moved to RtpSender tests.

-
 // This test verifies the |initial_offerer| flag when session initiates the
 // call.
 TEST_F(WebRtcSessionTest, TestInitiatorFlagAsOriginator) {
   Init();
   EXPECT_FALSE(session_->initial_offerer());
   SessionDescriptionInterface* offer = CreateOffer();
   SessionDescriptionInterface* answer = CreateRemoteAnswer(offer);
   SetLocalDescriptionWithoutError(offer);
   EXPECT_TRUE(session_->initial_offerer());
   SetRemoteDescriptionWithoutError(answer);
@@ skipping 840 matching lines @@
     // must have received a notification which, so the only invalid state
     // is kInit.
     EXPECT_NE(WebRtcSessionCreateSDPObserverForTest::kInit, o->state());
   }
 }
 
 TEST_F(WebRtcSessionTest, TestPacketOptionsAndOnPacketSent) {
   TestPacketOptions();
 }
 
-// Make sure the signal from "GetOnDestroyedSignal()" fires when the session
-// is destroyed.
-TEST_F(WebRtcSessionTest, TestOnDestroyedSignal) {
-  Init();
-  session_.reset();
-  EXPECT_TRUE(session_destroyed_);
-}
-
 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled.  That test
 // currently fails because upon disconnection and reconnection OnIceComplete is
 // called more than once without returning to IceGatheringGathering.
 
 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
                         WebRtcSessionTest,
                         testing::Values(ALREADY_GENERATED,
                                         DTLS_IDENTITY_STORE));