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

Side by Side Diff: webrtc/api/webrtcsession_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: Merge with master again.. 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/p2p/base/p2ptransportchannel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 2229 matching lines...) Expand 10 before | Expand all | Expand 10 after
2240 candidates = local_desc->candidates(kMediaContentIndex0); 2240 candidates = local_desc->candidates(kMediaContentIndex0);
2241 ASSERT_TRUE(candidates != NULL); 2241 ASSERT_TRUE(candidates != NULL);
2242 EXPECT_LT(0u, candidates->count()); 2242 EXPECT_LT(0u, candidates->count());
2243 candidates = local_desc->candidates(1); 2243 candidates = local_desc->candidates(1);
2244 ASSERT_TRUE(candidates != NULL); 2244 ASSERT_TRUE(candidates != NULL);
2245 EXPECT_EQ(0u, candidates->count()); 2245 EXPECT_EQ(0u, candidates->count());
2246 2246
2247 candidates = local_desc->candidates(kMediaContentIndex0); 2247 candidates = local_desc->candidates(kMediaContentIndex0);
2248 size_t num_local_candidates = candidates->count(); 2248 size_t num_local_candidates = candidates->count();
2249 // Enable Continual Gathering 2249 // Enable Continual Gathering
2250 session_->SetIceConfig(cricket::IceConfig(-1, -1, true, false, -1)); 2250 session_->SetIceConfig(cricket::IceConfig(-1, -1, true, false, -1, true));
2251 // Bring down the network interface to trigger candidate removals. 2251 // Bring down the network interface to trigger candidate removals.
2252 RemoveInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort)); 2252 RemoveInterface(rtc::SocketAddress(kClientAddrHost1, kClientAddrPort));
2253 // Verify that all local candidates are removed. 2253 // Verify that all local candidates are removed.
2254 EXPECT_EQ(0, observer_.num_candidates_removed_); 2254 EXPECT_EQ(0, observer_.num_candidates_removed_);
2255 EXPECT_EQ_WAIT(num_local_candidates, observer_.num_candidates_removed_, 2255 EXPECT_EQ_WAIT(num_local_candidates, observer_.num_candidates_removed_,
2256 kIceCandidatesTimeout); 2256 kIceCandidatesTimeout);
2257 EXPECT_EQ_WAIT(0u, candidates->count(), kIceCandidatesTimeout); 2257 EXPECT_EQ_WAIT(0u, candidates->count(), kIceCandidatesTimeout);
2258 } 2258 }
2259 2259
2260 // Tests that if continual gathering is disabled, local candidates won't be 2260 // Tests that if continual gathering is disabled, local candidates won't be
(...skipping 2158 matching lines...) Expand 10 before | Expand all | Expand 10 after
4419 } 4419 }
4420 4420
4421 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4421 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4422 // currently fails because upon disconnection and reconnection OnIceComplete is 4422 // currently fails because upon disconnection and reconnection OnIceComplete is
4423 // called more than once without returning to IceGatheringGathering. 4423 // called more than once without returning to IceGatheringGathering.
4424 4424
4425 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4425 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4426 WebRtcSessionTest, 4426 WebRtcSessionTest,
4427 testing::Values(ALREADY_GENERATED, 4427 testing::Values(ALREADY_GENERATED,
4428 DTLS_IDENTITY_STORE)); 4428 DTLS_IDENTITY_STORE));
OLDNEW
« no previous file with comments | « no previous file | webrtc/p2p/base/p2ptransportchannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698