Index: core/fxcrt/fx_basic_bstring_unittest.cpp |
diff --git a/core/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp |
index fe98b53b45947caddd58821a668c64ba1d24e3c6..23424c38a6c2935151f2ecfdde48e4cdf9e19e64 100644 |
--- a/core/fxcrt/fx_basic_bstring_unittest.cpp |
+++ b/core/fxcrt/fx_basic_bstring_unittest.cpp |
@@ -264,20 +264,20 @@ TEST(fxcrt, ByteStringCNull) { |
EXPECT_TRUE(copied_null_string.IsEmpty()); |
EXPECT_EQ(null_string, copied_null_string); |
- CFX_ByteStringC empty_string(""); // Pointer to NUL, not NULL pointer. |
+ CFX_ByteStringC empty_string(""); // Pointer to NUL, not nullptr pointer. |
Tom Sepez
2016/06/02 20:09:49
ditto for comment.
Lei Zhang
2016/06/07 07:33:23
Done.
|
EXPECT_NE(empty_string.raw_str(), nullptr); |
EXPECT_EQ(empty_string.GetLength(), 0); |
EXPECT_TRUE(empty_string.IsEmpty()); |
EXPECT_EQ(null_string, empty_string); |
- CFX_ByteStringC assigned_null_string("initially not NULL"); |
+ CFX_ByteStringC assigned_null_string("initially not nullptr"); |
assigned_null_string = null_string; |
EXPECT_EQ(assigned_null_string.raw_str(), nullptr); |
EXPECT_EQ(assigned_null_string.GetLength(), 0); |
EXPECT_TRUE(assigned_null_string.IsEmpty()); |
EXPECT_EQ(null_string, assigned_null_string); |
- CFX_ByteStringC assigned_nullptr_string("initially not NULL"); |
+ CFX_ByteStringC assigned_nullptr_string("initially not nullptr"); |
assigned_nullptr_string = (const FX_CHAR*)nullptr; |
EXPECT_EQ(assigned_nullptr_string.raw_str(), nullptr); |
EXPECT_EQ(assigned_nullptr_string.GetLength(), 0); |
@@ -758,7 +758,7 @@ TEST(fxcrt, ByteStringCFromChar) { |
CFX_ByteStringC nul_string_from_char(nul); |
CFX_ByteStringC lower_a_string_from_char(lower_a); |
- // Pointer to nul, not NULL ptr, hence length 1 ... |
+ // Pointer to nul, not nullptr ptr, hence length 1 ... |
Tom Sepez
2016/06/02 20:09:49
ditto
Lei Zhang
2016/06/07 07:33:23
Done.
|
EXPECT_EQ(1, nul_string_from_char.GetLength()); |
EXPECT_NE(null_string, nul_string_from_char); |