| Index: net/socket/unix_domain_server_socket_posix_unittest.cc
|
| diff --git a/net/socket/unix_domain_server_socket_posix_unittest.cc b/net/socket/unix_domain_server_socket_posix_unittest.cc
|
| index f44e544e7618879b8b65cbba8e81badb5865bd7b..035aca1e48993ed06071c65267e8a595bc922ca5 100644
|
| --- a/net/socket/unix_domain_server_socket_posix_unittest.cc
|
| +++ b/net/socket/unix_domain_server_socket_posix_unittest.cc
|
| @@ -16,8 +16,13 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/test_completion_callback.h"
|
| #include "net/socket/unix_domain_client_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 {
|
|
|
| @@ -63,7 +68,8 @@ TEST_F(UnixDomainServerSocketTest, ListenWithInvalidPathWithAbstractNamespace) {
|
| UnixDomainServerSocket server_socket(CreateAuthCallback(true),
|
| kUseAbstractNamespace);
|
| #if defined(OS_ANDROID) || defined(OS_LINUX)
|
| - EXPECT_EQ(OK, server_socket.BindAndListen(kInvalidSocketPath, /*backlog=*/1));
|
| + EXPECT_THAT(server_socket.BindAndListen(kInvalidSocketPath, /*backlog=*/1),
|
| + IsOk());
|
| #else
|
| EXPECT_EQ(ERR_ADDRESS_INVALID,
|
| server_socket.BindAndListen(kInvalidSocketPath, /*backlog=*/1));
|
| @@ -76,7 +82,7 @@ TEST_F(UnixDomainServerSocketTest, ListenAgainAfterFailureWithInvalidPath) {
|
| kUseAbstractNamespace);
|
| EXPECT_EQ(ERR_FILE_NOT_FOUND,
|
| server_socket.BindAndListen(kInvalidSocketPath, /*backlog=*/1));
|
| - EXPECT_EQ(OK, server_socket.BindAndListen(socket_path_, /*backlog=*/1));
|
| + EXPECT_THAT(server_socket.BindAndListen(socket_path_, /*backlog=*/1), IsOk());
|
| }
|
|
|
| TEST_F(UnixDomainServerSocketTest, AcceptWithForbiddenUser) {
|
| @@ -84,7 +90,7 @@ TEST_F(UnixDomainServerSocketTest, AcceptWithForbiddenUser) {
|
|
|
| UnixDomainServerSocket server_socket(CreateAuthCallback(false),
|
| 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;
|
| @@ -99,7 +105,7 @@ TEST_F(UnixDomainServerSocketTest, AcceptWithForbiddenUser) {
|
| TestCompletionCallback connect_callback;
|
| int rv = connect_callback.GetResult(
|
| client_socket.Connect(connect_callback.callback()));
|
| - ASSERT_EQ(OK, rv);
|
| + ASSERT_THAT(rv, IsOk());
|
|
|
| // Try to read from the socket.
|
| const int read_buffer_size = 10;
|
| @@ -124,13 +130,13 @@ TEST_F(UnixDomainServerSocketTest, UnimplementedMethodsFail) {
|
| kUseAbstractNamespace);
|
|
|
| IPEndPoint ep;
|
| - EXPECT_EQ(ERR_NOT_IMPLEMENTED, server_socket.Listen(ep, 0));
|
| + EXPECT_THAT(server_socket.Listen(ep, 0), IsError(ERR_NOT_IMPLEMENTED));
|
| EXPECT_EQ(ERR_NOT_IMPLEMENTED,
|
| server_socket.ListenWithAddressAndPort(kInvalidSocketPath,
|
| 0,
|
| /*backlog=*/1));
|
|
|
| - EXPECT_EQ(ERR_ADDRESS_INVALID, server_socket.GetLocalAddress(&ep));
|
| + EXPECT_THAT(server_socket.GetLocalAddress(&ep), IsError(ERR_ADDRESS_INVALID));
|
| }
|
|
|
| // Normal cases including read/write are tested by UnixDomainClientSocketTest.
|
|
|