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

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

Issue 1892323002: Change scoped_ptr to std::unique_ptr in //net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/unix_domain_client_socket_posix.h" 5 #include "net/socket/unix_domain_client_socket_posix.h"
6 6
7 #include <unistd.h> 7 #include <unistd.h>
8
9 #include <memory>
8 #include <utility> 10 #include <utility>
9 11
10 #include "base/bind.h" 12 #include "base/bind.h"
11 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
12 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/posix/eintr_wrapper.h" 15 #include "base/posix/eintr_wrapper.h"
15 #include "net/base/io_buffer.h" 16 #include "net/base/io_buffer.h"
16 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
17 #include "net/base/sockaddr_storage.h" 18 #include "net/base/sockaddr_storage.h"
18 #include "net/base/test_completion_callback.h" 19 #include "net/base/test_completion_callback.h"
19 #include "net/socket/socket_posix.h" 20 #include "net/socket/socket_posix.h"
20 #include "net/socket/unix_domain_server_socket_posix.h" 21 #include "net/socket/unix_domain_server_socket_posix.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 23
23 namespace net { 24 namespace net {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 std::string socket_path_; 127 std::string socket_path_;
127 }; 128 };
128 129
129 TEST_F(UnixDomainClientSocketTest, Connect) { 130 TEST_F(UnixDomainClientSocketTest, Connect) {
130 const bool kUseAbstractNamespace = false; 131 const bool kUseAbstractNamespace = false;
131 132
132 UnixDomainServerSocket server_socket(CreateAuthCallback(true), 133 UnixDomainServerSocket server_socket(CreateAuthCallback(true),
133 kUseAbstractNamespace); 134 kUseAbstractNamespace);
134 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 135 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
135 136
136 scoped_ptr<StreamSocket> accepted_socket; 137 std::unique_ptr<StreamSocket> accepted_socket;
137 TestCompletionCallback accept_callback; 138 TestCompletionCallback accept_callback;
138 EXPECT_EQ(ERR_IO_PENDING, 139 EXPECT_EQ(ERR_IO_PENDING,
139 server_socket.Accept(&accepted_socket, accept_callback.callback())); 140 server_socket.Accept(&accepted_socket, accept_callback.callback()));
140 EXPECT_FALSE(accepted_socket); 141 EXPECT_FALSE(accepted_socket);
141 142
142 UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace); 143 UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace);
143 EXPECT_FALSE(client_socket.IsConnected()); 144 EXPECT_FALSE(client_socket.IsConnected());
144 145
145 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 146 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
146 EXPECT_TRUE(client_socket.IsConnected()); 147 EXPECT_TRUE(client_socket.IsConnected());
(...skipping 30 matching lines...) Expand all
177 EXPECT_EQ(OK, accept_callback.WaitForResult()); 178 EXPECT_EQ(OK, accept_callback.WaitForResult());
178 EXPECT_NE(kInvalidSocket, accepted_socket_fd); 179 EXPECT_NE(kInvalidSocket, accepted_socket_fd);
179 180
180 SocketDescriptor client_socket_fd = client_socket.ReleaseConnectedSocket(); 181 SocketDescriptor client_socket_fd = client_socket.ReleaseConnectedSocket();
181 EXPECT_NE(kInvalidSocket, client_socket_fd); 182 EXPECT_NE(kInvalidSocket, client_socket_fd);
182 183
183 // Now, re-wrap client_socket_fd in a UnixDomainClientSocket and try a read 184 // Now, re-wrap client_socket_fd in a UnixDomainClientSocket and try a read
184 // to be sure it hasn't gotten accidentally closed. 185 // to be sure it hasn't gotten accidentally closed.
185 SockaddrStorage addr; 186 SockaddrStorage addr;
186 ASSERT_TRUE(UnixDomainClientSocket::FillAddress(socket_path_, false, &addr)); 187 ASSERT_TRUE(UnixDomainClientSocket::FillAddress(socket_path_, false, &addr));
187 scoped_ptr<SocketPosix> adopter(new SocketPosix); 188 std::unique_ptr<SocketPosix> adopter(new SocketPosix);
188 adopter->AdoptConnectedSocket(client_socket_fd, addr); 189 adopter->AdoptConnectedSocket(client_socket_fd, addr);
189 UnixDomainClientSocket rewrapped_socket(std::move(adopter)); 190 UnixDomainClientSocket rewrapped_socket(std::move(adopter));
190 EXPECT_TRUE(rewrapped_socket.IsConnected()); 191 EXPECT_TRUE(rewrapped_socket.IsConnected());
191 192
192 // Try to read data. 193 // Try to read data.
193 const int kReadDataSize = 10; 194 const int kReadDataSize = 10;
194 scoped_refptr<IOBuffer> read_buffer(new IOBuffer(kReadDataSize)); 195 scoped_refptr<IOBuffer> read_buffer(new IOBuffer(kReadDataSize));
195 TestCompletionCallback read_callback; 196 TestCompletionCallback read_callback;
196 EXPECT_EQ(ERR_IO_PENDING, 197 EXPECT_EQ(ERR_IO_PENDING,
197 rewrapped_socket.Read( 198 rewrapped_socket.Read(
198 read_buffer.get(), kReadDataSize, read_callback.callback())); 199 read_buffer.get(), kReadDataSize, read_callback.callback()));
199 200
200 EXPECT_EQ(0, IGNORE_EINTR(close(accepted_socket_fd))); 201 EXPECT_EQ(0, IGNORE_EINTR(close(accepted_socket_fd)));
201 } 202 }
202 203
203 TEST_F(UnixDomainClientSocketTest, ConnectWithAbstractNamespace) { 204 TEST_F(UnixDomainClientSocketTest, ConnectWithAbstractNamespace) {
204 const bool kUseAbstractNamespace = true; 205 const bool kUseAbstractNamespace = true;
205 206
206 UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace); 207 UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace);
207 EXPECT_FALSE(client_socket.IsConnected()); 208 EXPECT_FALSE(client_socket.IsConnected());
208 209
209 #if defined(OS_ANDROID) || defined(OS_LINUX) 210 #if defined(OS_ANDROID) || defined(OS_LINUX)
210 UnixDomainServerSocket server_socket(CreateAuthCallback(true), 211 UnixDomainServerSocket server_socket(CreateAuthCallback(true),
211 kUseAbstractNamespace); 212 kUseAbstractNamespace);
212 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 213 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
213 214
214 scoped_ptr<StreamSocket> accepted_socket; 215 std::unique_ptr<StreamSocket> accepted_socket;
215 TestCompletionCallback accept_callback; 216 TestCompletionCallback accept_callback;
216 EXPECT_EQ(ERR_IO_PENDING, 217 EXPECT_EQ(ERR_IO_PENDING,
217 server_socket.Accept(&accepted_socket, accept_callback.callback())); 218 server_socket.Accept(&accepted_socket, accept_callback.callback()));
218 EXPECT_FALSE(accepted_socket); 219 EXPECT_FALSE(accepted_socket);
219 220
220 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 221 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
221 EXPECT_TRUE(client_socket.IsConnected()); 222 EXPECT_TRUE(client_socket.IsConnected());
222 // Server has not yet beend notified of the connection. 223 // Server has not yet beend notified of the connection.
223 EXPECT_FALSE(accepted_socket); 224 EXPECT_FALSE(accepted_socket);
224 225
(...skipping 24 matching lines...) Expand all
249 #if defined(OS_ANDROID) || defined(OS_LINUX) 250 #if defined(OS_ANDROID) || defined(OS_LINUX)
250 EXPECT_EQ(ERR_CONNECTION_REFUSED, ConnectSynchronously(&client_socket)); 251 EXPECT_EQ(ERR_CONNECTION_REFUSED, ConnectSynchronously(&client_socket));
251 #else 252 #else
252 EXPECT_EQ(ERR_ADDRESS_INVALID, ConnectSynchronously(&client_socket)); 253 EXPECT_EQ(ERR_ADDRESS_INVALID, ConnectSynchronously(&client_socket));
253 #endif 254 #endif
254 } 255 }
255 256
256 TEST_F(UnixDomainClientSocketTest, DisconnectFromClient) { 257 TEST_F(UnixDomainClientSocketTest, DisconnectFromClient) {
257 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false); 258 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
258 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 259 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
259 scoped_ptr<StreamSocket> accepted_socket; 260 std::unique_ptr<StreamSocket> accepted_socket;
260 TestCompletionCallback accept_callback; 261 TestCompletionCallback accept_callback;
261 EXPECT_EQ(ERR_IO_PENDING, 262 EXPECT_EQ(ERR_IO_PENDING,
262 server_socket.Accept(&accepted_socket, accept_callback.callback())); 263 server_socket.Accept(&accepted_socket, accept_callback.callback()));
263 UnixDomainClientSocket client_socket(socket_path_, false); 264 UnixDomainClientSocket client_socket(socket_path_, false);
264 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 265 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
265 266
266 EXPECT_EQ(OK, accept_callback.WaitForResult()); 267 EXPECT_EQ(OK, accept_callback.WaitForResult());
267 EXPECT_TRUE(accepted_socket->IsConnected()); 268 EXPECT_TRUE(accepted_socket->IsConnected());
268 EXPECT_TRUE(client_socket.IsConnected()); 269 EXPECT_TRUE(client_socket.IsConnected());
269 270
(...skipping 12 matching lines...) Expand all
282 283
283 // Connection closed by peer. 284 // Connection closed by peer.
284 EXPECT_EQ(0 /* EOF */, read_callback.WaitForResult()); 285 EXPECT_EQ(0 /* EOF */, read_callback.WaitForResult());
285 // Note that read callback won't be called when the connection is closed 286 // Note that read callback won't be called when the connection is closed
286 // locally before the peer closes it. SocketPosix just clears callbacks. 287 // locally before the peer closes it. SocketPosix just clears callbacks.
287 } 288 }
288 289
289 TEST_F(UnixDomainClientSocketTest, DisconnectFromServer) { 290 TEST_F(UnixDomainClientSocketTest, DisconnectFromServer) {
290 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false); 291 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
291 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 292 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
292 scoped_ptr<StreamSocket> accepted_socket; 293 std::unique_ptr<StreamSocket> accepted_socket;
293 TestCompletionCallback accept_callback; 294 TestCompletionCallback accept_callback;
294 EXPECT_EQ(ERR_IO_PENDING, 295 EXPECT_EQ(ERR_IO_PENDING,
295 server_socket.Accept(&accepted_socket, accept_callback.callback())); 296 server_socket.Accept(&accepted_socket, accept_callback.callback()));
296 UnixDomainClientSocket client_socket(socket_path_, false); 297 UnixDomainClientSocket client_socket(socket_path_, false);
297 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 298 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
298 299
299 EXPECT_EQ(OK, accept_callback.WaitForResult()); 300 EXPECT_EQ(OK, accept_callback.WaitForResult());
300 EXPECT_TRUE(accepted_socket->IsConnected()); 301 EXPECT_TRUE(accepted_socket->IsConnected());
301 EXPECT_TRUE(client_socket.IsConnected()); 302 EXPECT_TRUE(client_socket.IsConnected());
302 303
(...skipping 12 matching lines...) Expand all
315 316
316 // Connection closed by peer. 317 // Connection closed by peer.
317 EXPECT_EQ(0 /* EOF */, read_callback.WaitForResult()); 318 EXPECT_EQ(0 /* EOF */, read_callback.WaitForResult());
318 // Note that read callback won't be called when the connection is closed 319 // Note that read callback won't be called when the connection is closed
319 // locally before the peer closes it. SocketPosix just clears callbacks. 320 // locally before the peer closes it. SocketPosix just clears callbacks.
320 } 321 }
321 322
322 TEST_F(UnixDomainClientSocketTest, ReadAfterWrite) { 323 TEST_F(UnixDomainClientSocketTest, ReadAfterWrite) {
323 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false); 324 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
324 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 325 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
325 scoped_ptr<StreamSocket> accepted_socket; 326 std::unique_ptr<StreamSocket> accepted_socket;
326 TestCompletionCallback accept_callback; 327 TestCompletionCallback accept_callback;
327 EXPECT_EQ(ERR_IO_PENDING, 328 EXPECT_EQ(ERR_IO_PENDING,
328 server_socket.Accept(&accepted_socket, accept_callback.callback())); 329 server_socket.Accept(&accepted_socket, accept_callback.callback()));
329 UnixDomainClientSocket client_socket(socket_path_, false); 330 UnixDomainClientSocket client_socket(socket_path_, false);
330 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 331 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
331 332
332 EXPECT_EQ(OK, accept_callback.WaitForResult()); 333 EXPECT_EQ(OK, accept_callback.WaitForResult());
333 EXPECT_TRUE(accepted_socket->IsConnected()); 334 EXPECT_TRUE(accepted_socket->IsConnected());
334 EXPECT_TRUE(client_socket.IsConnected()); 335 EXPECT_TRUE(client_socket.IsConnected());
335 336
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 385
385 // Disconnect from server side after read-write. 386 // Disconnect from server side after read-write.
386 accepted_socket->Disconnect(); 387 accepted_socket->Disconnect();
387 EXPECT_FALSE(accepted_socket->IsConnected()); 388 EXPECT_FALSE(accepted_socket->IsConnected());
388 EXPECT_FALSE(client_socket.IsConnected()); 389 EXPECT_FALSE(client_socket.IsConnected());
389 } 390 }
390 391
391 TEST_F(UnixDomainClientSocketTest, ReadBeforeWrite) { 392 TEST_F(UnixDomainClientSocketTest, ReadBeforeWrite) {
392 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false); 393 UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
393 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1)); 394 EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
394 scoped_ptr<StreamSocket> accepted_socket; 395 std::unique_ptr<StreamSocket> accepted_socket;
395 TestCompletionCallback accept_callback; 396 TestCompletionCallback accept_callback;
396 EXPECT_EQ(ERR_IO_PENDING, 397 EXPECT_EQ(ERR_IO_PENDING,
397 server_socket.Accept(&accepted_socket, accept_callback.callback())); 398 server_socket.Accept(&accepted_socket, accept_callback.callback()));
398 UnixDomainClientSocket client_socket(socket_path_, false); 399 UnixDomainClientSocket client_socket(socket_path_, false);
399 EXPECT_EQ(OK, ConnectSynchronously(&client_socket)); 400 EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
400 401
401 EXPECT_EQ(OK, accept_callback.WaitForResult()); 402 EXPECT_EQ(OK, accept_callback.WaitForResult());
402 EXPECT_TRUE(accepted_socket->IsConnected()); 403 EXPECT_TRUE(accepted_socket->IsConnected());
403 EXPECT_TRUE(client_socket.IsConnected()); 404 EXPECT_TRUE(client_socket.IsConnected());
404 405
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 accepted_socket.get(), read_buffer.get(), kReadBufferSize, 0)); 440 accepted_socket.get(), read_buffer.get(), kReadBufferSize, 0));
440 441
441 // Disconnect from server side after read-write. 442 // Disconnect from server side after read-write.
442 accepted_socket->Disconnect(); 443 accepted_socket->Disconnect();
443 EXPECT_FALSE(accepted_socket->IsConnected()); 444 EXPECT_FALSE(accepted_socket->IsConnected());
444 EXPECT_FALSE(client_socket.IsConnected()); 445 EXPECT_FALSE(client_socket.IsConnected());
445 } 446 }
446 447
447 } // namespace 448 } // namespace
448 } // namespace net 449 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/unix_domain_client_socket_posix.cc ('k') | net/socket/unix_domain_server_socket_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698