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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_deflate_stream_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_basic_stream_test.cc ('k') | net/websockets/websocket_errors_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_deflate_stream_test.cc
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index 5106df710cdcbbcd1a09f93c19e44b1c590b3478..f4dde0872e591d1ef69da374c0bb378c1ac2a9ff 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -21,6 +21,7 @@
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
+#include "net/test/gtest_util.h"
#include "net/websockets/websocket_deflate_parameters.h"
#include "net/websockets/websocket_deflate_predictor.h"
#include "net/websockets/websocket_deflater.h"
@@ -31,6 +32,9 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using net::test::IsError;
+using net::test::IsOk;
+
namespace net {
namespace {
@@ -369,7 +373,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Return(ERR_FAILED));
}
- EXPECT_EQ(ERR_FAILED, deflate_stream_->ReadFrames(&frames, callback));
+ EXPECT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_FAILED));
}
TEST_F(WebSocketDeflateStreamTest, ReadUncompressedFrameImmediately) {
@@ -387,7 +392,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadUncompressedFrameImmediately) {
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
CompletionCallback callback;
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -409,7 +414,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadUncompressedFrameAsync) {
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(mock_callback, Call(OK));
}
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
ASSERT_EQ(0u, frames.size());
checkpoint.Call(0);
@@ -440,7 +446,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadFailedAsync) {
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(mock_callback, Call(ERR_FAILED));
}
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
ASSERT_EQ(0u, frames.size());
checkpoint.Call(0);
@@ -467,7 +474,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedFrameImmediately) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -488,7 +495,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedFrameAsync) {
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(mock_callback, Call(OK));
}
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
checkpoint.Call(0);
@@ -528,7 +536,8 @@ TEST_F(WebSocketDeflateStreamTest,
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(mock_callback, Call(OK));
}
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
ASSERT_EQ(0u, frames.size());
AppendTo(stub2.frames_passed(),
@@ -588,7 +597,7 @@ TEST_F(WebSocketDeflateStreamTest, MergeMultipleFramesInReadFrames) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -613,7 +622,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadUncompressedEmptyFrames) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_FALSE(frames[0]->header.final);
@@ -644,7 +653,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedEmptyFrames) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -672,7 +681,7 @@ TEST_F(WebSocketDeflateStreamTest,
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -699,7 +708,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadControlFrameBetweenDataFrames) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodePing, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -733,7 +742,7 @@ TEST_F(WebSocketDeflateStreamTest, SplitToMultipleFramesInReadFrames) {
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(3u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeBinary, frames[0]->header.opcode);
EXPECT_FALSE(frames[0]->header.final);
@@ -779,7 +788,7 @@ TEST_F(WebSocketDeflateStreamTest, InflaterInternalDataCanBeEmpty) {
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeBinary, frames[0]->header.opcode);
EXPECT_FALSE(frames[0]->header.final);
@@ -864,7 +873,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedMessages) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -895,7 +904,7 @@ TEST_F(WebSocketDeflateStreamTest, ReadUncompressedMessages) {
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -928,7 +937,7 @@ TEST_F(WebSocketDeflateStreamTest,
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -961,7 +970,7 @@ TEST_F(WebSocketDeflateStreamTest,
EXPECT_CALL(*mock_stream_, ReadFrames(&frames, _))
.WillOnce(Invoke(&stub, &ReadFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback), IsOk());
ASSERT_EQ(2u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
EXPECT_TRUE(frames[0]->header.final);
@@ -994,7 +1003,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadEmptyAsyncFrame) {
EXPECT_CALL(mock_callback, Call(OK));
}
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->ReadFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
AppendTo(stub_vector[0]->frames_passed(),
WebSocketFrameHeader::kOpCodeText,
kReserved1,
@@ -1017,7 +1027,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteEmpty) {
InSequence s;
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _)).Times(0);
}
- EXPECT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ EXPECT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
}
TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) {
@@ -1031,7 +1041,8 @@ TEST_F(WebSocketDeflateStreamTest, WriteFailedImmediately) {
AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "hello");
predictor_->AddFramesToBeInput(frames);
- EXPECT_EQ(ERR_FAILED, deflate_stream_->WriteFrames(&frames, callback));
+ EXPECT_THAT(deflate_stream_->WriteFrames(&frames, callback),
+ IsError(ERR_FAILED));
predictor_->Clear();
}
@@ -1046,7 +1057,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteFrameImmediately) {
EXPECT_CALL(*mock_stream_, WriteFrames(_, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(1u, frames_passed.size());
@@ -1072,7 +1083,8 @@ TEST_F(WebSocketDeflateStreamTest, WriteFrameAsync) {
}
AppendTo(&frames, WebSocketFrameHeader::kOpCodeText, kFinal, "Hello");
predictor_->AddFramesToBeInput(frames);
- ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback),
+ IsError(ERR_IO_PENDING));
checkpoint.Call(0);
stub.callback().Run(OK);
@@ -1101,7 +1113,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteControlFrameBetweenDataFrames) {
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(2u, frames_passed.size());
@@ -1127,7 +1139,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteEmptyMessage) {
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(1u, frames_passed.size());
@@ -1152,7 +1164,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteUncompressedMessage) {
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(2u, frames_passed.size());
@@ -1192,7 +1204,7 @@ TEST_F(WebSocketDeflateStreamTest, LargeDeflatedFramesShouldBeSplit) {
FrameFlag flag = is_final ? kFinal : kNoFlag;
AppendTo(&frames, WebSocketFrameHeader::kOpCodeBinary, flag, data);
predictor_->AddFramesToBeInput(frames);
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
total_compressed_frames.insert(
total_compressed_frames.end(),
std::make_move_iterator(stub.frames()->begin()),
@@ -1236,7 +1248,7 @@ TEST_F(WebSocketDeflateStreamTest, WriteMultipleMessages) {
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(2u, frames_passed.size());
@@ -1265,7 +1277,7 @@ TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest,
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(2u, frames_passed.size());
@@ -1302,7 +1314,7 @@ TEST_F(WebSocketDeflateStreamWithDoNotTakeOverContextTest,
EXPECT_CALL(*mock_stream_, WriteFrames(&frames, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(5u, frames_passed.size());
@@ -1345,7 +1357,7 @@ TEST_F(WebSocketDeflateStreamWithClientWindowBitsTest, WindowBits8) {
EXPECT_CALL(*mock_stream_, WriteFrames(_, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames_, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames_, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(1u, frames_passed.size());
@@ -1365,7 +1377,7 @@ TEST_F(WebSocketDeflateStreamWithClientWindowBitsTest, WindowBits10) {
EXPECT_CALL(*mock_stream_, WriteFrames(_, _))
.WillOnce(Invoke(&stub, &WriteFramesStub::Call));
}
- ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames_, callback));
+ ASSERT_THAT(deflate_stream_->WriteFrames(&frames_, callback), IsOk());
const std::vector<std::unique_ptr<WebSocketFrame>>& frames_passed =
*stub.frames();
ASSERT_EQ(1u, frames_passed.size());
« no previous file with comments | « net/websockets/websocket_basic_stream_test.cc ('k') | net/websockets/websocket_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698