diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-04 14:03:25 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-04 14:03:25 -0700 |
| commit | 447e2beb38d5bd8b71b1ddc3df448559dbd588af (patch) | |
| tree | 77f07888919dedcb9c4a9e4709bb88746ba61768 /core/src/fxcrt/fx_basic_bstring_unittest.cpp | |
| parent | e09556b4e9049a6e46789d31da5eb0c203dd8580 (diff) | |
| download | pdfium-447e2beb38d5bd8b71b1ddc3df448559dbd588af.tar.xz | |
Fix issuse with != and == shown by fx_basic_bstring unit tests.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1125703004
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring_unittest.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_bstring_unittest.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp index 7259c97b1f..9f37cbcf19 100644 --- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp @@ -83,11 +83,7 @@ TEST(fxcrt, ByteStringOperatorEQ) { const char* c_string_same1 = "hello"; ASSERT_TRUE(byte_string == c_string_same1); -#if 0 - // TODO(tsepez): See, you don't want implicit c_str() casting. - // This degrades to a pointer comparision, which flunks. ASSERT_TRUE(c_string_same1 == byte_string); -#endif const char* c_string1 = "he"; const char* c_string2 = "hellp"; @@ -138,10 +134,8 @@ TEST(fxcrt, ByteStringOperatorNE) { const char* c_string_same1 = "hello"; ASSERT_FALSE(byte_string != c_string_same1); -#if 0 - // See above TODO. ASSERT_FALSE(c_string_same1 != byte_string); -#endif + const char* c_string1 = "he"; const char* c_string2 = "hellp"; const char* c_string3 = "hellod"; @@ -415,10 +409,7 @@ TEST(fxcrt, ByteStringCOperatorEQ) { const char* c_string_same1 = "hello"; ASSERT_TRUE(byte_string_c == c_string_same1); -#if 0 - // TODO(tsepez): missing operator (but no implicit cast to c_str). ASSERT_TRUE(c_string_same1 == byte_string_c); -#endif const char* c_string1 = "he"; const char* c_string2 = "hellp"; @@ -426,12 +417,10 @@ TEST(fxcrt, ByteStringCOperatorEQ) { ASSERT_FALSE(byte_string_c == c_string1); ASSERT_FALSE(byte_string_c == c_string2); ASSERT_FALSE(byte_string_c == c_string3); -#if 0 - // See above TODO. + ASSERT_FALSE(c_string1 == byte_string_c); ASSERT_FALSE(c_string2 == byte_string_c); ASSERT_FALSE(c_string3 == byte_string_c); -#endif } TEST(fxcrt, ByteStringCOperatorNE) { @@ -472,10 +461,7 @@ TEST(fxcrt, ByteStringCOperatorNE) { const char* c_string_same1 = "hello"; ASSERT_FALSE(byte_string_c != c_string_same1); -#if 0 - // TODO(tsepez): missing operator (but no implicit cast to c_str). ASSERT_FALSE(c_string_same1 != byte_string_c); -#endif const char* c_string1 = "he"; const char* c_string2 = "hellp"; @@ -483,10 +469,8 @@ TEST(fxcrt, ByteStringCOperatorNE) { ASSERT_TRUE(byte_string_c != c_string1); ASSERT_TRUE(byte_string_c != c_string2); ASSERT_TRUE(byte_string_c != c_string3); -#if 0 - // See above TODO. + ASSERT_TRUE(c_string1 != byte_string_c); ASSERT_TRUE(c_string2 != byte_string_c); ASSERT_TRUE(c_string3 != byte_string_c); -#endif } |