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

Side by Side Diff: talk/app/webrtc/webrtcsession_unittest.cc

Issue 1391013007: Adding the ability to change ICE servers through SetConfiguration. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More renaming. Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 EXPECT_EQ_WAIT(expected_state, observers[i]->state(), 1000); 1415 EXPECT_EQ_WAIT(expected_state, observers[i]->state(), 1000);
1416 if (success) { 1416 if (success) {
1417 EXPECT_TRUE(observers[i]->description() != NULL); 1417 EXPECT_TRUE(observers[i]->description() != NULL);
1418 } else { 1418 } else {
1419 EXPECT_TRUE(observers[i]->description() == NULL); 1419 EXPECT_TRUE(observers[i]->description() == NULL);
1420 } 1420 }
1421 } 1421 }
1422 } 1422 }
1423 1423
1424 void ConfigureAllocatorWithTurn() { 1424 void ConfigureAllocatorWithTurn() {
1425 cricket::RelayServerConfig relay_server(cricket::RELAY_TURN); 1425 cricket::RelayServerConfig turn_server(cricket::RELAY_TURN);
1426 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword); 1426 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword);
1427 relay_server.credentials = credentials; 1427 turn_server.credentials = credentials;
1428 relay_server.ports.push_back(cricket::ProtocolAddress( 1428 turn_server.ports.push_back(
1429 kTurnUdpIntAddr, cricket::PROTO_UDP, false)); 1429 cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP, false));
1430 allocator_->AddRelay(relay_server); 1430 allocator_->AddTurnServer(turn_server);
1431 allocator_->set_step_delay(cricket::kMinimumStepDelay); 1431 allocator_->set_step_delay(cricket::kMinimumStepDelay);
1432 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); 1432 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP);
1433 } 1433 }
1434 1434
1435 cricket::FakeMediaEngine* media_engine_; 1435 cricket::FakeMediaEngine* media_engine_;
1436 cricket::FakeDataEngine* data_engine_; 1436 cricket::FakeDataEngine* data_engine_;
1437 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; 1437 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
1438 cricket::FakeCall fake_call_; 1438 cricket::FakeCall fake_call_;
1439 rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_; 1439 rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_;
1440 rtc::scoped_ptr<cricket::TransportDescriptionFactory> tdesc_factory_; 1440 rtc::scoped_ptr<cricket::TransportDescriptionFactory> tdesc_factory_;
(...skipping 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after
4190 } 4190 }
4191 4191
4192 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4192 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4193 // currently fails because upon disconnection and reconnection OnIceComplete is 4193 // currently fails because upon disconnection and reconnection OnIceComplete is
4194 // called more than once without returning to IceGatheringGathering. 4194 // called more than once without returning to IceGatheringGathering.
4195 4195
4196 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4196 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4197 WebRtcSessionTest, 4197 WebRtcSessionTest,
4198 testing::Values(ALREADY_GENERATED, 4198 testing::Values(ALREADY_GENERATED,
4199 DTLS_IDENTITY_STORE)); 4199 DTLS_IDENTITY_STORE));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698