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

Unified Diff: net/base/directory_lister_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/chunked_upload_data_stream_unittest.cc ('k') | net/base/elements_upload_data_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/directory_lister_unittest.cc
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 6bb77dfb2f69530a2ac071a7321d5455fa80209f..5ccfca3ab8ab9ceb5b4694a41fc198122d88b9c3 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -16,9 +16,14 @@
#include "base/threading/thread_task_runner_handle.h"
#include "net/base/directory_lister.h"
#include "net/base/net_errors.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;
+
namespace net {
namespace {
@@ -198,7 +203,7 @@ TEST_F(DirectoryListerTest, BigDirTest) {
delegate.Run(&lister);
EXPECT_TRUE(delegate.done());
- EXPECT_EQ(OK, delegate.error());
+ EXPECT_THAT(delegate.error(), IsOk());
EXPECT_EQ(expected_list_length_non_recursive(), delegate.num_files());
}
@@ -209,7 +214,7 @@ TEST_F(DirectoryListerTest, BigDirRecursiveTest) {
delegate.Run(&lister);
EXPECT_TRUE(delegate.done());
- EXPECT_EQ(OK, delegate.error());
+ EXPECT_THAT(delegate.error(), IsOk());
EXPECT_EQ(expected_list_length_recursive(), delegate.num_files());
}
@@ -222,7 +227,7 @@ TEST_F(DirectoryListerTest, EmptyDirTest) {
delegate.Run(&lister);
EXPECT_TRUE(delegate.done());
- EXPECT_EQ(OK, delegate.error());
+ EXPECT_THAT(delegate.error(), IsOk());
// Contains only the parent directory ("..").
EXPECT_EQ(1, delegate.num_files());
}
@@ -261,7 +266,7 @@ TEST_F(DirectoryListerTest, CancelOnListDoneTest) {
delegate.Run(&lister);
EXPECT_TRUE(delegate.done());
- EXPECT_EQ(OK, delegate.error());
+ EXPECT_THAT(delegate.error(), IsOk());
EXPECT_EQ(expected_list_length_non_recursive(), delegate.num_files());
}
@@ -288,7 +293,7 @@ TEST_F(DirectoryListerTest, NoSuchDirTest) {
tempDir.path().AppendASCII("this_path_does_not_exist"), &delegate);
delegate.Run(&lister);
- EXPECT_EQ(ERR_FILE_NOT_FOUND, delegate.error());
+ EXPECT_THAT(delegate.error(), IsError(ERR_FILE_NOT_FOUND));
EXPECT_EQ(0, delegate.num_files());
}
« no previous file with comments | « net/base/chunked_upload_data_stream_unittest.cc ('k') | net/base/elements_upload_data_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698