Add signaling to support ICE renomination.

webrtc/api/peerconnectioninterface_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 2717 matching lines @@
 // The following tests verify that session options are created correctly.
 // TODO(deadbeef): Convert these tests to be more end-to-end. Instead of
 // "verify options are converted correctly", should be "pass options into
 // CreateOffer and verify the correct offer is produced."
 
 TEST(CreateSessionOptionsTest, GetOptionsForOfferWithInvalidAudioOption) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = RTCOfferAnswerOptions::kUndefined - 1;
 
   cricket::MediaSessionOptions options;
-  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
 
   rtc_options.offer_to_receive_audio =
       RTCOfferAnswerOptions::kMaxOfferToReceiveMedia + 1;
-  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
 }
 
 TEST(CreateSessionOptionsTest, GetOptionsForOfferWithInvalidVideoOption) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_video = RTCOfferAnswerOptions::kUndefined - 1;
 
   cricket::MediaSessionOptions options;
-  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
 
   rtc_options.offer_to_receive_video =
       RTCOfferAnswerOptions::kMaxOfferToReceiveMedia + 1;
-  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_FALSE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
 }
 
 // Test that a MediaSessionOptions is created for an offer if
 // OfferToReceiveAudio and OfferToReceiveVideo options are set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithAudioVideo) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = 1;
   rtc_options.offer_to_receive_video = 1;
 
   cricket::MediaSessionOptions options;
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, true, &options));
   EXPECT_TRUE(options.has_audio());
   EXPECT_TRUE(options.has_video());
   EXPECT_TRUE(options.bundle_enabled);
 }
 
