Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/api/peerconnectioninterface_unittest.cc

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Update comments and merge Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/api/peerconnectioninterface.h ('K') | « webrtc/api/peerconnectioninterface.h ('k') | webrtc/api/webrtcsession_unittest.cc » ('j') | webrtc/p2p/base/p2ptransportchannel_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/peerconnectioninterface_unittest.cc
diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc
index 0b24fcb7cfc4d119af78dacd4258d84f6188aa76..dddba3441dc3d8f2f18e7273870d858519f4bf31 100644
--- a/webrtc/api/peerconnectioninterface_unittest.cc
+++ b/webrtc/api/peerconnectioninterface_unittest.cc
@@ -2735,11 +2735,11 @@ TEST(CreateSessionOptionsTest, GetOptionsForOfferWithInvalidAudioOption) {
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) {
@@ -2747,11 +2747,11 @@ TEST(CreateSessionOptionsTest, GetOptionsForOfferWithInvalidVideoOption) {
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
@@ -2762,12 +2762,28 @@ TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithAudioVideo) {
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_renomi
honghaiz3 2016/08/19 18:42:01 True but only if we removed it from the ExtractMed
+ 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) {
@@ -2775,7 +2791,7 @@ TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithAudio) {
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);
@@ -2789,7 +2805,7 @@ TEST(CreateSessionOptionsTest, GetDefaultMediaSessionOptionsForOffer) {
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);
@@ -2806,7 +2822,7 @@ TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithVideo) {
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);
@@ -2822,7 +2838,7 @@ TEST(CreateSessionOptionsTest,
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);
@@ -2838,12 +2854,12 @@ TEST(CreateSessionOptionsTest, GetMediaSessionOptionsForOfferWithIceRestart) {
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);
}
@@ -2865,8 +2881,8 @@ TEST(CreateSessionOptionsTest, MediaConstraintsInAnswer) {
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());
@@ -2876,7 +2892,7 @@ TEST(CreateSessionOptionsTest, MediaConstraintsInAnswer) {
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());
« webrtc/api/peerconnectioninterface.h ('K') | « webrtc/api/peerconnectioninterface.h ('k') | webrtc/api/webrtcsession_unittest.cc » ('j') | webrtc/p2p/base/p2ptransportchannel_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698