Index: base/files/file_path_unittest.cc |
=================================================================== |
--- base/files/file_path_unittest.cc (revision 199852) |
+++ base/files/file_path_unittest.cc (working copy) |
@@ -3,7 +3,6 @@ |
// found in the LICENSE file. |
#include "base/basictypes.h" |
-#include "base/file_util.h" |
#include "base/files/file_path.h" |
#include "base/utf_string_conversions.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -1122,32 +1121,32 @@ |
TEST_F(FilePathTest, ConstructWithNUL) { |
// Assert FPS() works. |
- ASSERT_TRUE(FPS("a\0b").length() == 3); |
+ ASSERT_EQ(3U, FPS("a\0b").length()); |
// Test constructor strips '\0' |
FilePath path(FPS("a\0b")); |
- EXPECT_TRUE(path.value().length() == 1); |
- EXPECT_EQ(path.value(), FPL("a")); |
+ EXPECT_EQ(1U, path.value().length()); |
+ EXPECT_EQ(FPL("a"), path.value()); |
} |
TEST_F(FilePathTest, AppendWithNUL) { |
// Assert FPS() works. |
- ASSERT_TRUE(FPS("b\0b").length() == 3); |
+ ASSERT_EQ(3U, FPS("b\0b").length()); |
// Test Append() strips '\0' |
FilePath path(FPL("a")); |
path = path.Append(FPS("b\0b")); |
- EXPECT_TRUE(path.value().length() == 3); |
+ EXPECT_EQ(3U, path.value().length()); |
#if defined(FILE_PATH_USES_WIN_SEPARATORS) |
- EXPECT_EQ(path.value(), FPL("a\\b")); |
+ EXPECT_EQ(FPL("a\\b"), path.value()); |
#else |
- EXPECT_EQ(path.value(), FPL("a/b")); |
+ EXPECT_EQ(FPL("a/b"), path.value()); |
#endif |
} |
TEST_F(FilePathTest, ReferencesParentWithNUL) { |
// Assert FPS() works. |
- ASSERT_TRUE(FPS("..\0").length() == 3); |
+ ASSERT_EQ(3U, FPS("..\0").length()); |
// Test ReferencesParent() doesn't break with "..\0" |
FilePath path(FPS("..\0")); |