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

Unified Diff: net/websockets/websocket_handshake_stream_create_helper_test.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/websockets/websocket_errors_test.cc ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_handshake_stream_create_helper_test.cc
diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc
index 9d28e3e8a2c5107effc9d710a200e9b6e37a4754..e2f7104158f86786d125b9ed67967026c30d2b2a 100644
--- a/net/websockets/websocket_handshake_stream_create_helper_test.cc
+++ b/net/websockets/websocket_handshake_stream_create_helper_test.cc
@@ -17,13 +17,17 @@
#include "net/http/http_response_info.h"
#include "net/socket/client_socket_handle.h"
#include "net/socket/socket_test_util.h"
+#include "net/test/gtest_util.h"
#include "net/websockets/websocket_basic_handshake_stream.h"
#include "net/websockets/websocket_stream.h"
#include "net/websockets/websocket_test_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
#include "url/origin.h"
+using net::test::IsOk;
+
namespace net {
namespace {
@@ -104,7 +108,7 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
request_info.load_flags = LOAD_DISABLE_CACHE;
int rv = handshake->InitializeStream(
&request_info, DEFAULT_PRIORITY, BoundNetLog(), CompletionCallback());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
HttpRequestHeaders headers;
headers.SetHeader("Host", "localhost");
@@ -123,10 +127,10 @@ class WebSocketHandshakeStreamCreateHelperTest : public ::testing::Test {
rv = handshake->SendRequest(headers, &response, dummy.callback());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
rv = handshake->ReadResponseHeaders(dummy.callback());
- EXPECT_EQ(OK, rv);
+ EXPECT_THAT(rv, IsOk());
EXPECT_EQ(101, response.headers->response_code());
EXPECT_TRUE(response.headers->HasHeaderValue("Connection", "Upgrade"));
EXPECT_TRUE(response.headers->HasHeaderValue("Upgrade", "websocket"));
« no previous file with comments | « net/websockets/websocket_errors_test.cc ('k') | net/websockets/websocket_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698