diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-07 23:32:02 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-07 23:32:02 +0000 |
| commit | 78187525665490922748d79377bcb351579e03c0 (patch) | |
| tree | 748f3c0dbf98f083d15bcfb409c0efa19ea127cf /talk/app/webrtc/peerconnectionfactory_unittest.cc | |
| parent | e0d55a0782c3b10911b5d10f4c98be9b827fe631 (diff) | |
| download | webrtc-78187525665490922748d79377bcb351579e03c0.tar.gz | |
Update libjingle to 53856368.
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2366004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4941 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/peerconnectionfactory_unittest.cc')
| -rw-r--r-- | talk/app/webrtc/peerconnectionfactory_unittest.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/talk/app/webrtc/peerconnectionfactory_unittest.cc b/talk/app/webrtc/peerconnectionfactory_unittest.cc index 182c01c46d..e3def6c241 100644 --- a/talk/app/webrtc/peerconnectionfactory_unittest.cc +++ b/talk/app/webrtc/peerconnectionfactory_unittest.cc @@ -61,6 +61,8 @@ static const char kTurnIceServerWithTransport[] = "turn:test@hello.com?transport=tcp"; static const char kSecureTurnIceServer[] = "turns:test@hello.com?transport=tcp"; +static const char kSecureTurnIceServerWithoutTransportParam[] = + "turns:test_no_transport@hello.com"; static const char kTurnIceServerWithNoUsernameInUri[] = "turn:test.com:1234"; static const char kTurnPassword[] = "turnpassword"; @@ -242,6 +244,9 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { ice_server.uri = kSecureTurnIceServer; ice_server.password = kTurnPassword; ice_servers.push_back(ice_server); + ice_server.uri = kSecureTurnIceServerWithoutTransportParam; + ice_server.password = kTurnPassword; + ice_servers.push_back(ice_server); talk_base::scoped_refptr<PeerConnectionInterface> pc( factory_->CreatePeerConnection(ice_servers, NULL, allocator_factory_.get(), @@ -249,9 +254,14 @@ TEST_F(PeerConnectionFactoryTest, CreatePCUsingSecureTurnUrl) { &observer_)); EXPECT_TRUE(pc.get() != NULL); TurnConfigurations turn_configs; - webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn( + webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn1( "hello.com", kDefaultStunTlsPort, "test", kTurnPassword, "tcp", true); - turn_configs.push_back(turn); + turn_configs.push_back(turn1); + // TURNS with transport param should be default to tcp. + webrtc::PortAllocatorFactoryInterface::TurnConfiguration turn2( + "hello.com", kDefaultStunTlsPort, "test_no_transport", + kTurnPassword, "tcp", true); + turn_configs.push_back(turn2); VerifyTurnConfigurations(turn_configs); } |