diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
| commit | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (patch) | |
| tree | 5641a4bc6eddaa8069904c29c3e3897043411646 /core/src/fxcrt/fx_basic_wstring_unittest.cpp | |
| parent | f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (diff) | |
| download | pdfium-d983b09c3ae29a97cba8e9ec9c6351545f6087ee.tar.xz | |
Merge to XFA: Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
(cherry picked from commit 1956a174020686f91cd3b34294e91f4560fe45aa)
Review URL: https://codereview.chromium.org/1526823002 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring_unittest.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring_unittest.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp index 74410ddda3..64d694c436 100644 --- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp @@ -276,19 +276,17 @@ TEST(fxcrt, WideStringConcatInPlace) { EXPECT_EQ(L"xxxxxx", not_aliased); } -#define ByteStringLiteral(str) CFX_ByteString(FX_BSTRC(str)) - TEST(fxcrt, WideStringUTF16LE_Encode) { struct UTF16LEEncodeCase { CFX_WideString ws; CFX_ByteString bs; } utf16le_encode_cases[] = { - {L"", ByteStringLiteral("\0\0")}, - {L"abc", ByteStringLiteral("a\0b\0c\0\0\0")}, - {L"abcdef", ByteStringLiteral("a\0b\0c\0d\0e\0f\0\0\0")}, - {L"abc\0def", ByteStringLiteral("a\0b\0c\0\0\0")}, - {L"\xaabb\xccdd", ByteStringLiteral("\xbb\xaa\xdd\xcc\0\0")}, - {L"\x3132\x6162", ByteStringLiteral("\x32\x31\x62\x61\0\0")}, + {L"", CFX_ByteString("\0\0", 2)}, + {L"abc", CFX_ByteString("a\0b\0c\0\0\0", 8)}, + {L"abcdef", CFX_ByteString("a\0b\0c\0d\0e\0f\0\0\0", 14)}, + {L"abc\0def", CFX_ByteString("a\0b\0c\0\0\0", 8)}, + {L"\xaabb\xccdd", CFX_ByteString("\xbb\xaa\xdd\xcc\0\0", 6)}, + {L"\x3132\x6162", CFX_ByteString("\x32\x31\x62\x61\0\0", 6)}, }; for (size_t i = 0; i < FX_ArraySize(utf16le_encode_cases); ++i) { |