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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2063823008: Adding IceConfig option to assume TURN/TURN candidate pairs will work. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Responding to comments. Doing "presumed writable" determination in Connection. Created 4 years, 6 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/p2p/base/transport.h ('K') | « webrtc/p2p/base/turnport.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/turnport_unittest.cc
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 0e415a28147e4e9a6f9ef73b8fad56bba1f2caf3..aa278d33306b8559ac9c080213756c8c2d910f49 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -35,6 +35,7 @@
using rtc::SocketAddress;
using cricket::Connection;
+using cricket::IceConfig;
using cricket::Port;
using cricket::PortInterface;
using cricket::TurnPort;
@@ -402,7 +403,7 @@ class TurnPortTest : public testing::Test,
// Send ping from UDP to TURN.
Connection* conn1 = udp_port_->CreateConnection(
- turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
+ turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 != NULL);
conn1->Ping(0);
WAIT(!turn_unknown_address_, kTimeout);
@@ -412,7 +413,7 @@ class TurnPortTest : public testing::Test,
// Send ping from TURN to UDP.
Connection* conn2 = turn_port_->CreateConnection(
- udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn2 != NULL);
ASSERT_TRUE_WAIT(turn_create_permission_success_, kTimeout);
conn2->Ping(0);
@@ -432,10 +433,10 @@ class TurnPortTest : public testing::Test,
PrepareTurnAndUdpPorts();
// Create connections on both ends.
- Connection* conn1 = udp_port_->CreateConnection(turn_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
- Connection* conn2 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn1 = udp_port_->CreateConnection(
+ turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
+ Connection* conn2 = turn_port_->CreateConnection(
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn2 != NULL);
ASSERT_TRUE_WAIT(turn_create_permission_success_, kTimeout);
// Make sure turn connection can receive.
@@ -459,7 +460,7 @@ class TurnPortTest : public testing::Test,
// If the connection is created again, it will start to receive pings.
conn2 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Port::ORIGIN_MESSAGE, IceConfig());
conn1->Ping(0);
EXPECT_TRUE_WAIT(conn2->receiving(), kTimeout);
EXPECT_FALSE(turn_unknown_address_);
@@ -470,9 +471,9 @@ class TurnPortTest : public testing::Test,
// Create connections and send pings.
Connection* conn1 = turn_port_->CreateConnection(
- udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
Connection* conn2 = udp_port_->CreateConnection(
- turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE);
+ turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 != NULL);
ASSERT_TRUE(conn2 != NULL);
conn1->SignalReadPacket.connect(static_cast<TurnPortTest*>(this),
@@ -735,8 +736,8 @@ TEST_F(TurnPortTest, TestTurnTcpAllocateMismatch) {
TEST_F(TurnPortTest, TestRefreshRequestGetsErrorResponse) {
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
PrepareTurnAndUdpPorts();
- turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ turn_port_->CreateConnection(udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE,
+ IceConfig());
// Set bad credentials.
cricket::RelayCredentials bad_credentials("bad_user", "bad_pwd");
turn_port_->set_credentials(bad_credentials);
@@ -759,10 +760,10 @@ TEST_F(TurnPortTest, TestRefreshRequestGetsErrorResponse) {
TEST_F(TurnPortTest, TestStopProcessingPacketsAfterClosed) {
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
PrepareTurnAndUdpPorts();
- Connection* conn1 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
- Connection* conn2 = udp_port_->CreateConnection(turn_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn1 = turn_port_->CreateConnection(
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
+ Connection* conn2 = udp_port_->CreateConnection(
+ turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 != NULL);
ASSERT_TRUE(conn2 != NULL);
// Make sure conn2 is writable.
@@ -785,14 +786,14 @@ TEST_F(TurnPortTest, TestCreateConnectionWhenSocketClosed) {
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnTcpProtoAddr);
PrepareTurnAndUdpPorts();
// Create a connection.
- Connection* conn1 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn1 = turn_port_->CreateConnection(
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 != NULL);
// 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);
+ Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 == NULL);
}
@@ -897,8 +898,8 @@ TEST_F(TurnPortTest, TestRefreshCreatePermissionRequest) {
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
PrepareTurnAndUdpPorts();
- Connection* conn = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn = turn_port_->CreateConnection(
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ConnectConnectionDestroyedSignal(conn);
ASSERT_TRUE(conn != NULL);
ASSERT_TRUE_WAIT(turn_create_permission_success_, kTimeout);
@@ -919,11 +920,11 @@ TEST_F(TurnPortTest, TestRefreshCreatePermissionRequest) {
TEST_F(TurnPortTest, TestChannelBindGetErrorResponse) {
CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
PrepareTurnAndUdpPorts();
- Connection* conn1 = turn_port_->CreateConnection(udp_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn1 = turn_port_->CreateConnection(
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn1 != nullptr);
- Connection* conn2 = udp_port_->CreateConnection(turn_port_->Candidates()[0],
- Port::ORIGIN_MESSAGE);
+ Connection* conn2 = udp_port_->CreateConnection(
+ turn_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig());
ASSERT_TRUE(conn2 != nullptr);
ConnectConnectionDestroyedSignal(conn1);
conn1->Ping(0);
@@ -1008,7 +1009,7 @@ TEST_F(TurnPortTest, TestConnectionDestroyedOnCreatePermissionFailure) {
ASSERT_TRUE_WAIT(udp_ready_, kTimeout);
// Create a connection.
TestConnectionWrapper conn(turn_port_->CreateConnection(
- udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE));
+ udp_port_->Candidates()[0], Port::ORIGIN_MESSAGE, IceConfig()));
ASSERT_TRUE(conn.connection() != nullptr);
// Asynchronously, CreatePermission request should be sent and fail, closing
« webrtc/p2p/base/transport.h ('K') | « webrtc/p2p/base/turnport.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698