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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/transport_client_socket_pool_unittest.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing NET_EXPORT to *PortOnAddressList. Created 8 years, 8 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
« net/socket/transport_client_socket_pool.cc ('K') | « net/socket/transport_client_socket_pool.cc ('k') | net/socket_stream/socket_stream.h » ('j') | net/socket_stream/socket_stream.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/transport_client_socket_pool_unittest.cc
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 0b310833aadf7f2b68b16bc69a40be99902254c5..c335e33d252226219da640b0351902d93eb6eb41 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -15,7 +15,6 @@
#include "net/base/mock_host_resolver.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
#include "net/base/test_completion_callback.h"
#include "net/socket/client_socket_factory.h"
#include "net/socket/client_socket_handle.h"
@@ -73,7 +72,7 @@ class MockClientSocket : public StreamSocket {
virtual int GetLocalAddress(IPEndPoint* address) const {
if (!connected_)
return ERR_SOCKET_NOT_CONNECTED;
- if (addrlist_.head()->ai_family == AF_INET)
+ if (addrlist_.front().GetFamily() == AF_INET)
SetIPv4Address(address);
else
SetIPv6Address(address);
@@ -212,7 +211,7 @@ class MockPendingClientSocket : public StreamSocket {
virtual int GetLocalAddress(IPEndPoint* address) const {
if (!is_connected_)
return ERR_SOCKET_NOT_CONNECTED;
- if (addrlist_.head()->ai_family == AF_INET)
+ if (addrlist_.front().GetFamily() == AF_INET)
SetIPv4Address(address);
else
SetIPv6Address(address);
@@ -435,84 +434,72 @@ class TransportClientSocketPoolTest : public testing::Test {
TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
IPAddressNumber ip_number;
ASSERT_TRUE(ParseIPLiteralToNumber("192.168.1.1", &ip_number));
- AddressList addrlist_v4_1 = AddressList::CreateFromIPAddress(ip_number, 80);
+ IPEndPoint addrlist_v4_1(ip_number, 80);
ASSERT_TRUE(ParseIPLiteralToNumber("192.168.1.2", &ip_number));
- AddressList addrlist_v4_2 = AddressList::CreateFromIPAddress(ip_number, 80);
+ IPEndPoint addrlist_v4_2(ip_number, 80);
ASSERT_TRUE(ParseIPLiteralToNumber("2001:4860:b006::64", &ip_number));
- AddressList addrlist_v6_1 = AddressList::CreateFromIPAddress(ip_number, 80);
+ IPEndPoint addrlist_v6_1(ip_number, 80);
ASSERT_TRUE(ParseIPLiteralToNumber("2001:4860:b006::66", &ip_number));
- AddressList addrlist_v6_2 = AddressList::CreateFromIPAddress(ip_number, 80);
+ IPEndPoint addrlist_v6_2(ip_number, 80);
AddressList addrlist;
- const struct addrinfo* ai;
// Test 1: IPv4 only. Expect no change.
- addrlist = addrlist_v4_1;
- addrlist.Append(addrlist_v4_2.head());
- TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
- ai = addrlist.head();
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET, ai->ai_family);
- EXPECT_TRUE(ai->ai_next == NULL);
+ addrlist.clear();
+ addrlist.push_back(addrlist_v4_1);
+ addrlist.push_back(addrlist_v4_2);
+ TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+ ASSERT_EQ(2u, addrlist.size());
+ EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+ EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
// Test 2: IPv6 only. Expect no change.
- addrlist = addrlist_v6_1;
- addrlist.Append(addrlist_v6_2.head());
- TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
- ai = addrlist.head();
- EXPECT_EQ(AF_INET6, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- EXPECT_TRUE(ai->ai_next == NULL);
+ addrlist.clear();
+ addrlist.push_back(addrlist_v6_1);
+ addrlist.push_back(addrlist_v6_2);
+ TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+ ASSERT_EQ(2u, addrlist.size());
+ EXPECT_EQ(AF_INET6, addrlist[0].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
// Test 3: IPv4 then IPv6. Expect no change.
- addrlist = addrlist_v4_1;
- addrlist.Append(addrlist_v4_2.head());
- addrlist.Append(addrlist_v6_1.head());
- addrlist.Append(addrlist_v6_2.head());
- TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
- ai = addrlist.head();
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- EXPECT_TRUE(ai->ai_next == NULL);
+ addrlist.clear();
+ addrlist.push_back(addrlist_v4_1);
+ addrlist.push_back(addrlist_v4_2);
+ addrlist.push_back(addrlist_v6_1);
+ addrlist.push_back(addrlist_v6_2);
+ TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+ ASSERT_EQ(4u, addrlist.size());
+ EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+ EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
// Test 4: IPv6, IPv4, IPv6, IPv4. Expect first IPv6 moved to the end.
- addrlist = addrlist_v6_1;
- addrlist.Append(addrlist_v4_1.head());
- addrlist.Append(addrlist_v6_2.head());
- addrlist.Append(addrlist_v4_2.head());
- TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
- ai = addrlist.head();
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- EXPECT_TRUE(ai->ai_next == NULL);
+ addrlist.clear();
+ addrlist.push_back(addrlist_v6_1);
eroman 2012/05/04 01:08:41 I very quickly skimmed through this file... will t
+ addrlist.push_back(addrlist_v4_1);
+ addrlist.push_back(addrlist_v6_2);
+ addrlist.push_back(addrlist_v4_2);
+ TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+ ASSERT_EQ(4u, addrlist.size());
+ EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
+ EXPECT_EQ(AF_INET, addrlist[2].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
// Test 5: IPv6, IPv6, IPv4, IPv4. Expect first two IPv6's moved to the end.
- addrlist = addrlist_v6_1;
- addrlist.Append(addrlist_v6_2.head());
- addrlist.Append(addrlist_v4_1.head());
- addrlist.Append(addrlist_v4_2.head());
- TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
- ai = addrlist.head();
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- ai = ai->ai_next;
- EXPECT_EQ(AF_INET6, ai->ai_family);
- EXPECT_TRUE(ai->ai_next == NULL);
+ addrlist.clear();
+ addrlist.push_back(addrlist_v6_1);
+ addrlist.push_back(addrlist_v6_2);
+ addrlist.push_back(addrlist_v4_1);
+ addrlist.push_back(addrlist_v4_2);
+ TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+ ASSERT_EQ(4u, addrlist.size());
+ EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+ EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
+ EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
}
TEST_F(TransportClientSocketPoolTest, Basic) {
« net/socket/transport_client_socket_pool.cc ('K') | « net/socket/transport_client_socket_pool.cc ('k') | net/socket_stream/socket_stream.h » ('j') | net/socket_stream/socket_stream.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698