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

Unified Diff: webrtc/api/peerconnection_unittest.cc

Issue 2587133004: Reland of: Adding error output param to SetConfiguration, using new RTCError type. (Closed)
Patch Set: Fixing compile error in less confusing way. Created 3 years, 11 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
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/peerconnection_unittest.cc
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index 4fe29f26e437970fea08111a74da75f829f516f3..c27e53ffc4582bb062b7759dcb29821e7860c8dc 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -2621,6 +2621,10 @@ class IceServerParsingTest : public testing::Test {
return ParseUrl(url, std::string(), std::string());
}
+ bool ParseTurnUrl(const std::string& url) {
+ return ParseUrl(url, "username", "password");
+ }
+
bool ParseUrl(const std::string& url,
const std::string& username,
const std::string& password) {
@@ -2640,7 +2644,8 @@ class IceServerParsingTest : public testing::Test {
server.password = password;
server.tls_cert_policy = tls_certificate_policy;
servers.push_back(server);
- return webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_);
+ return webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_) ==
+ webrtc::RTCErrorType::NONE;
}
protected:
@@ -2660,13 +2665,13 @@ TEST_F(IceServerParsingTest, ParseStunPrefixes) {
EXPECT_EQ(0U, turn_servers_.size());
stun_servers_.clear();
- EXPECT_TRUE(ParseUrl("turn:hostname"));
+ EXPECT_TRUE(ParseTurnUrl("turn:hostname"));
EXPECT_EQ(0U, stun_servers_.size());
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(cricket::PROTO_UDP, turn_servers_[0].ports[0].proto);
turn_servers_.clear();
- EXPECT_TRUE(ParseUrl("turns:hostname"));
+ EXPECT_TRUE(ParseTurnUrl("turns:hostname"));
EXPECT_EQ(0U, stun_servers_.size());
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto);
@@ -2675,7 +2680,7 @@ TEST_F(IceServerParsingTest, ParseStunPrefixes) {
turn_servers_.clear();
EXPECT_TRUE(ParseUrl(
- "turns:hostname", "", "",
+ "turns:hostname", "username", "password",
PeerConnectionInterface::TlsCertPolicy::kTlsCertPolicyInsecureNoCheck));
EXPECT_EQ(0U, stun_servers_.size());
EXPECT_EQ(1U, turn_servers_.size());
@@ -2693,14 +2698,14 @@ TEST_F(IceServerParsingTest, ParseStunPrefixes) {
TEST_F(IceServerParsingTest, VerifyDefaults) {
// TURNS defaults
- EXPECT_TRUE(ParseUrl("turns:hostname"));
+ EXPECT_TRUE(ParseTurnUrl("turns:hostname"));
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(5349, turn_servers_[0].ports[0].address.port());
EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto);
turn_servers_.clear();
// TURN defaults
- EXPECT_TRUE(ParseUrl("turn:hostname"));
+ EXPECT_TRUE(ParseTurnUrl("turn:hostname"));
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(3478, turn_servers_[0].ports[0].address.port());
EXPECT_EQ(cricket::PROTO_UDP, turn_servers_[0].ports[0].proto);
@@ -2765,33 +2770,33 @@ TEST_F(IceServerParsingTest, ParseHostnameAndPort) {
// Test parsing the "?transport=xxx" part of the URL.
TEST_F(IceServerParsingTest, ParseTransport) {
- EXPECT_TRUE(ParseUrl("turn:hostname:1234?transport=tcp"));
+ EXPECT_TRUE(ParseTurnUrl("turn:hostname:1234?transport=tcp"));
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(cricket::PROTO_TCP, turn_servers_[0].ports[0].proto);
turn_servers_.clear();
- EXPECT_TRUE(ParseUrl("turn:hostname?transport=udp"));
+ EXPECT_TRUE(ParseTurnUrl("turn:hostname?transport=udp"));
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ(cricket::PROTO_UDP, turn_servers_[0].ports[0].proto);
turn_servers_.clear();
- EXPECT_FALSE(ParseUrl("turn:hostname?transport=invalid"));
- EXPECT_FALSE(ParseUrl("turn:hostname?transport="));
- EXPECT_FALSE(ParseUrl("turn:hostname?="));
- EXPECT_FALSE(ParseUrl("?"));
+ EXPECT_FALSE(ParseTurnUrl("turn:hostname?transport=invalid"));
+ EXPECT_FALSE(ParseTurnUrl("turn:hostname?transport="));
+ EXPECT_FALSE(ParseTurnUrl("turn:hostname?="));
+ EXPECT_FALSE(ParseTurnUrl("?"));
}
// Test parsing ICE username contained in URL.
TEST_F(IceServerParsingTest, ParseUsername) {
- EXPECT_TRUE(ParseUrl("turn:user@hostname"));
+ EXPECT_TRUE(ParseTurnUrl("turn:user@hostname"));
EXPECT_EQ(1U, turn_servers_.size());
EXPECT_EQ("user", turn_servers_[0].credentials.username);
turn_servers_.clear();
- EXPECT_FALSE(ParseUrl("turn:@hostname"));
- EXPECT_FALSE(ParseUrl("turn:username@"));
- EXPECT_FALSE(ParseUrl("turn:@"));
- EXPECT_FALSE(ParseUrl("turn:user@name@hostname"));
+ EXPECT_FALSE(ParseTurnUrl("turn:@hostname"));
+ EXPECT_FALSE(ParseTurnUrl("turn:username@"));
+ EXPECT_FALSE(ParseTurnUrl("turn:@"));
+ EXPECT_FALSE(ParseTurnUrl("turn:user@name@hostname"));
}
// Test that username and password from IceServer is copied into the resulting
@@ -2809,8 +2814,11 @@ TEST_F(IceServerParsingTest, ParseMultipleUrls) {
PeerConnectionInterface::IceServer server;
server.urls.push_back("stun:hostname");
server.urls.push_back("turn:hostname");
+ server.username = "foo";
+ server.password = "bar";
servers.push_back(server);
- EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
+ EXPECT_EQ(webrtc::RTCErrorType::NONE,
+ webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
EXPECT_EQ(1U, stun_servers_.size());
EXPECT_EQ(1U, turn_servers_.size());
}
@@ -2822,8 +2830,11 @@ TEST_F(IceServerParsingTest, TurnServerPrioritiesUnique) {
PeerConnectionInterface::IceServer server;
server.urls.push_back("turn:hostname");
server.urls.push_back("turn:hostname2");
+ server.username = "foo";
+ server.password = "bar";
servers.push_back(server);
- EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
+ EXPECT_EQ(webrtc::RTCErrorType::NONE,
+ webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
EXPECT_EQ(2U, turn_servers_.size());
EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
}
« no previous file with comments | « webrtc/api/peerconnection.cc ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698