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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/file_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 | « net/base/elements_upload_data_stream_unittest.cc ('k') | net/base/static_cookie_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/file_stream_unittest.cc
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index 6a41d4e7d1c5e1ee2dfb0a1da423012526a8b6b2..76099294fca46c030b64698b5aef6107bac0df02 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -24,9 +24,14 @@
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "net/log/test_net_log.h"
+#include "net/test/gtest_util.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;
+
#if defined(OS_ANDROID)
#include "base/test/test_file_util.h"
#endif
@@ -79,11 +84,11 @@ TEST_F(FileStreamTest, OpenExplicitClose) {
base::File::FLAG_READ |
base::File::FLAG_ASYNC;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_TRUE(stream.IsOpen());
- EXPECT_EQ(ERR_IO_PENDING, stream.Close(callback.callback()));
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(stream.Close(callback.callback()), IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_FALSE(stream.IsOpen());
}
@@ -94,10 +99,10 @@ TEST_F(FileStreamTest, OpenExplicitCloseOrphaned) {
int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
base::File::FLAG_ASYNC;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
EXPECT_TRUE(stream->IsOpen());
- EXPECT_EQ(ERR_IO_PENDING, stream->Close(callback.callback()));
+ EXPECT_THAT(stream->Close(callback.callback()), IsError(ERR_IO_PENDING));
stream.reset();
// File isn't actually closed yet.
base::RunLoop runloop;
@@ -120,7 +125,8 @@ TEST_F(FileStreamTest, UseFileHandle) {
// Seek to the beginning of the file and read.
std::unique_ptr<FileStream> read_stream(
new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
- ASSERT_EQ(ERR_IO_PENDING, read_stream->Seek(0, callback64.callback()));
+ ASSERT_THAT(read_stream->Seek(0, callback64.callback()),
+ IsError(ERR_IO_PENDING));
ASSERT_EQ(0, callback64.WaitForResult());
// Read into buffer and compare.
scoped_refptr<IOBufferWithSize> read_buffer =
@@ -138,7 +144,8 @@ TEST_F(FileStreamTest, UseFileHandle) {
std::unique_ptr<FileStream> write_stream(
new FileStream(std::move(file), base::ThreadTaskRunnerHandle::Get()));
- ASSERT_EQ(ERR_IO_PENDING, write_stream->Seek(0, callback64.callback()));
+ ASSERT_THAT(write_stream->Seek(0, callback64.callback()),
+ IsError(ERR_IO_PENDING));
ASSERT_EQ(0, callback64.WaitForResult());
scoped_refptr<IOBufferWithSize> write_buffer = CreateTestDataBuffer();
rv = write_stream->Write(write_buffer.get(), kTestDataSize,
@@ -164,12 +171,12 @@ TEST_F(FileStreamTest, UseClosedStream) {
// Try seeking...
rv = stream.Seek(5, callback64.callback());
- EXPECT_EQ(ERR_UNEXPECTED, callback64.GetResult(rv));
+ EXPECT_THAT(callback64.GetResult(rv), IsError(ERR_UNEXPECTED));
// Try reading...
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(10);
rv = stream.Read(buf.get(), buf->size(), callback.callback());
- EXPECT_EQ(ERR_UNEXPECTED, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsError(ERR_UNEXPECTED));
}
TEST_F(FileStreamTest, Read) {
@@ -181,7 +188,7 @@ TEST_F(FileStreamTest, Read) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
int total_bytes_read = 0;
@@ -210,14 +217,14 @@ TEST_F(FileStreamTest, Read_EarlyDelete) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
scoped_refptr<IOBufferWithSize> buf = new IOBufferWithSize(4);
rv = stream->Read(buf.get(), buf->size(), callback.callback());
stream.reset(); // Delete instead of closing it.
if (rv < 0) {
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The callback should not be called if the request is cancelled.
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(callback.have_result());
@@ -235,13 +242,13 @@ TEST_F(FileStreamTest, Read_FromOffset) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
TestInt64CompletionCallback callback64;
const int64_t kOffset = 3;
rv = stream.Seek(kOffset, callback64.callback());
- ASSERT_EQ(ERR_IO_PENDING, rv);
+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
int64_t new_offset = callback64.WaitForResult();
EXPECT_EQ(kOffset, new_offset);
@@ -269,7 +276,7 @@ TEST_F(FileStreamTest, Write) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
int64_t file_size;
EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
@@ -295,8 +302,8 @@ TEST_F(FileStreamTest, Write_EarlyDelete) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
int64_t file_size;
EXPECT_TRUE(base::GetFileSize(temp_file_path(), &file_size));
@@ -306,7 +313,7 @@ TEST_F(FileStreamTest, Write_EarlyDelete) {
rv = stream->Write(buf.get(), buf->size(), callback.callback());
stream.reset();
if (rv < 0) {
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// The callback should not be called if the request is cancelled.
base::RunLoop().RunUntilIdle();
EXPECT_FALSE(callback.have_result());
@@ -325,13 +332,13 @@ TEST_F(FileStreamTest, Write_FromOffset) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
TestInt64CompletionCallback callback64;
const int64_t kOffset = kTestDataSize;
rv = stream.Seek(kOffset, callback64.callback());
- ASSERT_EQ(ERR_IO_PENDING, rv);
+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
int64_t new_offset = callback64.WaitForResult();
EXPECT_EQ(kTestDataSize, new_offset);
@@ -365,8 +372,8 @@ TEST_F(FileStreamTest, BasicReadWrite) {
base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
int64_t total_bytes_read = 0;
@@ -418,12 +425,12 @@ TEST_F(FileStreamTest, BasicWriteRead) {
base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream->Open(temp_file_path(), flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
TestInt64CompletionCallback callback64;
rv = stream->Seek(file_size, callback64.callback());
- ASSERT_EQ(ERR_IO_PENDING, rv);
+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
int64_t offset = callback64.WaitForResult();
EXPECT_EQ(offset, file_size);
@@ -447,7 +454,7 @@ TEST_F(FileStreamTest, BasicWriteRead) {
EXPECT_EQ(kTestDataSize, total_bytes_written);
rv = stream->Seek(0, callback64.callback());
- ASSERT_EQ(ERR_IO_PENDING, rv);
+ ASSERT_THAT(rv, IsError(ERR_IO_PENDING));
offset = callback64.WaitForResult();
EXPECT_EQ(0, offset);
@@ -549,7 +556,8 @@ class TestWriteReadCompletionCallback {
*data_read_ += data_read;
} else { // We're done writing all data. Start reading the data.
TestInt64CompletionCallback callback64;
- EXPECT_EQ(ERR_IO_PENDING, stream_->Seek(0, callback64.callback()));
+ EXPECT_THAT(stream_->Seek(0, callback64.callback()),
+ IsError(ERR_IO_PENDING));
{
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
@@ -587,11 +595,12 @@ TEST_F(FileStreamTest, WriteRead) {
base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback open_callback;
int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, open_callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(open_callback.WaitForResult(), IsOk());
TestInt64CompletionCallback callback64;
- EXPECT_EQ(ERR_IO_PENDING, stream->Seek(file_size, callback64.callback()));
+ EXPECT_THAT(stream->Seek(file_size, callback64.callback()),
+ IsError(ERR_IO_PENDING));
EXPECT_EQ(file_size, callback64.WaitForResult());
int total_bytes_written = 0;
@@ -693,11 +702,12 @@ TEST_F(FileStreamTest, WriteClose) {
base::File::FLAG_WRITE | base::File::FLAG_ASYNC;
TestCompletionCallback open_callback;
int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, open_callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(open_callback.WaitForResult(), IsOk());
TestInt64CompletionCallback callback64;
- EXPECT_EQ(ERR_IO_PENDING, stream->Seek(file_size, callback64.callback()));
+ EXPECT_THAT(stream->Seek(file_size, callback64.callback()),
+ IsError(ERR_IO_PENDING));
EXPECT_EQ(file_size, callback64.WaitForResult());
int total_bytes_written = 0;
@@ -725,7 +735,7 @@ TEST_F(FileStreamTest, OpenAndDelete) {
base::File::FLAG_ASYNC;
TestCompletionCallback open_callback;
int rv = stream->Open(temp_file_path(), flags, open_callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Delete the stream without waiting for the open operation to be
// complete. Should be safe.
@@ -735,7 +745,7 @@ TEST_F(FileStreamTest, OpenAndDelete) {
std::unique_ptr<FileStream> stream2(new FileStream(pool_owner.pool()));
TestCompletionCallback open_callback2;
rv = stream2->Open(temp_file_path(), flags, open_callback2.callback());
- EXPECT_EQ(OK, open_callback2.GetResult(rv));
+ EXPECT_THAT(open_callback2.GetResult(rv), IsOk());
stream2.reset();
// open_callback won't be called.
@@ -816,8 +826,8 @@ TEST_F(FileStreamTest, ContentUriRead) {
base::File::FLAG_ASYNC;
TestCompletionCallback callback;
int rv = stream.Open(path, flags, callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
- EXPECT_EQ(OK, callback.WaitForResult());
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
+ EXPECT_THAT(callback.WaitForResult(), IsOk());
int total_bytes_read = 0;
« no previous file with comments | « net/base/elements_upload_data_stream_unittest.cc ('k') | net/base/static_cookie_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698