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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/unix_domain_client_socket_posix_unittest.cc

Issue 2109503009: Refactor net tests to use GMock matchers for checking net::Error results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to contents.txt files Created 4 years, 6 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 | « net/socket/transport_client_socket_unittest.cc ('k') | net/socket/unix_domain_server_socket_posix_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/unix_domain_client_socket_posix_unittest.cc
diff --git a/net/socket/unix_domain_client_socket_posix_unittest.cc b/net/socket/unix_domain_client_socket_posix_unittest.cc
index 4cccfc283bb52807fbfdd541f0d0673201d84b9d..9bda41731f2f8e861b49536d5b959876d24b7ca5 100644
--- a/net/socket/unix_domain_client_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_client_socket_posix_unittest.cc
@@ -19,8 +19,13 @@
#include "net/base/test_completion_callback.h"
#include "net/socket/socket_posix.h"
#include "net/socket/unix_domain_server_socket_posix.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using net::test::IsError;
+using net::test::IsOk;
+
namespace net {
namespace {
@@ -132,7 +137,7 @@ TEST_F(UnixDomainClientSocketTest, Connect) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true),
kUseAbstractNamespace);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
@@ -143,12 +148,12 @@ TEST_F(UnixDomainClientSocketTest, Connect) {
UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace);
EXPECT_FALSE(client_socket.IsConnected());
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
EXPECT_TRUE(client_socket.IsConnected());
// Server has not yet been notified of the connection.
EXPECT_FALSE(accepted_socket);
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket);
EXPECT_TRUE(accepted_socket->IsConnected());
}
@@ -158,7 +163,7 @@ TEST_F(UnixDomainClientSocketTest, ConnectWithSocketDescriptor) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true),
kUseAbstractNamespace);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
SocketDescriptor accepted_socket_fd = kInvalidSocket;
TestCompletionCallback accept_callback;
@@ -170,12 +175,12 @@ TEST_F(UnixDomainClientSocketTest, ConnectWithSocketDescriptor) {
UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace);
EXPECT_FALSE(client_socket.IsConnected());
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
EXPECT_TRUE(client_socket.IsConnected());
// Server has not yet been notified of the connection.
EXPECT_EQ(kInvalidSocket, accepted_socket_fd);
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_NE(kInvalidSocket, accepted_socket_fd);
SocketDescriptor client_socket_fd = client_socket.ReleaseConnectedSocket();
@@ -210,7 +215,7 @@ TEST_F(UnixDomainClientSocketTest, ConnectWithAbstractNamespace) {
#if defined(OS_ANDROID) || defined(OS_LINUX)
UnixDomainServerSocket server_socket(CreateAuthCallback(true),
kUseAbstractNamespace);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
@@ -218,16 +223,17 @@ TEST_F(UnixDomainClientSocketTest, ConnectWithAbstractNamespace) {
server_socket.Accept(&accepted_socket, accept_callback.callback()));
EXPECT_FALSE(accepted_socket);
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
EXPECT_TRUE(client_socket.IsConnected());
// Server has not yet beend notified of the connection.
EXPECT_FALSE(accepted_socket);
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket);
EXPECT_TRUE(accepted_socket->IsConnected());
#else
- EXPECT_EQ(ERR_ADDRESS_INVALID, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket),
+ IsError(ERR_ADDRESS_INVALID));
#endif
}
@@ -236,7 +242,8 @@ TEST_F(UnixDomainClientSocketTest, ConnectToNonExistentSocket) {
UnixDomainClientSocket client_socket(socket_path_, kUseAbstractNamespace);
EXPECT_FALSE(client_socket.IsConnected());
- EXPECT_EQ(ERR_FILE_NOT_FOUND, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket),
+ IsError(ERR_FILE_NOT_FOUND));
}
TEST_F(UnixDomainClientSocketTest,
@@ -248,23 +255,25 @@ TEST_F(UnixDomainClientSocketTest,
TestCompletionCallback connect_callback;
#if defined(OS_ANDROID) || defined(OS_LINUX)
- EXPECT_EQ(ERR_CONNECTION_REFUSED, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket),
+ IsError(ERR_CONNECTION_REFUSED));
#else
- EXPECT_EQ(ERR_ADDRESS_INVALID, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket),
+ IsError(ERR_ADDRESS_INVALID));
#endif
}
TEST_F(UnixDomainClientSocketTest, DisconnectFromClient) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
EXPECT_EQ(ERR_IO_PENDING,
server_socket.Accept(&accepted_socket, accept_callback.callback()));
UnixDomainClientSocket client_socket(socket_path_, false);
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket->IsConnected());
EXPECT_TRUE(client_socket.IsConnected());
@@ -289,15 +298,15 @@ TEST_F(UnixDomainClientSocketTest, DisconnectFromClient) {
TEST_F(UnixDomainClientSocketTest, DisconnectFromServer) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
EXPECT_EQ(ERR_IO_PENDING,
server_socket.Accept(&accepted_socket, accept_callback.callback()));
UnixDomainClientSocket client_socket(socket_path_, false);
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket->IsConnected());
EXPECT_TRUE(client_socket.IsConnected());
@@ -322,15 +331,15 @@ TEST_F(UnixDomainClientSocketTest, DisconnectFromServer) {
TEST_F(UnixDomainClientSocketTest, ReadAfterWrite) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
EXPECT_EQ(ERR_IO_PENDING,
server_socket.Accept(&accepted_socket, accept_callback.callback()));
UnixDomainClientSocket client_socket(socket_path_, false);
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket->IsConnected());
EXPECT_TRUE(client_socket.IsConnected());
@@ -391,15 +400,15 @@ TEST_F(UnixDomainClientSocketTest, ReadAfterWrite) {
TEST_F(UnixDomainClientSocketTest, ReadBeforeWrite) {
UnixDomainServerSocket server_socket(CreateAuthCallback(true), false);
- EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
+ EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
std::unique_ptr<StreamSocket> accepted_socket;
TestCompletionCallback accept_callback;
EXPECT_EQ(ERR_IO_PENDING,
server_socket.Accept(&accepted_socket, accept_callback.callback()));
UnixDomainClientSocket client_socket(socket_path_, false);
- EXPECT_EQ(OK, ConnectSynchronously(&client_socket));
+ EXPECT_THAT(ConnectSynchronously(&client_socket), IsOk());
- EXPECT_EQ(OK, accept_callback.WaitForResult());
+ EXPECT_THAT(accept_callback.WaitForResult(), IsOk());
EXPECT_TRUE(accepted_socket->IsConnected());
EXPECT_TRUE(client_socket.IsConnected());
« no previous file with comments | « net/socket/transport_client_socket_unittest.cc ('k') | net/socket/unix_domain_server_socket_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698