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

Unified Diff: webrtc/p2p/base/turnport_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
Index: webrtc/p2p/base/turnport_unittest.cc
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 69b25ea0d8ef35a00e78eb312fd322cb76e35bee..fb4f5290c27c6de05db65ba5124b9b67b5983cbe 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -93,7 +93,7 @@ static int GetFDCount() {
struct dirent *dp;
int fd_count = 0;
DIR *dir = opendir("/proc/self/fd/");
- while ((dp = readdir(dir)) != NULL) {
+ while ((dp = readdir(dir)) != nullptr) {
if (dp->d_name[0] == '.')
continue;
++fd_count;
@@ -279,7 +279,7 @@ class TurnPortTest : public testing::Test,
if (!socket_) {
socket_.reset(socket_factory_.CreateUdpSocket(
rtc::SocketAddress(kLocalAddr1.ipaddr(), 0), 0, 0));
- ASSERT_TRUE(socket_ != NULL);
+ ASSERT_TRUE(socket_ != nullptr);
socket_->SignalReadPacket.connect(
this, &TurnPortTest::OnSocketReadPacket);
}
@@ -506,7 +506,7 @@ class TurnPortTest : public testing::Test,
// Send ping from UDP to TURN.
Connection* conn1 = udp_port_->CreateConnection(
turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn1 != NULL);
+ ASSERT_TRUE(conn1 != nullptr);
conn1->Ping(0);
SIMULATED_WAIT(!turn_unknown_address_, kSimulatedRtt * 2, fake_clock_);
EXPECT_FALSE(turn_unknown_address_);
@@ -516,7 +516,7 @@ class TurnPortTest : public testing::Test,
// Send ping from TURN to UDP.
Connection* conn2 = turn_port_->CreateConnection(
udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn2 != NULL);
+ ASSERT_TRUE(conn2 != nullptr);
ASSERT_TRUE_SIMULATED_WAIT(turn_create_permission_success_, kSimulatedRtt,
fake_clock_);
conn2->Ping(0);
@@ -543,7 +543,7 @@ class TurnPortTest : public testing::Test,
Port::ORIGIN_MESSAGE);
Connection* conn2 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn2 != NULL);
+ ASSERT_TRUE(conn2 != nullptr);
ASSERT_TRUE_SIMULATED_WAIT(turn_create_permission_success_, kSimulatedRtt,
fake_clock_);
// Make sure turn connection can receive.
@@ -583,8 +583,8 @@ class TurnPortTest : public testing::Test,
udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
Connection* conn2 = udp_port_->CreateConnection(
turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn1 != NULL);
- ASSERT_TRUE(conn2 != NULL);
+ ASSERT_TRUE(conn1 != nullptr);
+ ASSERT_TRUE(conn2 != nullptr);
conn1->SignalReadPacket.connect(static_cast<TurnPortTest*>(this),
&TurnPortTest::OnTurnReadPacket);
conn2->SignalReadPacket.connect(static_cast<TurnPortTest*>(this),
@@ -889,8 +889,8 @@ TEST_F(TurnPortTest, TestStopProcessingPacketsAfterClosed) {
Port::ORIGIN_MESSAGE);
Connection* conn2 = udp_port_->CreateConnection(turn_port_->Candidates()[0],
Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn1 != NULL);
- ASSERT_TRUE(conn2 != NULL);
+ ASSERT_TRUE(conn1 != nullptr);
+ ASSERT_TRUE(conn2 != nullptr);
// Make sure conn2 is writable.
conn2->Ping(0);
EXPECT_EQ_SIMULATED_WAIT(Connection::STATE_WRITABLE, conn2->write_state(),
@@ -914,13 +914,13 @@ TEST_F(TurnPortTest, TestCreateConnectionWhenSocketClosed) {
// Create a connection.
Connection* conn1 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn1 != NULL);
+ ASSERT_TRUE(conn1 != nullptr);
// Close the socket and create a connection again.
turn_port_->OnSocketClose(turn_port_->socket(), 1);
conn1 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn1 == NULL);
+ ASSERT_TRUE(conn1 == nullptr);
}
// Tests that when a TCP socket is closed, the respective TURN connection will
@@ -1057,7 +1057,7 @@ TEST_F(TurnPortTest, TestRefreshCreatePermissionRequest) {
Connection* conn = turn_port_->CreateConnection(udp_port_->Candidates()[0],
Port::ORIGIN_MESSAGE);
- ASSERT_TRUE(conn != NULL);
+ ASSERT_TRUE(conn != nullptr);
EXPECT_TRUE_SIMULATED_WAIT(turn_create_permission_success_, kSimulatedRtt,
fake_clock_);
turn_create_permission_success_ = false;
@@ -1185,7 +1185,7 @@ TEST_F(TurnPortTest, TestOriginHeader) {
EXPECT_TRUE_SIMULATED_WAIT(turn_ready_, kSimulatedRtt * 2, fake_clock_);
ASSERT_GT(turn_server_.server()->allocations().size(), 0U);
SocketAddress local_address = turn_port_->GetLocalAddress();
- ASSERT_TRUE(turn_server_.FindAllocation(local_address) != NULL);
+ ASSERT_TRUE(turn_server_.FindAllocation(local_address) != nullptr);
EXPECT_EQ(kTestOrigin, turn_server_.FindAllocation(local_address)->origin());
}

Powered by Google App Engine
This is Rietveld 408576698