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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/udp/udp_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
« no previous file with comments | « net/udp/udp_socket_perftest.cc ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/udp/udp_socket_unittest.cc
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index c7ab74dd4ae92e004baf6879bec74709a96c55ba..cb4a495c70386703a4ec6b6e69dd7ab59dad0a31 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -23,7 +23,9 @@
#include "net/log/test_net_log.h"
#include "net/log/test_net_log_entry.h"
#include "net/log/test_net_log_util.h"
+#include "net/test/gtest_util.h"
#include "net/test/net_test_suite.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -31,6 +33,9 @@
#include <TargetConditionals.h>
#endif
+using net::test::IsError;
+using net::test::IsOk;
+
namespace net {
namespace {
@@ -167,7 +172,7 @@ void UDPSocketTest::ConnectTest(bool use_nonblocking_io) {
#endif
server->AllowAddressReuse();
int rv = server->Listen(bind_address);
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// Setup the client.
IPEndPoint server_address;
@@ -182,7 +187,7 @@ void UDPSocketTest::ConnectTest(bool use_nonblocking_io) {
#endif
rv = client->Connect(server_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Client sends to the server.
rv = WriteSocket(client.get(), simple_message);
@@ -206,7 +211,7 @@ void UDPSocketTest::ConnectTest(bool use_nonblocking_io) {
rv = server->RecvFrom(
buffer_.get(), kMaxRead, &recv_from_address_,
base::Bind(&ReadCompleteCallback, &read_result, run_loop.QuitClosure()));
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Client sends to the server.
base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -297,9 +302,9 @@ TEST_F(UDPSocketTest, Broadcast) {
server2->AllowBroadcast();
int rv = server1->Listen(listen_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = server2->Listen(listen_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = SendToSocket(server1.get(), first_message, broadcast_address);
ASSERT_EQ(static_cast<int>(first_message.size()), rv);
@@ -364,10 +369,10 @@ TEST_F(UDPSocketTest, ConnectRandomBind) {
NULL,
NetLog::Source());
sockets.push_back(socket);
- EXPECT_EQ(OK, socket->Connect(peer_address));
+ EXPECT_THAT(socket->Connect(peer_address), IsOk());
IPEndPoint client_address;
- EXPECT_EQ(OK, socket->GetLocalAddress(&client_address));
+ EXPECT_THAT(socket->GetLocalAddress(&client_address), IsOk());
used_ports.push_back(client_address.port());
}
@@ -382,11 +387,11 @@ TEST_F(UDPSocketTest, ConnectRandomBind) {
// Create a socket with random binding policy and connect.
std::unique_ptr<UDPClientSocket> test_socket(new UDPClientSocket(
DatagramSocket::RANDOM_BIND, rand_int_cb, NULL, NetLog::Source()));
- EXPECT_EQ(OK, test_socket->Connect(peer_address));
+ EXPECT_THAT(test_socket->Connect(peer_address), IsOk());
// Make sure that the last port number in the |used_ports| was used.
IPEndPoint client_address;
- EXPECT_EQ(OK, test_socket->GetLocalAddress(&client_address));
+ EXPECT_THAT(test_socket->GetLocalAddress(&client_address), IsOk());
EXPECT_EQ(used_ports.back(), client_address.port());
STLDeleteElements(&sockets);
@@ -413,7 +418,7 @@ TEST_F(UDPSocketTest, MAYBE_ConnectFail) {
base::Bind(&PrivilegedRand),
NULL, NetLog::Source()));
int rv = socket->Open(peer_address.GetFamily());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = socket->Connect(peer_address);
// Connect should have failed since we couldn't bind to that port,
EXPECT_NE(OK, rv);
@@ -441,14 +446,14 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
UDPServerSocket server1(NULL, NetLog::Source());
server1.AllowAddressReuse();
int rv = server1.Listen(bind_address);
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// Setup the second server to listen.
CreateUDPAddress("127.0.0.1", kPort2, &bind_address);
UDPServerSocket server2(NULL, NetLog::Source());
server2.AllowAddressReuse();
rv = server2.Listen(bind_address);
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
// Setup the client, connected to server 1.
IPEndPoint server_address;
@@ -458,7 +463,7 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
NULL,
NetLog::Source());
rv = client.Connect(server_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Client sends to server1.
rv = WriteSocket(&client, simple_message);
@@ -471,7 +476,7 @@ TEST_F(UDPSocketTest, VerifyConnectBindsAddr) {
// Get the client's address.
IPEndPoint client_address;
rv = client.GetLocalAddress(&client_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// Server2 sends reply.
rv = SendToSocket(&server2, foreign_message,
@@ -528,7 +533,7 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
IPEndPoint fetched_local_address;
rv = client.GetLocalAddress(&fetched_local_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
// TODO(mbelshe): figure out how to verify the IP and port.
// The port is dynamically generated by the udp stack.
@@ -538,7 +543,7 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
IPEndPoint fetched_remote_address;
rv = client.GetPeerAddress(&fetched_remote_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ(remote_address, fetched_remote_address);
}
@@ -549,7 +554,7 @@ TEST_F(UDPSocketTest, ServerGetLocalAddress) {
CreateUDPAddress("127.0.0.1", 0, &bind_address);
UDPServerSocket server(NULL, NetLog::Source());
int rv = server.Listen(bind_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
IPEndPoint local_address;
rv = server.GetLocalAddress(&local_address);
@@ -565,7 +570,7 @@ TEST_F(UDPSocketTest, ServerGetPeerAddress) {
CreateUDPAddress("127.0.0.1", 0, &bind_address);
UDPServerSocket server(NULL, NetLog::Source());
int rv = server.Listen(bind_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
IPEndPoint peer_address;
rv = server.GetPeerAddress(&peer_address);
@@ -578,7 +583,7 @@ TEST_F(UDPSocketTest, CloseWithPendingRead) {
CreateUDPAddress("127.0.0.1", 0, &bind_address);
UDPServerSocket server(NULL, NetLog::Source());
int rv = server.Listen(bind_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
TestCompletionCallback callback;
IPEndPoint from;
@@ -612,12 +617,12 @@ TEST_F(UDPSocketTest, MAYBE_JoinMulticastGroup) {
RandIntCallback(),
NULL,
NetLog::Source());
- EXPECT_EQ(OK, socket.Open(bind_address.GetFamily()));
- EXPECT_EQ(OK, socket.Bind(bind_address));
- EXPECT_EQ(OK, socket.JoinGroup(group_ip));
+ EXPECT_THAT(socket.Open(bind_address.GetFamily()), IsOk());
+ EXPECT_THAT(socket.Bind(bind_address), IsOk());
+ EXPECT_THAT(socket.JoinGroup(group_ip), IsOk());
// Joining group multiple times.
EXPECT_NE(OK, socket.JoinGroup(group_ip));
- EXPECT_EQ(OK, socket.LeaveGroup(group_ip));
+ EXPECT_THAT(socket.LeaveGroup(group_ip), IsOk());
// Leaving group multiple times.
EXPECT_NE(OK, socket.LeaveGroup(group_ip));
@@ -634,15 +639,15 @@ TEST_F(UDPSocketTest, MulticastOptions) {
NULL,
NetLog::Source());
// Before binding.
- EXPECT_EQ(OK, socket.SetMulticastLoopbackMode(false));
- EXPECT_EQ(OK, socket.SetMulticastLoopbackMode(true));
- EXPECT_EQ(OK, socket.SetMulticastTimeToLive(0));
- EXPECT_EQ(OK, socket.SetMulticastTimeToLive(3));
+ EXPECT_THAT(socket.SetMulticastLoopbackMode(false), IsOk());
+ EXPECT_THAT(socket.SetMulticastLoopbackMode(true), IsOk());
+ EXPECT_THAT(socket.SetMulticastTimeToLive(0), IsOk());
+ EXPECT_THAT(socket.SetMulticastTimeToLive(3), IsOk());
EXPECT_NE(OK, socket.SetMulticastTimeToLive(-1));
- EXPECT_EQ(OK, socket.SetMulticastInterface(0));
+ EXPECT_THAT(socket.SetMulticastInterface(0), IsOk());
- EXPECT_EQ(OK, socket.Open(bind_address.GetFamily()));
- EXPECT_EQ(OK, socket.Bind(bind_address));
+ EXPECT_THAT(socket.Open(bind_address.GetFamily()), IsOk());
+ EXPECT_THAT(socket.Bind(bind_address), IsOk());
EXPECT_NE(OK, socket.SetMulticastLoopbackMode(false));
EXPECT_NE(OK, socket.SetMulticastTimeToLive(0));
@@ -663,7 +668,7 @@ TEST_F(UDPSocketTest, SetDSCP) {
// We need a real IP, but we won't actually send anything to it.
CreateUDPAddress("8.8.8.8", 9999, &bind_address);
int rv = client.Open(bind_address.GetFamily());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = client.Connect(bind_address);
if (rv != OK) {
@@ -671,7 +676,7 @@ TEST_F(UDPSocketTest, SetDSCP) {
CreateUDPAddress("127.0.0.1", 9999, &bind_address);
rv = client.Connect(bind_address);
}
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
client.SetDiffServCodePoint(DSCP_NO_CHANGE);
client.SetDiffServCodePoint(DSCP_AF41);
@@ -771,13 +776,13 @@ TEST_F(UDPSocketTest, SetDSCPFake) {
NULL,
NetLog::Source());
int rv = client.SetDiffServCodePoint(DSCP_AF41);
- EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED, rv);
+ EXPECT_THAT(rv, IsError(ERR_SOCKET_NOT_CONNECTED));
rv = client.Open(bind_address.GetFamily());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = client.Connect(bind_address);
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
QwaveAPI& qos(QwaveAPI::Get());
qos.create_handle_func_ = FakeQOSCreateHandleFAIL;
@@ -787,24 +792,24 @@ TEST_F(UDPSocketTest, SetDSCPFake) {
qos.set_flow_func_ = FakeQOSSetFlow;
qos.qwave_supported_ = true;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_NO_CHANGE));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_NO_CHANGE), IsOk());
EXPECT_EQ(ERROR_NOT_SUPPORTED, client.SetDiffServCodePoint(DSCP_AF41));
qos.create_handle_func_ = FakeQOSCreateHandle;
g_expected_dscp = DSCP_AF41;
g_expected_traffic_type = QOSTrafficTypeAudioVideo;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_AF41));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_AF41), IsOk());
g_expected_dscp = DSCP_DEFAULT;
g_expected_traffic_type = QOSTrafficTypeBestEffort;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_DEFAULT));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_DEFAULT), IsOk());
g_expected_dscp = DSCP_CS2;
g_expected_traffic_type = QOSTrafficTypeExcellentEffort;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_CS2));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_CS2), IsOk());
g_expected_dscp = DSCP_CS3;
g_expected_traffic_type = QOSTrafficTypeExcellentEffort;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_NO_CHANGE));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_NO_CHANGE), IsOk());
g_expected_dscp = DSCP_DEFAULT;
g_expected_traffic_type = QOSTrafficTypeBestEffort;
- EXPECT_EQ(OK, client.SetDiffServCodePoint(DSCP_DEFAULT));
+ EXPECT_THAT(client.SetDiffServCodePoint(DSCP_DEFAULT), IsOk());
client.Close();
}
#endif
« no previous file with comments | « net/udp/udp_socket_perftest.cc ('k') | net/url_request/url_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698