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/ssl_server_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/socket/ssl_client_socket_unittest.cc ('k') | net/socket/tcp_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_unittest.cc
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 92481a8e782f335232c1941abf1a72fab19993ef..ad1493463c5a1923e3e6f53be4fb45d932bf49b1 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -69,10 +69,15 @@
#include "net/ssl/ssl_server_config.h"
#include "net/ssl/test_ssl_private_key.h"
#include "net/test/cert_test_util.h"
+#include "net/test/gtest_util.h"
#include "net/test/test_data_directory.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 {
namespace {
@@ -541,8 +546,8 @@ TEST_F(SSLServerSocketTest, Handshake) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, client_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(client_ret, IsOk());
+ ASSERT_THAT(server_ret, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info;
@@ -576,8 +581,8 @@ TEST_F(SSLServerSocketTest, HandshakeCached) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, client_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(client_ret, IsOk());
+ ASSERT_THAT(server_ret, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info;
@@ -598,8 +603,8 @@ TEST_F(SSLServerSocketTest, HandshakeCached) {
client_ret2 = connect_callback2.GetResult(client_ret2);
server_ret2 = handshake_callback2.GetResult(server_ret2);
- ASSERT_EQ(OK, client_ret2);
- ASSERT_EQ(OK, server_ret2);
+ ASSERT_THAT(client_ret2, IsOk());
+ ASSERT_THAT(server_ret2, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info2;
@@ -624,8 +629,8 @@ TEST_F(SSLServerSocketTest, HandshakeCachedContextSwitch) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, client_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(client_ret, IsOk());
+ ASSERT_THAT(server_ret, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info;
@@ -648,8 +653,8 @@ TEST_F(SSLServerSocketTest, HandshakeCachedContextSwitch) {
client_ret2 = connect_callback2.GetResult(client_ret2);
server_ret2 = handshake_callback2.GetResult(server_ret2);
- ASSERT_EQ(OK, client_ret2);
- ASSERT_EQ(OK, server_ret2);
+ ASSERT_THAT(client_ret2, IsOk());
+ ASSERT_THAT(server_ret2, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info2;
@@ -681,8 +686,8 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCert) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, client_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(client_ret, IsOk());
+ ASSERT_THAT(server_ret, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info;
@@ -715,8 +720,8 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCertCached) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, client_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(client_ret, IsOk());
+ ASSERT_THAT(server_ret, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info;
@@ -741,8 +746,8 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCertCached) {
client_ret2 = connect_callback2.GetResult(client_ret2);
server_ret2 = handshake_callback2.GetResult(server_ret2);
- ASSERT_EQ(OK, client_ret2);
- ASSERT_EQ(OK, server_ret2);
+ ASSERT_THAT(client_ret2, IsOk());
+ ASSERT_THAT(server_ret2, IsOk());
// Make sure the cert status is expected.
SSLInfo ssl_info2;
@@ -785,7 +790,7 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCertRequiredNotSupplied) {
client_socket_->Disconnect();
- EXPECT_EQ(ERR_FAILED, handshake_callback.GetResult(server_ret));
+ EXPECT_THAT(handshake_callback.GetResult(server_ret), IsError(ERR_FAILED));
}
TEST_F(SSLServerSocketTest, HandshakeWithClientCertRequiredNotSuppliedCached) {
@@ -818,7 +823,7 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCertRequiredNotSuppliedCached) {
client_socket_->Disconnect();
- EXPECT_EQ(ERR_FAILED, handshake_callback.GetResult(server_ret));
+ EXPECT_THAT(handshake_callback.GetResult(server_ret), IsError(ERR_FAILED));
server_socket_->Disconnect();
// Below, check that the cache didn't store the result of a failed handshake.
@@ -840,7 +845,7 @@ TEST_F(SSLServerSocketTest, HandshakeWithClientCertRequiredNotSuppliedCached) {
client_socket_->Disconnect();
- EXPECT_EQ(ERR_FAILED, handshake_callback2.GetResult(server_ret2));
+ EXPECT_THAT(handshake_callback2.GetResult(server_ret2), IsError(ERR_FAILED));
}
TEST_F(SSLServerSocketTest, HandshakeWithWrongClientCertSupplied) {
@@ -919,9 +924,9 @@ TEST_F(SSLServerSocketTest, DataTransfer) {
ASSERT_TRUE(server_ret == OK || server_ret == ERR_IO_PENDING);
client_ret = connect_callback.GetResult(client_ret);
- ASSERT_EQ(OK, client_ret);
+ ASSERT_THAT(client_ret, IsOk());
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(server_ret, IsOk());
const int kReadBufSize = 1024;
scoped_refptr<StringIOBuffer> write_buf =
@@ -1003,9 +1008,9 @@ TEST_F(SSLServerSocketTest, ClientWriteAfterServerClose) {
ASSERT_TRUE(server_ret == OK || server_ret == ERR_IO_PENDING);
client_ret = connect_callback.GetResult(client_ret);
- ASSERT_EQ(OK, client_ret);
+ ASSERT_THAT(client_ret, IsOk());
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(OK, server_ret);
+ ASSERT_THAT(server_ret, IsOk());
scoped_refptr<StringIOBuffer> write_buf = new StringIOBuffer("testing123");
@@ -1053,10 +1058,10 @@ TEST_F(SSLServerSocketTest, ExportKeyingMaterial) {
ASSERT_TRUE(server_ret == OK || server_ret == ERR_IO_PENDING);
if (client_ret == ERR_IO_PENDING) {
- ASSERT_EQ(OK, connect_callback.WaitForResult());
+ ASSERT_THAT(connect_callback.WaitForResult(), IsOk());
}
if (server_ret == ERR_IO_PENDING) {
- ASSERT_EQ(OK, handshake_callback.WaitForResult());
+ ASSERT_THAT(handshake_callback.WaitForResult(), IsOk());
}
const int kKeyingMaterialSize = 32;
@@ -1065,12 +1070,12 @@ TEST_F(SSLServerSocketTest, ExportKeyingMaterial) {
unsigned char server_out[kKeyingMaterialSize];
int rv = server_socket_->ExportKeyingMaterial(
kKeyingLabel, false, kKeyingContext, server_out, sizeof(server_out));
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
unsigned char client_out[kKeyingMaterialSize];
rv = client_socket_->ExportKeyingMaterial(kKeyingLabel, false, kKeyingContext,
client_out, sizeof(client_out));
- ASSERT_EQ(OK, rv);
+ ASSERT_THAT(rv, IsOk());
EXPECT_EQ(0, memcmp(server_out, client_out, sizeof(server_out)));
const char kKeyingLabelBad[] = "EXPERIMENTAL-server-socket-test-bad";
@@ -1114,8 +1119,8 @@ TEST_F(SSLServerSocketTest, RequireEcdheFlag) {
client_ret = connect_callback.GetResult(client_ret);
server_ret = handshake_callback.GetResult(server_ret);
- ASSERT_EQ(ERR_SSL_VERSION_OR_CIPHER_MISMATCH, client_ret);
- ASSERT_EQ(ERR_SSL_VERSION_OR_CIPHER_MISMATCH, server_ret);
+ ASSERT_THAT(client_ret, IsError(ERR_SSL_VERSION_OR_CIPHER_MISMATCH));
+ ASSERT_THAT(server_ret, IsError(ERR_SSL_VERSION_OR_CIPHER_MISMATCH));
}
} // namespace net
« no previous file with comments | « net/socket/ssl_client_socket_unittest.cc ('k') | net/socket/tcp_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698