summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc')
-rw-r--r--chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc92
1 files changed, 58 insertions, 34 deletions
diff --git a/chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc b/chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc
index 4ab9e35c891..01f35d940dc 100644
--- a/chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc
+++ b/chromium/third_party/libjingle/source/talk/app/webrtc/peerconnectionfactory_unittest.cc
@@ -156,7 +156,7 @@ TEST(PeerConnectionFactoryTestInternal, CreatePCUsingInternalModules) {
webrtc::PeerConnectionInterface::IceServers servers;
talk_base::scoped_refptr<PeerConnectionInterface> pc(
- factory->CreatePeerConnection(servers, NULL, NULL, &observer));
+ factory->CreatePeerConnection(servers, NULL, NULL, NULL, &observer));
EXPECT_TRUE(pc.get() != NULL);
}
@@ -164,6 +164,42 @@ TEST(PeerConnectionFactoryTestInternal, CreatePCUsingInternalModules) {
// This test verifies creation of PeerConnection with valid STUN and TURN
// configuration. Also verifies the URL's parsed correctly as expected.
TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) {
+ PeerConnectionInterface::RTCConfiguration config;
+ webrtc::PeerConnectionInterface::IceServer ice_server;
+ ice_server.uri = kStunIceServer;
+ config.servers.push_back(ice_server);
+ ice_server.uri = kTurnIceServer;
+ ice_server.password = kTurnPassword;
+ config.servers.push_back(ice_server);
+ ice_server.uri = kTurnIceServerWithTransport;
+ ice_server.password = kTurnPassword;
+ config.servers.push_back(ice_server);
+ talk_base::scoped_refptr<PeerConnectionInterface> pc(
+ factory_->CreatePeerConnection(config, NULL,
+ allocator_factory_.get(),
+ NULL,
+ &observer_));
+ EXPECT_TRUE(pc.get() != NULL);
+ StunConfigurations stun_configs;
+ webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
+ "stun.l.google.com", 19302);
+ stun_configs.push_back(stun1);
+ VerifyStunConfigurations(stun_configs);
+ TurnConfigurations turn_configs;
+ webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
+ "test.com", 1234, "test@hello.com", kTurnPassword, "udp", false);
+ turn_configs.push_back(turn1);
+ webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn2(
+ "hello.com", kDefaultStunPort, "test", kTurnPassword, "tcp", false);
+ turn_configs.push_back(turn2);
+ VerifyTurnConfigurations(turn_configs);
+}
+
+// This test verifies creation of PeerConnection with valid STUN and TURN
+// configuration. Also verifies the URL's parsed correctly as expected.
+// This version doesn't use RTCConfiguration.
+// TODO(mallinath) - Remove this method after clients start using RTCConfig.
+TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServersOldSignature) {
webrtc::PeerConnectionInterface::IceServers ice_servers;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = kStunIceServer;
@@ -184,12 +220,6 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) {
webrtc::PortAllocatorFactoryInterface::StunConfiguration stun1(
"stun.l.google.com", 19302);
stun_configs.push_back(stun1);
- webrtc::PortAllocatorFactoryInterface::StunConfiguration stun2(
- "test.com", 1234);
- stun_configs.push_back(stun2);
- webrtc::PortAllocatorFactoryInterface::StunConfiguration stun3(
- "hello.com", kDefaultStunPort);
- stun_configs.push_back(stun3);
VerifyStunConfigurations(stun_configs);
TurnConfigurations turn_configs;
webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
@@ -202,16 +232,16 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIceServers) {
}
TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) {
- webrtc::PeerConnectionInterface::IceServers ice_servers;
+ PeerConnectionInterface::RTCConfiguration config;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = kStunIceServer;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kTurnIceServerWithNoUsernameInUri;
ice_server.username = kTurnUsername;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
talk_base::scoped_refptr<PeerConnectionInterface> pc(
- factory_->CreatePeerConnection(ice_servers, NULL,
+ factory_->CreatePeerConnection(config, NULL,
allocator_factory_.get(),
NULL,
&observer_));
@@ -226,13 +256,13 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingNoUsernameInUri) {
// This test verifies the PeerConnection created properly with TURN url which
// has transport parameter in it.
TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) {
- webrtc::PeerConnectionInterface::IceServers ice_servers;
+ PeerConnectionInterface::RTCConfiguration config;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = kTurnIceServerWithTransport;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
talk_base::scoped_refptr<PeerConnectionInterface> pc(
- factory_->CreatePeerConnection(ice_servers, NULL,
+ factory_->CreatePeerConnection(config, NULL,
allocator_factory_.get(),
NULL,
&observer_));
@@ -242,27 +272,22 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingTurnUrlWithTransportParam) {
"hello.com", kDefaultStunPort, "test", kTurnPassword, "tcp", false);
turn_configs.push_back(turn);
VerifyTurnConfigurations(turn_configs);
- StunConfigurations stun_configs;
- webrtc::PortAllocatorFactoryInterface::StunConfiguration stun(
- "hello.com", kDefaultStunPort);
- stun_configs.push_back(stun);
- VerifyStunConfigurations(stun_configs);
}
TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) {
- webrtc::PeerConnectionInterface::IceServers ice_servers;
+ PeerConnectionInterface::RTCConfiguration config;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = kSecureTurnIceServer;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kSecureTurnIceServerWithoutTransportParam;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kSecureTurnIceServerWithoutTransportAndPortParam;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
talk_base::scoped_refptr<PeerConnectionInterface> pc(
- factory_->CreatePeerConnection(ice_servers, NULL,
+ factory_->CreatePeerConnection(config, NULL,
allocator_factory_.get(),
NULL,
&observer_));
@@ -283,23 +308,23 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) {
}
TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) {
- webrtc::PeerConnectionInterface::IceServers ice_servers;
+ PeerConnectionInterface::RTCConfiguration config;
webrtc::PeerConnectionInterface::IceServer ice_server;
ice_server.uri = kStunIceServerWithIPv4Address;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kStunIceServerWithIPv4AddressWithoutPort;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kStunIceServerWithIPv6Address;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kStunIceServerWithIPv6AddressWithoutPort;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kStunIceServerWithInvalidIPv6Address;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
ice_server.uri = kTurnIceServerWithIPv6Address;
ice_server.password = kTurnPassword;
- ice_servers.push_back(ice_server);
+ config.servers.push_back(ice_server);
talk_base::scoped_refptr<PeerConnectionInterface> pc(
- factory_->CreatePeerConnection(ice_servers, NULL,
+ factory_->CreatePeerConnection(config, NULL,
allocator_factory_.get(),
NULL,
&observer_));
@@ -317,9 +342,8 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingIPLiteralAddress) {
webrtc::PortAllocatorFactoryInterface::StunConfiguration stun4(
"2401:fa00:4::", 3478);
stun_configs.push_back(stun4); // Default port
- // Turn Address has the same host information as |stun3|.
- stun_configs.push_back(stun3);
VerifyStunConfigurations(stun_configs);
+
TurnConfigurations turn_configs;
webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1(
"2401:fa00:4::", 1234, "test", kTurnPassword, "udp", false);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 00:51:42 +0000