+// Test that the ice_renomination option is set properly.
+TEST(CreateSessionOptionsTest, GetOptionsWithIceRenomination) {

[Taylor Brandstetter, 2016/08/17 22:02:00]

This test can be removed if setting the ice_renomination flag happens outside of
ExtractMediaSessionOptions.

[honghaiz3, 2016/08/19 18:42:01]

True but only if we removed it from the ExtractMediaSessionOptions. 

+  RTCOfferAnswerOptions rtc_options;
+  cricket::MediaSessionOptions options;
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
+  for (auto& kv : options.transport_options) {
+    EXPECT_FALSE(kv.second.ice_renomination);
+  }
+
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, true, &options));
+  EXPECT_FALSE(options.transport_options.empty());
+  for (auto& kv : options.transport_options) {
+    EXPECT_TRUE(kv.second.ice_renomination);
+  }
+}
+
 // Test that a correct MediaSessionOptions is created for an offer if
 // OfferToReceiveAudio is set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithAudio) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = 1;
 
   cricket::MediaSessionOptions options;
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_TRUE(options.has_audio());
   EXPECT_FALSE(options.has_video());
   EXPECT_TRUE(options.bundle_enabled);
 }
 
 // Test that a correct MediaSessionOptions is created for an offer if
 // the default OfferOptions are used.
 TEST(CreateSessionOptionsTest, GetDefaultMediaSessionOptionsForOffer) {
   RTCOfferAnswerOptions rtc_options;
 
   cricket::MediaSessionOptions options;
   options.transport_options["audio"] = cricket::TransportOptions();
   options.transport_options["video"] = cricket::TransportOptions();
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_TRUE(options.has_audio());
   EXPECT_FALSE(options.has_video());
   EXPECT_TRUE(options.bundle_enabled);
   EXPECT_TRUE(options.vad_enabled);
   EXPECT_FALSE(options.transport_options["audio"].ice_restart);
   EXPECT_FALSE(options.transport_options["video"].ice_restart);
 }
 
 // Test that a correct MediaSessionOptions is created for an offer if
 // OfferToReceiveVideo is set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithVideo) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = 0;
   rtc_options.offer_to_receive_video = 1;
 
   cricket::MediaSessionOptions options;
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_FALSE(options.has_audio());
   EXPECT_TRUE(options.has_video());
   EXPECT_TRUE(options.bundle_enabled);
 }
 
 // Test that a correct MediaSessionOptions is created for an offer if
 // UseRtpMux is set to false.
 TEST(CreateSessionOptionsTest,
      GetMediaSessionOptionsForOfferWithBundleDisabled) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.offer_to_receive_audio = 1;
   rtc_options.offer_to_receive_video = 1;
   rtc_options.use_rtp_mux = false;
 
   cricket::MediaSessionOptions options;
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_TRUE(options.has_audio());
   EXPECT_TRUE(options.has_video());
   EXPECT_FALSE(options.bundle_enabled);
 }
 
 // Test that a correct MediaSessionOptions is created to restart ice if
 // IceRestart is set. It also tests that subsequent MediaSessionOptions don't
 // have |audio_transport_options.ice_restart| etc. set.
 TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithIceRestart) {
   RTCOfferAnswerOptions rtc_options;
   rtc_options.ice_restart = true;
 
   cricket::MediaSessionOptions options;
   options.transport_options["audio"] = cricket::TransportOptions();
   options.transport_options["video"] = cricket::TransportOptions();
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_TRUE(options.transport_options["audio"].ice_restart);
   EXPECT_TRUE(options.transport_options["video"].ice_restart);
 
   rtc_options = RTCOfferAnswerOptions();
-  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, &options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_options, true, false, &options));
   EXPECT_FALSE(options.transport_options["audio"].ice_restart);
   EXPECT_FALSE(options.transport_options["video"].ice_restart);
 }
 
 // Test that the MediaConstraints in an answer don't affect if audio and video
 // is offered in an offer but that if kOfferToReceiveAudio or
 // kOfferToReceiveVideo constraints are true in an offer, the media type will be
 // included in subsequent answers.
 TEST(CreateSessionOptionsTest, MediaConstraintsInAnswer) {
   FakeConstraints answer_c;
   answer_c.SetMandatoryReceiveAudio(true);
   answer_c.SetMandatoryReceiveVideo(true);
 
   cricket::MediaSessionOptions answer_options;
   EXPECT_TRUE(ParseConstraintsForAnswer(&answer_c, &answer_options));
   EXPECT_TRUE(answer_options.has_audio());
   EXPECT_TRUE(answer_options.has_video());
 
   RTCOfferAnswerOptions rtc_offer_options;
 
   cricket::MediaSessionOptions offer_options;
-  EXPECT_TRUE(
-      ExtractMediaSessionOptions(rtc_offer_options, false, &offer_options));
+  EXPECT_TRUE(ExtractMediaSessionOptions(rtc_offer_options, false, false,
+                                         &offer_options));
   EXPECT_TRUE(offer_options.has_audio());
   EXPECT_TRUE(offer_options.has_video());
 
   RTCOfferAnswerOptions updated_rtc_offer_options;
   updated_rtc_offer_options.offer_to_receive_audio = 1;
   updated_rtc_offer_options.offer_to_receive_video = 1;
 
   cricket::MediaSessionOptions updated_offer_options;
   EXPECT_TRUE(ExtractMediaSessionOptions(updated_rtc_offer_options, false,
-                                         &updated_offer_options));
+                                         false, &updated_offer_options));
   EXPECT_TRUE(updated_offer_options.has_audio());
   EXPECT_TRUE(updated_offer_options.has_video());
 
   // Since an offer has been created with both audio and video, subsequent
   // offers and answers should contain both audio and video.
   // Answers will only contain the media types that exist in the offer
   // regardless of the value of |updated_answer_options.has_audio| and
   // |updated_answer_options.has_video|.
   FakeConstraints updated_answer_c;
   answer_c.SetMandatoryReceiveAudio(false);
   answer_c.SetMandatoryReceiveVideo(false);
 
   cricket::MediaSessionOptions updated_answer_options;
   EXPECT_TRUE(
       ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options));
   EXPECT_TRUE(updated_answer_options.has_audio());
   EXPECT_TRUE(updated_answer_options.has_video());
 }