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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/p2p/base/transportdescriptionfactory_unittest.cc

Issue 1453813005: Fixing some issues with ICE restart signaling. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« talk/session/media/mediasession.cc ('K') | « webrtc/p2p/base/transportdescriptionfactory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportdescriptionfactory_unittest.cc
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
index e3992dfdd361c252203bacb3940a74d069211295..7399d5e92f62c2c2b387c5111d0e60f396153e55 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -72,23 +72,21 @@ class TransportDescriptionFactoryTest : public testing::Test {
cricket::TransportOptions options;
// The initial offer / answer exchange.
- rtc::scoped_ptr<TransportDescription> offer(f1_.CreateOffer(
- options, NULL));
+ rtc::scoped_ptr<TransportDescription> offer(
+ f1_.CreateOffer(options, false, NULL));
rtc::scoped_ptr<TransportDescription> answer(
- f2_.CreateAnswer(offer.get(),
- options, NULL));
+ f2_.CreateAnswer(offer.get(), options, false, NULL));
// Create an updated offer where we restart ice.
- options.ice_restart = true;
- rtc::scoped_ptr<TransportDescription> restart_offer(f1_.CreateOffer(
- options, offer.get()));
+ rtc::scoped_ptr<TransportDescription> restart_offer(
+ f1_.CreateOffer(options, true, offer.get()));
VerifyUfragAndPasswordChanged(dtls, offer.get(), restart_offer.get());
// Create a new answer. The transport ufrag and password is changed since
- // |options.ice_restart == true|
+ // |ice_restart == true|
rtc::scoped_ptr<TransportDescription> restart_answer(
- f2_.CreateAnswer(restart_offer.get(), options, answer.get()));
+ f2_.CreateAnswer(restart_offer.get(), options, true, answer.get()));
ASSERT_TRUE(restart_answer.get() != NULL);
VerifyUfragAndPasswordChanged(dtls, answer.get(), restart_answer.get());
@@ -121,8 +119,8 @@ class TransportDescriptionFactoryTest : public testing::Test {
};
TEST_F(TransportDescriptionFactoryTest, TestOfferDefault) {
- scoped_ptr<TransportDescription> desc(f1_.CreateOffer(
- TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> desc(
+ f1_.CreateOffer(TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", "");
}
@@ -132,20 +130,20 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtls) {
std::string digest_alg;
ASSERT_TRUE(cert1_->ssl_certificate().GetSignatureDigestAlgorithm(
&digest_alg));
- scoped_ptr<TransportDescription> desc(f1_.CreateOffer(
- TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> desc(
+ f1_.CreateOffer(TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", digest_alg);
// Ensure it also works with SEC_REQUIRED.
f1_.set_secure(cricket::SEC_REQUIRED);
- desc.reset(f1_.CreateOffer(TransportOptions(), NULL));
+ desc.reset(f1_.CreateOffer(TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", digest_alg);
}
// Test generating an offer with DTLS fails with no identity.
TEST_F(TransportDescriptionFactoryTest, TestOfferDtlsWithNoIdentity) {
f1_.set_secure(cricket::SEC_ENABLED);
- scoped_ptr<TransportDescription> desc(f1_.CreateOffer(
- TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> desc(
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(desc.get() == NULL);
}
@@ -157,38 +155,36 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtlsReofferDtls) {
std::string digest_alg;
ASSERT_TRUE(cert1_->ssl_certificate().GetSignatureDigestAlgorithm(
&digest_alg));
- scoped_ptr<TransportDescription> old_desc(f1_.CreateOffer(
- TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> old_desc(
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(old_desc.get() != NULL);
scoped_ptr<TransportDescription> desc(
- f1_.CreateOffer(TransportOptions(), old_desc.get()));
+ f1_.CreateOffer(TransportOptions(), false, old_desc.get()));
CheckDesc(desc.get(), "",
old_desc->ice_ufrag, old_desc->ice_pwd, digest_alg);
}
TEST_F(TransportDescriptionFactoryTest, TestAnswerDefault) {
- scoped_ptr<TransportDescription> offer(f1_.CreateOffer(
- TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> offer(
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(offer.get() != NULL);
- scoped_ptr<TransportDescription> desc(f2_.CreateAnswer(
- offer.get(), TransportOptions(), NULL));
+ scoped_ptr<TransportDescription> desc(
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", "");
- desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
- NULL));
+ desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", "");
}
// Test that we can update an answer properly; ICE credentials shouldn't change.
TEST_F(TransportDescriptionFactoryTest, TestReanswer) {
scoped_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(offer.get() != NULL);
scoped_ptr<TransportDescription> old_desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
ASSERT_TRUE(old_desc.get() != NULL);
scoped_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(),
- old_desc.get()));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, old_desc.get()));
ASSERT_TRUE(desc.get() != NULL);
CheckDesc(desc.get(), "",
old_desc->ice_ufrag, old_desc->ice_pwd, "");
@@ -199,10 +195,10 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToNoDtls) {
f1_.set_secure(cricket::SEC_ENABLED);
f1_.set_certificate(cert1_);
scoped_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(offer.get() != NULL);
scoped_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", "");
}
@@ -212,14 +208,13 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerNoDtlsToDtls) {
f2_.set_secure(cricket::SEC_ENABLED);
f2_.set_certificate(cert2_);
scoped_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(offer.get() != NULL);
scoped_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", "");
f2_.set_secure(cricket::SEC_REQUIRED);
- desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
- NULL));
+ desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
ASSERT_TRUE(desc.get() == NULL);
}
@@ -238,14 +233,13 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToDtls) {
&digest_alg2));
scoped_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), false, NULL));
ASSERT_TRUE(offer.get() != NULL);
scoped_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", digest_alg2);
f2_.set_secure(cricket::SEC_REQUIRED);
- desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
- NULL));
+ desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), false, NULL));
CheckDesc(desc.get(), "", "", "", digest_alg2);
}
« talk/session/media/mediasession.cc ('K') | « webrtc/p2p/base/transportdescriptionfactory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698