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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/p2p/base/relayserver_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/relayserver.cc ('k') | webrtc/p2p/base/sessiondescription.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/relayserver_unittest.cc
diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc
index 1d07a07c7fbf1866f857400e7d5f5d1dfb145501..ac4a55ea95ad69b68276a38c5715e603e8805211 100644
--- a/webrtc/p2p/base/relayserver_unittest.cc
+++ b/webrtc/p2p/base/relayserver_unittest.cc
@@ -115,7 +115,7 @@ class RelayServerTest : public testing::Test {
return ReceiveRaw(client2_.get());
}
StunMessage* Receive(rtc::TestClient* client) {
- StunMessage* msg = NULL;
+ StunMessage* msg = nullptr;
rtc::TestClient::Packet* packet =
client->NextPacket(rtc::TestClient::kTimeoutMs);
if (packet) {
@@ -200,7 +200,7 @@ TEST_F(RelayServerTest, TestAllocateNoUsername) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(4, err->eclass());
EXPECT_EQ(32, err->number());
EXPECT_EQ("Missing Username", err->reason());
@@ -220,7 +220,7 @@ TEST_F(RelayServerTest, TestBindingRequest) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(6, err->eclass());
EXPECT_EQ(0, err->number());
EXPECT_EQ("Operation Not Supported", err->reason());
@@ -242,14 +242,14 @@ TEST_F(RelayServerTest, TestAllocate) {
const StunAddressAttribute* mapped_addr =
res->GetAddress(STUN_ATTR_MAPPED_ADDRESS);
- ASSERT_TRUE(mapped_addr != NULL);
+ ASSERT_TRUE(mapped_addr != nullptr);
EXPECT_EQ(1, mapped_addr->family());
EXPECT_EQ(server_ext_addr.port(), mapped_addr->port());
EXPECT_EQ(server_ext_addr.ipaddr(), mapped_addr->ipaddr());
const StunUInt32Attribute* res_lifetime_attr =
res->GetUInt32(STUN_ATTR_LIFETIME);
- ASSERT_TRUE(res_lifetime_attr != NULL);
+ ASSERT_TRUE(res_lifetime_attr != nullptr);
EXPECT_EQ(LIFETIME, res_lifetime_attr->value());
}
@@ -272,14 +272,14 @@ TEST_F(RelayServerTest, TestReallocate) {
const StunAddressAttribute* mapped_addr =
res->GetAddress(STUN_ATTR_MAPPED_ADDRESS);
- ASSERT_TRUE(mapped_addr != NULL);
+ ASSERT_TRUE(mapped_addr != nullptr);
EXPECT_EQ(1, mapped_addr->family());
EXPECT_EQ(server_ext_addr.port(), mapped_addr->port());
EXPECT_EQ(server_ext_addr.ipaddr(), mapped_addr->ipaddr());
const StunUInt32Attribute* lifetime_attr =
res->GetUInt32(STUN_ATTR_LIFETIME);
- ASSERT_TRUE(lifetime_attr != NULL);
+ ASSERT_TRUE(lifetime_attr != nullptr);
EXPECT_EQ(LIFETIME, lifetime_attr->value());
}
@@ -300,7 +300,7 @@ TEST_F(RelayServerTest, TestRemoteBind) {
const StunByteStringAttribute* recv_data =
res->GetByteString(STUN_ATTR_DATA);
- ASSERT_TRUE(recv_data != NULL);
+ ASSERT_TRUE(recv_data != nullptr);
rtc::ByteBufferReader buf(recv_data->bytes(), recv_data->length());
std::unique_ptr<StunMessage> res2(new StunMessage());
@@ -310,7 +310,7 @@ TEST_F(RelayServerTest, TestRemoteBind) {
const StunAddressAttribute* src_addr =
res->GetAddress(STUN_ATTR_SOURCE_ADDRESS2);
- ASSERT_TRUE(src_addr != NULL);
+ ASSERT_TRUE(src_addr != nullptr);
EXPECT_EQ(1, src_addr->family());
EXPECT_EQ(client2_addr.ipaddr(), src_addr->ipaddr());
EXPECT_EQ(client2_addr.port(), src_addr->port());
@@ -345,7 +345,7 @@ TEST_F(RelayServerTest, TestSendRequestMissingUsername) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(4, err->eclass());
EXPECT_EQ(32, err->number());
EXPECT_EQ("Missing Username", err->reason());
@@ -368,7 +368,7 @@ TEST_F(RelayServerTest, TestSendRequestBadUsername) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(4, err->eclass());
EXPECT_EQ(30, err->number());
EXPECT_EQ("Stale Credentials", err->reason());
@@ -392,7 +392,7 @@ TEST_F(RelayServerTest, TestSendRequestNoDestinationAddress) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(4, err->eclass());
EXPECT_EQ(0, err->number());
EXPECT_EQ("Bad Request", err->reason());
@@ -416,7 +416,7 @@ TEST_F(RelayServerTest, TestSendRequestNoData) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(4, err->eclass());
EXPECT_EQ(00, err->number());
EXPECT_EQ("Bad Request", err->reason());
@@ -440,7 +440,7 @@ TEST_F(RelayServerTest, TestSendRequestWrongType) {
EXPECT_EQ(req->transaction_id(), res->transaction_id());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(6, err->eclass());
EXPECT_EQ(0, err->number());
EXPECT_EQ("Operation Not Supported", err->reason());
@@ -473,14 +473,14 @@ TEST_F(RelayServerTest, TestSendRaw) {
const StunAddressAttribute* src_addr =
res->GetAddress(STUN_ATTR_SOURCE_ADDRESS2);
- ASSERT_TRUE(src_addr != NULL);
+ ASSERT_TRUE(src_addr != nullptr);
EXPECT_EQ(1, src_addr->family());
EXPECT_EQ(client2_addr.ipaddr(), src_addr->ipaddr());
EXPECT_EQ(client2_addr.port(), src_addr->port());
const StunByteStringAttribute* recv_data =
res->GetByteString(STUN_ATTR_DATA);
- ASSERT_TRUE(recv_data != NULL);
+ ASSERT_TRUE(recv_data != nullptr);
EXPECT_EQ(strlen(msg2), recv_data->length());
EXPECT_EQ(0, memcmp(msg2, recv_data->bytes(), recv_data->length()));
}
@@ -508,11 +508,11 @@ TEST_F(RelayServerTest, DISABLED_TestExpiration) {
Send1(req.get());
res.reset(Receive1());
- ASSERT_TRUE(res.get() != NULL);
+ ASSERT_TRUE(res.get() != nullptr);
EXPECT_EQ(STUN_SEND_ERROR_RESPONSE, res->type());
const StunErrorCodeAttribute* err = res->GetErrorCode();
- ASSERT_TRUE(err != NULL);
+ ASSERT_TRUE(err != nullptr);
EXPECT_EQ(6, err->eclass());
EXPECT_EQ(0, err->number());
EXPECT_EQ("Operation Not Supported", err->reason());
« webrtc/base/event.cc ('K') | « webrtc/p2p/base/relayserver.cc ('k') | webrtc/p2p/base/sessiondescription.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698