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

Unified Diff: webrtc/p2p/client/portallocator_unittest.cc

Issue 1311353011: Remove AsyncHttpRequest, AutoPortAllocator, ConnectivityChecker, and HttpPortAllocator (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: undo chromium change Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/client/httpportallocator.cc ('k') | webrtc/p2p/p2p.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/client/portallocator_unittest.cc
diff --git a/webrtc/p2p/client/portallocator_unittest.cc b/webrtc/p2p/client/portallocator_unittest.cc
index 7a52a2eff8a6711a31502bed3c12c190316392f4..9ea22dd189487192cb56152c5117f102939454b0 100644
--- a/webrtc/p2p/client/portallocator_unittest.cc
+++ b/webrtc/p2p/client/portallocator_unittest.cc
@@ -1218,109 +1218,3 @@ TEST_F(PortAllocatorTest, TestEnableIPv6Addresses) {
kClientAddr);
EXPECT_EQ(4U, candidates_.size());
}
-
-// Test that the httpportallocator correctly maintains its lists of stun and
-// relay servers, by never allowing an empty list.
-TEST(HttpPortAllocatorTest, TestHttpPortAllocatorHostLists) {
- rtc::FakeNetworkManager network_manager;
- cricket::HttpPortAllocator alloc(&network_manager, "unit test agent");
- EXPECT_EQ(1U, alloc.relay_hosts().size());
- EXPECT_EQ(1U, alloc.stun_hosts().size());
-
- std::vector<std::string> relay_servers;
- std::vector<rtc::SocketAddress> stun_servers;
-
- alloc.SetRelayHosts(relay_servers);
- alloc.SetStunHosts(stun_servers);
- EXPECT_EQ(1U, alloc.relay_hosts().size());
- EXPECT_EQ(1U, alloc.stun_hosts().size());
-
- relay_servers.push_back("1.unittest.corp.google.com");
- relay_servers.push_back("2.unittest.corp.google.com");
- stun_servers.push_back(
- rtc::SocketAddress("1.unittest.corp.google.com", 0));
- stun_servers.push_back(
- rtc::SocketAddress("2.unittest.corp.google.com", 0));
-
- alloc.SetRelayHosts(relay_servers);
- alloc.SetStunHosts(stun_servers);
- EXPECT_EQ(2U, alloc.relay_hosts().size());
- EXPECT_EQ(2U, alloc.stun_hosts().size());
-}
-
-// Test that the HttpPortAllocator uses correct URL to create sessions.
-TEST(HttpPortAllocatorTest, TestSessionRequestUrl) {
- rtc::FakeNetworkManager network_manager;
- cricket::HttpPortAllocator alloc(&network_manager, "unit test agent");
-
- rtc::scoped_ptr<cricket::HttpPortAllocatorSessionBase> session(
- static_cast<cricket::HttpPortAllocatorSession*>(
- alloc.CreateSessionInternal(
- "test content", 0, kIceUfrag0, kIcePwd0)));
- std::string url = session->GetSessionRequestUrl();
- LOG(LS_INFO) << "url: " << url;
- std::vector<std::string> parts;
- rtc::split(url, '?', &parts);
- ASSERT_EQ(2U, parts.size());
-
- std::vector<std::string> args_parts;
- rtc::split(parts[1], '&', &args_parts);
-
- std::map<std::string, std::string> args;
- for (std::vector<std::string>::iterator it = args_parts.begin();
- it != args_parts.end(); ++it) {
- std::vector<std::string> parts;
- rtc::split(*it, '=', &parts);
- ASSERT_EQ(2U, parts.size());
- args[rtc::s_url_decode(parts[0])] = rtc::s_url_decode(parts[1]);
- }
-
- EXPECT_EQ(kIceUfrag0, args["username"]);
- EXPECT_EQ(kIcePwd0, args["password"]);
-}
-
-// Tests that destroying ports with non-shared sockets does not crash.
-// b/19074679.
-TEST_F(PortAllocatorTest, TestDestroyPortsNonSharedSockets) {
- AddInterface(kClientAddr);
- EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
- session_->StartGettingPorts();
- ASSERT_EQ_WAIT(7U, candidates_.size(), kDefaultAllocationTimeout);
- EXPECT_EQ(4U, ports_.size());
-
- auto it = ports_.begin();
- for (; it != ports_.end(); ++it) {
- (reinterpret_cast<cricket::Port*>(*it))->Destroy();
- }
-}
-
-class AllocationSequenceForTest : public cricket::AllocationSequence {
- public:
- AllocationSequenceForTest(cricket::BasicPortAllocatorSession* session,
- rtc::Network* network,
- cricket::PortConfiguration* config,
- uint32 flags)
- : cricket::AllocationSequence(session, network, config, flags) {}
- using cricket::AllocationSequence::CreateTurnPort;
-};
-
-TEST_F(PortAllocatorTest, TestCreateTurnPortWithNullSocket) {
- EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
- session_->StartGettingPorts();
-
- cricket::ServerAddresses stun_servers;
- stun_servers.insert(kStunAddr);
- cricket::PortConfiguration config(stun_servers, kIceUfrag0, kIcePwd0);
- rtc::Network network1("test_eth0", "Test Network Adapter 1",
- rtc::IPAddress(0x12345600U), 24);
- uint32 flag = cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET;
- AllocationSequenceForTest alloc_sequence(
- static_cast<cricket::BasicPortAllocatorSession*>(session_.get()),
- &network1, &config, flag);
- // This simply tests it will not crash if udp_socket_ in the
- // AllocationSequence is null, which is chosen in the constructor.
- cricket::RelayServerConfig relay_server(cricket::RELAY_TURN);
- relay_server.ports.push_back(
- cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP, false));
- alloc_sequence.CreateTurnPort(relay_server);
-}
« no previous file with comments | « webrtc/p2p/client/httpportallocator.cc ('k') | webrtc/p2p/p2p.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698