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

Unified Diff: base/file_util_unittest.cc

Issue 254333002: Make base::ReadFileToString() return false on I/O error. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix EXPECT_EQ() parameter order. Created 6 years, 8 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 | « base/file_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_util_unittest.cc
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 0d793918d681fafeaa2e52a289cd4ebbb8a7e94d..9acdf3e3b969a4f73700104e5cbb758af7b345f1 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -2012,7 +2012,12 @@ TEST_F(FileUtilTest, ReadFileToString) {
FilePath file_path =
temp_dir_.path().Append(FILE_PATH_LITERAL("ReadFileToStringTest"));
+ FilePath file_path_dangerous =
+ temp_dir_.path().Append(FILE_PATH_LITERAL("..")).
+ Append(temp_dir_.path().BaseName()).
+ Append(FILE_PATH_LITERAL("ReadFileToStringTest"));
+ // Create test file.
ASSERT_EQ(4, WriteFile(file_path, kTestData, 4));
EXPECT_TRUE(ReadFileToString(file_path, &data));
@@ -2020,7 +2025,7 @@ TEST_F(FileUtilTest, ReadFileToString) {
data = "temp";
EXPECT_FALSE(ReadFileToString(file_path, &data, 0));
- EXPECT_EQ(data.length(), 0u);
+ EXPECT_EQ(0u, data.length());
data = "temp";
EXPECT_FALSE(ReadFileToString(file_path, &data, 2));
@@ -2042,15 +2047,20 @@ TEST_F(FileUtilTest, ReadFileToString) {
EXPECT_TRUE(ReadFileToString(file_path, NULL));
+ data = "temp";
+ EXPECT_FALSE(ReadFileToString(file_path_dangerous, &data));
+ EXPECT_EQ(0u, data.length());
+
+ // Delete test file.
EXPECT_TRUE(base::DeleteFile(file_path, false));
data = "temp";
EXPECT_FALSE(ReadFileToString(file_path, &data));
- EXPECT_EQ(data.length(), 0u);
+ EXPECT_EQ(0u, data.length());
data = "temp";
EXPECT_FALSE(ReadFileToString(file_path, &data, 6));
- EXPECT_EQ(data.length(), 0u);
+ EXPECT_EQ(0u, data.length());
}
TEST_F(FileUtilTest, TouchFile) {
« no previous file with comments | « base/file_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698