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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/chunked_upload_data_stream_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 | « no previous file | net/base/directory_lister_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/chunked_upload_data_stream_unittest.cc
diff --git a/net/base/chunked_upload_data_stream_unittest.cc b/net/base/chunked_upload_data_stream_unittest.cc
index 5b0d2164be603e32a7edb9452e6bba740f5c33c8..926e927e78bac0461fc8e9bbbfd6ae80759e699c 100644
--- a/net/base/chunked_upload_data_stream_unittest.cc
+++ b/net/base/chunked_upload_data_stream_unittest.cc
@@ -11,8 +11,13 @@
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "net/base/upload_data_stream.h"
+#include "net/test/gtest_util.h"
+#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 {
@@ -38,7 +43,7 @@ std::string ReadSync(UploadDataStream* stream, int buffer_size) {
TEST(ChunkedUploadDataStreamTest, AppendOnce) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -47,7 +52,7 @@ TEST(ChunkedUploadDataStreamTest, AppendOnce) {
TestCompletionCallback callback;
scoped_refptr<IOBuffer> buf = new IOBuffer(kTestBufferSize);
int result = stream.Read(buf.get(), kTestBufferSize, callback.callback());
- ASSERT_EQ(ERR_IO_PENDING, result);
+ ASSERT_THAT(result, IsError(ERR_IO_PENDING));
stream.AppendData(kTestData, kTestDataSize, true);
int read = callback.WaitForResult();
@@ -61,7 +66,7 @@ TEST(ChunkedUploadDataStreamTest, AppendOnce) {
TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeRead) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -83,7 +88,7 @@ TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeInit) {
ChunkedUploadDataStream stream(0);
stream.AppendData(kTestData, kTestDataSize, true);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -99,7 +104,7 @@ TEST(ChunkedUploadDataStreamTest, AppendOnceBeforeInit) {
TEST(ChunkedUploadDataStreamTest, MultipleAppends) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size());
EXPECT_EQ(0u, stream.position());
@@ -114,7 +119,7 @@ TEST(ChunkedUploadDataStreamTest, MultipleAppends) {
int bytes_read = stream.Read(buf.get(),
kTestBufferSize,
callback.callback());
- ASSERT_EQ(ERR_IO_PENDING, bytes_read);
+ ASSERT_THAT(bytes_read, IsError(ERR_IO_PENDING));
stream.AppendData(&kTestData[i], 1, i == kTestDataSize - 1);
ASSERT_EQ(1, callback.WaitForResult());
EXPECT_EQ(kTestData[i], buf->data()[0]);
@@ -128,7 +133,7 @@ TEST(ChunkedUploadDataStreamTest, MultipleAppends) {
TEST(ChunkedUploadDataStreamTest, MultipleAppendsBetweenReads) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -157,7 +162,7 @@ TEST(ChunkedUploadDataStreamTest, MultipleAppendsBeforeInit) {
stream.AppendData(kTestData + 1, 1, false);
stream.AppendData(kTestData + 2, kTestDataSize - 2, true);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -179,7 +184,7 @@ TEST(ChunkedUploadDataStreamTest, MultipleReads) {
stream.AppendData(kTestData, kTestDataSize, false);
stream.AppendData(kTestData, kTestDataSize, true);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -209,7 +214,7 @@ TEST(ChunkedUploadDataStreamTest, MultipleReads) {
TEST(ChunkedUploadDataStreamTest, EmptyUpload) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -218,7 +223,7 @@ TEST(ChunkedUploadDataStreamTest, EmptyUpload) {
TestCompletionCallback callback;
scoped_refptr<IOBuffer> buf = new IOBuffer(kTestBufferSize);
int result = stream.Read(buf.get(), kTestBufferSize, callback.callback());
- ASSERT_EQ(ERR_IO_PENDING, result);
+ ASSERT_THAT(result, IsError(ERR_IO_PENDING));
stream.AppendData(NULL, 0, true);
int read = callback.WaitForResult();
@@ -231,7 +236,7 @@ TEST(ChunkedUploadDataStreamTest, EmptyUploadEndedBeforeInit) {
ChunkedUploadDataStream stream(0);
stream.AppendData(NULL, 0, true);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -248,7 +253,7 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) {
stream.AppendData(kTestData, 1, false);
stream.AppendData(kTestData + 1, kTestDataSize - 1, true);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -260,7 +265,7 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) {
ASSERT_TRUE(stream.IsEOF());
// Rewind stream and repeat.
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -275,7 +280,7 @@ TEST(ChunkedUploadDataStreamTest, RewindAfterComplete) {
TEST(ChunkedUploadDataStreamTest, RewindWhileReading) {
ChunkedUploadDataStream stream(0);
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -284,9 +289,9 @@ TEST(ChunkedUploadDataStreamTest, RewindWhileReading) {
TestCompletionCallback callback;
scoped_refptr<IOBuffer> buf = new IOBuffer(kTestBufferSize);
int result = stream.Read(buf.get(), kTestBufferSize, callback.callback());
- ASSERT_EQ(ERR_IO_PENDING, result);
+ ASSERT_THAT(result, IsError(ERR_IO_PENDING));
- ASSERT_EQ(OK, stream.Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream.Init(TestCompletionCallback().callback()), IsOk());
EXPECT_FALSE(stream.IsInMemory());
EXPECT_EQ(0u, stream.size()); // Content-Length is 0 for chunked data.
EXPECT_EQ(0u, stream.position());
@@ -314,7 +319,7 @@ TEST(ChunkedUploadDataStreamTest, ChunkedUploadDataStreamWriter) {
// Write before Init.
ASSERT_TRUE(writer->AppendData(kTestData, 1, false));
- ASSERT_EQ(OK, stream->Init(TestCompletionCallback().callback()));
+ ASSERT_THAT(stream->Init(TestCompletionCallback().callback()), IsOk());
// Write after Init.
ASSERT_TRUE(writer->AppendData(kTestData + 1, kTestDataSize - 1, false));
« no previous file with comments | « no previous file | net/base/directory_lister_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698