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

Side by Side Diff: net/socket/tcp_server_socket_unittest.cc

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/tcp_server_socket_libevent.cc ('k') | net/socket/tcp_server_socket_win.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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/tcp_server_socket.h" 5 #include "net/socket/tcp_server_socket.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "net/base/address_list.h" 9 #include "net/base/address_list.h"
10 #include "net/base/ip_endpoint.h" 10 #include "net/base/ip_endpoint.h"
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 void ParseAddress(std::string ip_str, int port, IPEndPoint* address) { 36 void ParseAddress(std::string ip_str, int port, IPEndPoint* address) {
37 IPAddressNumber ip_number; 37 IPAddressNumber ip_number;
38 bool rv = ParseIPLiteralToNumber(ip_str, &ip_number); 38 bool rv = ParseIPLiteralToNumber(ip_str, &ip_number);
39 if (!rv) 39 if (!rv)
40 return; 40 return;
41 *address = IPEndPoint(ip_number, port); 41 *address = IPEndPoint(ip_number, port);
42 } 42 }
43 43
44 static IPEndPoint GetPeerAddress(ClientSocket* socket) { 44 static IPEndPoint GetPeerAddress(StreamSocket* socket) {
45 AddressList address; 45 AddressList address;
46 EXPECT_EQ(OK, socket->GetPeerAddress(&address)); 46 EXPECT_EQ(OK, socket->GetPeerAddress(&address));
47 IPEndPoint endpoint; 47 IPEndPoint endpoint;
48 EXPECT_TRUE(endpoint.FromSockAddr( 48 EXPECT_TRUE(endpoint.FromSockAddr(
49 address.head()->ai_addr, address.head()->ai_addrlen)); 49 address.head()->ai_addr, address.head()->ai_addrlen));
50 return endpoint; 50 return endpoint;
51 } 51 }
52 52
53 TCPServerSocket socket_; 53 TCPServerSocket socket_;
54 IPEndPoint local_address_; 54 IPEndPoint local_address_;
55 }; 55 };
56 56
57 TEST_F(TCPServerSocketTest, Accept) { 57 TEST_F(TCPServerSocketTest, Accept) {
58 TestCompletionCallback connect_callback; 58 TestCompletionCallback connect_callback;
59 TCPClientSocket connecting_socket(AddressList(local_address_.address(), 59 TCPClientSocket connecting_socket(AddressList(local_address_.address(),
60 local_address_.port(), false), 60 local_address_.port(), false),
61 NULL, NetLog::Source()); 61 NULL, NetLog::Source());
62 connecting_socket.Connect(&connect_callback); 62 connecting_socket.Connect(&connect_callback);
63 63
64 TestCompletionCallback accept_callback; 64 TestCompletionCallback accept_callback;
65 scoped_ptr<ClientSocket> accepted_socket; 65 scoped_ptr<StreamSocket> accepted_socket;
66 int result = socket_.Accept(&accepted_socket, &accept_callback); 66 int result = socket_.Accept(&accepted_socket, &accept_callback);
67 if (result == ERR_IO_PENDING) 67 if (result == ERR_IO_PENDING)
68 result = accept_callback.WaitForResult(); 68 result = accept_callback.WaitForResult();
69 ASSERT_EQ(OK, result); 69 ASSERT_EQ(OK, result);
70 70
71 ASSERT_TRUE(accepted_socket.get() != NULL); 71 ASSERT_TRUE(accepted_socket.get() != NULL);
72 72
73 // Both sockets should be on the loopback network interface. 73 // Both sockets should be on the loopback network interface.
74 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(), 74 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
75 local_address_.address()); 75 local_address_.address());
76 76
77 EXPECT_EQ(OK, connect_callback.WaitForResult()); 77 EXPECT_EQ(OK, connect_callback.WaitForResult());
78 } 78 }
79 79
80 // Test Accept() callback. 80 // Test Accept() callback.
81 TEST_F(TCPServerSocketTest, AcceptAsync) { 81 TEST_F(TCPServerSocketTest, AcceptAsync) {
82 TestCompletionCallback accept_callback; 82 TestCompletionCallback accept_callback;
83 scoped_ptr<ClientSocket> accepted_socket; 83 scoped_ptr<StreamSocket> accepted_socket;
84 84
85 ASSERT_EQ(ERR_IO_PENDING, socket_.Accept(&accepted_socket, &accept_callback)); 85 ASSERT_EQ(ERR_IO_PENDING, socket_.Accept(&accepted_socket, &accept_callback));
86 86
87 TestCompletionCallback connect_callback; 87 TestCompletionCallback connect_callback;
88 TCPClientSocket connecting_socket(AddressList(local_address_.address(), 88 TCPClientSocket connecting_socket(AddressList(local_address_.address(),
89 local_address_.port(), false), 89 local_address_.port(), false),
90 NULL, NetLog::Source()); 90 NULL, NetLog::Source());
91 connecting_socket.Connect(&connect_callback); 91 connecting_socket.Connect(&connect_callback);
92 92
93 EXPECT_EQ(OK, connect_callback.WaitForResult()); 93 EXPECT_EQ(OK, connect_callback.WaitForResult());
94 EXPECT_EQ(OK, accept_callback.WaitForResult()); 94 EXPECT_EQ(OK, accept_callback.WaitForResult());
95 95
96 EXPECT_TRUE(accepted_socket != NULL); 96 EXPECT_TRUE(accepted_socket != NULL);
97 97
98 // Both sockets should be on the loopback network interface. 98 // Both sockets should be on the loopback network interface.
99 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(), 99 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
100 local_address_.address()); 100 local_address_.address());
101 } 101 }
102 102
103 // Accept two connections simultaneously. 103 // Accept two connections simultaneously.
104 TEST_F(TCPServerSocketTest, Accept2Connections) { 104 TEST_F(TCPServerSocketTest, Accept2Connections) {
105 TestCompletionCallback accept_callback; 105 TestCompletionCallback accept_callback;
106 scoped_ptr<ClientSocket> accepted_socket; 106 scoped_ptr<StreamSocket> accepted_socket;
107 107
108 ASSERT_EQ(ERR_IO_PENDING, 108 ASSERT_EQ(ERR_IO_PENDING,
109 socket_.Accept(&accepted_socket, &accept_callback)); 109 socket_.Accept(&accepted_socket, &accept_callback));
110 110
111 TestCompletionCallback connect_callback; 111 TestCompletionCallback connect_callback;
112 TCPClientSocket connecting_socket(AddressList(local_address_.address(), 112 TCPClientSocket connecting_socket(AddressList(local_address_.address(),
113 local_address_.port(), false), 113 local_address_.port(), false),
114 NULL, NetLog::Source()); 114 NULL, NetLog::Source());
115 connecting_socket.Connect(&connect_callback); 115 connecting_socket.Connect(&connect_callback);
116 116
117 TestCompletionCallback connect_callback2; 117 TestCompletionCallback connect_callback2;
118 TCPClientSocket connecting_socket2(AddressList(local_address_.address(), 118 TCPClientSocket connecting_socket2(AddressList(local_address_.address(),
119 local_address_.port(), false), 119 local_address_.port(), false),
120 NULL, NetLog::Source()); 120 NULL, NetLog::Source());
121 connecting_socket2.Connect(&connect_callback2); 121 connecting_socket2.Connect(&connect_callback2);
122 122
123 EXPECT_EQ(OK, accept_callback.WaitForResult()); 123 EXPECT_EQ(OK, accept_callback.WaitForResult());
124 124
125 TestCompletionCallback accept_callback2; 125 TestCompletionCallback accept_callback2;
126 scoped_ptr<ClientSocket> accepted_socket2; 126 scoped_ptr<StreamSocket> accepted_socket2;
127 int result = socket_.Accept(&accepted_socket2, &accept_callback2); 127 int result = socket_.Accept(&accepted_socket2, &accept_callback2);
128 if (result == ERR_IO_PENDING) 128 if (result == ERR_IO_PENDING)
129 result = accept_callback2.WaitForResult(); 129 result = accept_callback2.WaitForResult();
130 ASSERT_EQ(OK, result); 130 ASSERT_EQ(OK, result);
131 131
132 EXPECT_EQ(OK, connect_callback.WaitForResult()); 132 EXPECT_EQ(OK, connect_callback.WaitForResult());
133 133
134 EXPECT_TRUE(accepted_socket != NULL); 134 EXPECT_TRUE(accepted_socket != NULL);
135 EXPECT_TRUE(accepted_socket2 != NULL); 135 EXPECT_TRUE(accepted_socket2 != NULL);
136 EXPECT_NE(accepted_socket.get(), accepted_socket2.get()); 136 EXPECT_NE(accepted_socket.get(), accepted_socket2.get());
137 137
138 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(), 138 EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
139 local_address_.address()); 139 local_address_.address());
140 EXPECT_EQ(GetPeerAddress(accepted_socket2.get()).address(), 140 EXPECT_EQ(GetPeerAddress(accepted_socket2.get()).address(),
141 local_address_.address()); 141 local_address_.address());
142 } 142 }
143 143
144 } // namespace 144 } // namespace
145 145
146 } // namespace net 146 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/tcp_server_socket_libevent.cc ('k') | net/socket/tcp_server_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698