net/socket/socks5_client_socket_unittest.cc - Issue 2109503009: Refactor net tests to use GMock matchers for checking net::Error results

Unified Diff: net/socket/socks5_client_socket_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

Index: net/socket/socks5_client_socket_unittest.cc

diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc

index a32f449fac36d41868fb0292ec9d1cf0f87d00bc..97bfeca1f9f0edd17499df1b90dddc9ba13776ce 100644

--- a/net/socket/socks5_client_socket_unittest.cc

+++ b/net/socket/socks5_client_socket_unittest.cc

@@ -22,9 +22,14 @@

#include "net/socket/client_socket_factory.h"

#include "net/socket/socket_test_util.h"

#include "net/socket/tcp_client_socket.h"

+#include "net/test/gtest_util.h"

+#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/platform_test.h"

+using net::test::IsError;

+using net::test::IsOk;

//-----------------------------------------------------------------------------

namespace net {

@@ -81,9 +86,9 @@ void SOCKS5ClientSocketTest::SetUp() {

callback.callback(),

NULL,

BoundNetLog());

- ASSERT_EQ(ERR_IO_PENDING, rv);

+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));

rv = callback.WaitForResult();

- ASSERT_EQ(OK, rv);

+ ASSERT_THAT(rv, IsOk());

}

std::unique_ptr<SOCKS5ClientSocket> SOCKS5ClientSocketTest::BuildMockSocket(

@@ -100,9 +105,9 @@ std::unique_ptr<SOCKS5ClientSocket> SOCKS5ClientSocketTest::BuildMockSocket(

tcp_sock_ = new MockTCPClientSocket(address_list_, net_log, data_.get());

int rv = tcp_sock_->Connect(callback.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

rv = callback.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(tcp_sock_->IsConnected());

std::unique_ptr<ClientSocketHandle> connection(new ClientSocketHandle);

@@ -148,7 +153,7 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {

EXPECT_FALSE(user_sock_->IsConnected());

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

EXPECT_FALSE(user_sock_->IsConnected());

TestNetLogEntry::List net_log_entries;

@@ -158,7 +163,7 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {

rv = callback_.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

net_log_.GetEntries(&net_log_entries);

@@ -169,14 +174,14 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) {

memcpy(buffer->data(), payload_write.data(), payload_write.size());

rv = user_sock_->Write(

buffer.get(), payload_write.size(), callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

rv = callback_.WaitForResult();

EXPECT_EQ(static_cast<int>(payload_write.size()), rv);

buffer = new IOBuffer(payload_read.size());

rv =

user_sock_->Read(buffer.get(), payload_read.size(), callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

rv = callback_.WaitForResult();

EXPECT_EQ(static_cast<int>(payload_read.size()), rv);

EXPECT_EQ(payload_read, std::string(buffer->data(), payload_read.size()));

@@ -216,7 +221,7 @@ TEST_F(SOCKS5ClientSocketTest, ConnectAndDisconnectTwice) {

hostname, 80, NULL);

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

user_sock_->Disconnect();

@@ -241,7 +246,7 @@ TEST_F(SOCKS5ClientSocketTest, LargeHostNameFails) {

// the transport socket first) because the hostname is too long.

TestCompletionCallback callback;

int rv = user_sock_->Connect(callback.callback());

- EXPECT_EQ(ERR_SOCKS_CONNECTION_FAILED, rv);

+ EXPECT_THAT(rv, IsError(ERR_SOCKS_CONNECTION_FAILED));

}

TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

@@ -273,7 +278,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

data_writes, arraysize(data_writes),

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

TestNetLogEntry::List net_log_entries;

net_log_.GetEntries(&net_log_entries);

@@ -281,7 +286,7 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

NetLog::TYPE_SOCKS5_CONNECT));

rv = callback_.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

net_log_.GetEntries(&net_log_entries);

@@ -304,14 +309,14 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

data_writes, arraysize(data_writes),

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

TestNetLogEntry::List net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

rv = callback_.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,

@@ -334,13 +339,13 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

data_writes, arraysize(data_writes),

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

TestNetLogEntry::List net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

rv = callback_.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,

@@ -365,13 +370,13 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) {

data_writes, arraysize(data_writes),

hostname, 80, &net_log_);

int rv = user_sock_->Connect(callback_.callback());

- EXPECT_EQ(ERR_IO_PENDING, rv);

+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));

TestNetLogEntry::List net_log_entries;

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsBeginEvent(net_log_entries, 0,

NetLog::TYPE_SOCKS5_CONNECT));

rv = callback_.WaitForResult();

- EXPECT_EQ(OK, rv);

+ EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(user_sock_->IsConnected());

net_log_.GetEntries(&net_log_entries);

EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,

« no previous file with comments | « net/socket/sequenced_socket_data_unittest.cc ('k') | net/socket/socks_client_socket_pool_unittest.cc » ('j') | no next file with comments »