Index: webrtc/api/peerconnection_unittest.cc |
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc |
index 301fed55dbce0659d4fcd45eae8c5ad48d2308ff..4549c8420ff673c26a81c8a2f9c71370452c6e73 100644 |
--- a/webrtc/api/peerconnection_unittest.cc |
+++ b/webrtc/api/peerconnection_unittest.cc |
@@ -40,6 +40,7 @@ |
#include "webrtc/base/virtualsocketserver.h" |
#include "webrtc/media/engine/fakewebrtcvideoengine.h" |
#include "webrtc/p2p/base/p2pconstants.h" |
+#include "webrtc/p2p/base/portinterface.h" |
#include "webrtc/p2p/base/sessiondescription.h" |
#include "webrtc/p2p/base/testturnserver.h" |
#include "webrtc/p2p/client/basicportallocator.h" |
@@ -2619,11 +2620,22 @@ class IceServerParsingTest : public testing::Test { |
bool ParseUrl(const std::string& url, |
const std::string& username, |
const std::string& password) { |
+ return ParseUrl( |
+ url, username, password, |
+ PeerConnectionInterface::TlsCertificatePolicy::kTlsCertPolicySecure); |
+ } |
+ |
+ bool ParseUrl( |
+ const std::string& url, |
+ const std::string& username, |
+ const std::string& password, |
+ PeerConnectionInterface::TlsCertificatePolicy tls_certificate_policy) { |
PeerConnectionInterface::IceServers servers; |
PeerConnectionInterface::IceServer server; |
server.urls.push_back(url); |
server.username = username; |
server.password = password; |
+ server.tls_certificate_policy = tls_certificate_policy; |
servers.push_back(server); |
return webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_); |
} |
@@ -2648,13 +2660,23 @@ TEST_F(IceServerParsingTest, ParseStunPrefixes) { |
EXPECT_TRUE(ParseUrl("turn:hostname")); |
EXPECT_EQ(0U, stun_servers_.size()); |
EXPECT_EQ(1U, turn_servers_.size()); |
- EXPECT_FALSE(turn_servers_[0].ports[0].secure); |
+ EXPECT_EQ(cricket::PROTO_UDP, turn_servers_[0].ports[0].proto); |
turn_servers_.clear(); |
EXPECT_TRUE(ParseUrl("turns:hostname")); |
EXPECT_EQ(0U, stun_servers_.size()); |
EXPECT_EQ(1U, turn_servers_.size()); |
- EXPECT_TRUE(turn_servers_[0].ports[0].secure); |
+ EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto); |
+ turn_servers_.clear(); |
+ |
+ EXPECT_TRUE(ParseUrl("turns:hostname", "", "", |
+ PeerConnectionInterface::TlsCertificatePolicy:: |
+ kTlsCertPolicyInsecureNoCheck)); |
+ EXPECT_EQ(0U, stun_servers_.size()); |
+ EXPECT_EQ(1U, turn_servers_.size()); |
+ EXPECT_TRUE(turn_servers_[0].ports[0].flags & |
+ cricket::PROTO_FLAG_INSECURE_CERT_CHECK); |
+ EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto); |
turn_servers_.clear(); |
// invalid prefixes |
@@ -2669,7 +2691,7 @@ TEST_F(IceServerParsingTest, VerifyDefaults) { |
EXPECT_TRUE(ParseUrl("turns:hostname")); |
EXPECT_EQ(1U, turn_servers_.size()); |
EXPECT_EQ(5349, turn_servers_[0].ports[0].address.port()); |
- EXPECT_EQ(cricket::PROTO_TCP, turn_servers_[0].ports[0].proto); |
+ EXPECT_EQ(cricket::PROTO_TLS, turn_servers_[0].ports[0].proto); |
turn_servers_.clear(); |
// TURN defaults |