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

Unified Diff: net/http/http_network_transaction_ssl_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/http/http_network_layer_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_ssl_unittest.cc
diff --git a/net/http/http_network_transaction_ssl_unittest.cc b/net/http/http_network_transaction_ssl_unittest.cc
index eed939f434d301eeea81bca3c82789cfe6135216..c0ca5f4d2eff57c325e13010282b07c981173815 100644
--- a/net/http/http_network_transaction_ssl_unittest.cc
+++ b/net/http/http_network_transaction_ssl_unittest.cc
@@ -22,8 +22,12 @@
#include "net/proxy/proxy_service.h"
#include "net/socket/socket_test_util.h"
#include "net/ssl/default_channel_id_store.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using net::test::IsOk;
+
namespace net {
namespace {
@@ -146,7 +150,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBinding) {
int rv = callback.GetResult(
trans1.Start(GetRequestInfo("https://www.example.com/"),
callback.callback(), BoundNetLog()));
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
HttpRequestHeaders headers1;
ASSERT_TRUE(trans1.GetFullRequestHeaders(&headers1));
@@ -164,7 +168,7 @@ TEST_F(HttpNetworkTransactionSSLTest, TokenBinding) {
rv = callback.GetResult(
trans2.Start(GetRequestInfo("https://www.example.com/"),
callback.callback(), BoundNetLog()));
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
HttpRequestHeaders headers2;
ASSERT_TRUE(trans2.GetFullRequestHeaders(&headers2));
@@ -198,7 +202,7 @@ TEST_F(HttpNetworkTransactionSSLTest, NoTokenBindingOverHttp) {
int rv =
callback.GetResult(trans.Start(GetRequestInfo("http://www.example.com/"),
callback.callback(), BoundNetLog()));
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
HttpRequestHeaders headers;
ASSERT_TRUE(trans.GetFullRequestHeaders(&headers));
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698