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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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/base/event.cc ('K') | « webrtc/p2p/base/transportdescriptionfactory.cc ('k') | webrtc/p2p/base/turnport.cc » ('j') | 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 14be338a0ba1b96dbb37f4cdd854642fe7a26b5b..701e10c6e333051de90f26e33168997c5da9a6bf 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -34,7 +34,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
void CheckDesc(const TransportDescription* desc,
const std::string& opt, const std::string& ice_ufrag,
const std::string& ice_pwd, const std::string& dtls_alg) {
- ASSERT_TRUE(desc != NULL);
+ ASSERT_TRUE(desc != nullptr);
EXPECT_EQ(!opt.empty(), desc->HasOption(opt));
if (ice_ufrag.empty() && ice_pwd.empty()) {
EXPECT_EQ(static_cast<size_t>(cricket::ICE_UFRAG_LENGTH),
@@ -46,9 +46,9 @@ class TransportDescriptionFactoryTest : public testing::Test {
EXPECT_EQ(ice_pwd, desc->ice_pwd);
}
if (dtls_alg.empty()) {
- EXPECT_TRUE(desc->identity_fingerprint.get() == NULL);
+ EXPECT_TRUE(desc->identity_fingerprint.get() == nullptr);
} else {
- ASSERT_TRUE(desc->identity_fingerprint.get() != NULL);
+ ASSERT_TRUE(desc->identity_fingerprint.get() != nullptr);
EXPECT_EQ(desc->identity_fingerprint->algorithm, dtls_alg);
EXPECT_GT(desc->identity_fingerprint->digest.size(), 0U);
}
@@ -62,9 +62,10 @@ class TransportDescriptionFactoryTest : public testing::Test {
SetDtls(dtls);
cricket::TransportOptions options;
// The initial offer / answer exchange.
- std::unique_ptr<TransportDescription> offer(f1_.CreateOffer(options, NULL));
+ std::unique_ptr<TransportDescription> offer(
+ f1_.CreateOffer(options, nullptr));
std::unique_ptr<TransportDescription> answer(
- f2_.CreateAnswer(offer.get(), options, NULL));
+ f2_.CreateAnswer(offer.get(), options, nullptr));
// Create an updated offer where we restart ice.
options.ice_restart = true;
@@ -77,7 +78,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
// |options.ice_restart == true|
std::unique_ptr<TransportDescription> restart_answer(
f2_.CreateAnswer(restart_offer.get(), options, answer.get()));
- ASSERT_TRUE(restart_answer.get() != NULL);
+ ASSERT_TRUE(restart_answer.get() != nullptr);
VerifyUfragAndPasswordChanged(dtls, answer.get(), restart_answer.get());
}
@@ -153,7 +154,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
TEST_F(TransportDescriptionFactoryTest, TestOfferDefault) {
std::unique_ptr<TransportDescription> desc(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), nullptr));
CheckDesc(desc.get(), "", "", "", "");
}
@@ -164,11 +165,11 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtls) {
ASSERT_TRUE(cert1_->ssl_certificate().GetSignatureDigestAlgorithm(
&digest_alg));
std::unique_ptr<TransportDescription> desc(
- f1_.CreateOffer(TransportOptions(), NULL));
+ f1_.CreateOffer(TransportOptions(), nullptr));
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(), nullptr));
CheckDesc(desc.get(), "", "", "", digest_alg);
}
@@ -176,8 +177,8 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtls) {
TEST_F(TransportDescriptionFactoryTest, TestOfferDtlsWithNoIdentity) {
f1_.set_secure(cricket::SEC_ENABLED);
std::unique_ptr<TransportDescription> desc(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(desc.get() == NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(desc.get() == nullptr);
}
// Test updating an offer with DTLS to pick ICE.
@@ -189,8 +190,8 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtlsReofferDtls) {
ASSERT_TRUE(cert1_->ssl_certificate().GetSignatureDigestAlgorithm(
&digest_alg));
std::unique_ptr<TransportDescription> old_desc(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(old_desc.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(old_desc.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
f1_.CreateOffer(TransportOptions(), old_desc.get()));
CheckDesc(desc.get(), "",
@@ -199,27 +200,26 @@ TEST_F(TransportDescriptionFactoryTest, TestOfferDtlsReofferDtls) {
TEST_F(TransportDescriptionFactoryTest, TestAnswerDefault) {
std::unique_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(offer.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(offer.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
CheckDesc(desc.get(), "", "", "", "");
- desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
- NULL));
+ desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
CheckDesc(desc.get(), "", "", "", "");
}
// Test that we can update an answer properly; ICE credentials shouldn't change.
TEST_F(TransportDescriptionFactoryTest, TestReanswer) {
std::unique_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(offer.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(offer.get() != nullptr);
std::unique_ptr<TransportDescription> old_desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
- ASSERT_TRUE(old_desc.get() != NULL);
+ f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
+ ASSERT_TRUE(old_desc.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
f2_.CreateAnswer(offer.get(), TransportOptions(), old_desc.get()));
- ASSERT_TRUE(desc.get() != NULL);
+ ASSERT_TRUE(desc.get() != nullptr);
CheckDesc(desc.get(), "",
old_desc->ice_ufrag, old_desc->ice_pwd, "");
}
@@ -229,10 +229,10 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToNoDtls) {
f1_.set_secure(cricket::SEC_ENABLED);
f1_.set_certificate(cert1_);
std::unique_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(offer.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(offer.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
CheckDesc(desc.get(), "", "", "", "");
}
@@ -242,15 +242,14 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerNoDtlsToDtls) {
f2_.set_secure(cricket::SEC_ENABLED);
f2_.set_certificate(cert2_);
std::unique_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(offer.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(offer.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
CheckDesc(desc.get(), "", "", "", "");
f2_.set_secure(cricket::SEC_REQUIRED);
- desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
- NULL));
- ASSERT_TRUE(desc.get() == NULL);
+ desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
+ ASSERT_TRUE(desc.get() == nullptr);
}
// Test that we handle answering an DTLS offer with DTLS, both if we have
@@ -268,14 +267,13 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToDtls) {
&digest_alg2));
std::unique_ptr<TransportDescription> offer(
- f1_.CreateOffer(TransportOptions(), NULL));
- ASSERT_TRUE(offer.get() != NULL);
+ f1_.CreateOffer(TransportOptions(), nullptr));
+ ASSERT_TRUE(offer.get() != nullptr);
std::unique_ptr<TransportDescription> desc(
- f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+ f2_.CreateAnswer(offer.get(), TransportOptions(), nullptr));
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(), nullptr));
CheckDesc(desc.get(), "", "", "", digest_alg2);
}
« webrtc/base/event.cc ('K') | « webrtc/p2p/base/transportdescriptionfactory.cc ('k') | webrtc/p2p/base/turnport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698