diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2018-04-24 17:25:28 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-24 17:25:28 +0000 |
commit | 8a95c22dd5d4f7d4e730370c761f41298ba98bf2 (patch) | |
tree | 61e7be2078661f891567cbae6b7d625f3822db4b /core/fxcrt/xml/cfx_xmlparser_unittest.cpp | |
parent | 273c598ef5e7e9ee210a8e6645b3a83b9f21a1da (diff) | |
download | pdfium-8a95c22dd5d4f7d4e730370c761f41298ba98bf2.tar.xz |
Cleanup CFX_XMLParser entity conversion
This CL converts the CFX_XMLParser to use the FXSYS methods to convert
decimal and hex chars during entity conversion.
Change-Id: I7f6c83fc528e95c9f4c2bcdb04f0066da2c15c09
Reviewed-on: https://pdfium-review.googlesource.com/31274
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcrt/xml/cfx_xmlparser_unittest.cpp')
-rw-r--r-- | core/fxcrt/xml/cfx_xmlparser_unittest.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp index badac2c532..0b51c6b88c 100644 --- a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp @@ -429,11 +429,18 @@ TEST(CFX_XMLParserTest, CommentTwoDash) { TEST(CFX_XMLParserTest, Entities) { const char* input = "<script contentType=\"application/x-javascript\">" - "B" - "T" - "H" - "ꭈ" + "B" // B + "T" // T + "j" // j + "H" // H + "ꭈ" // \xab48 "�" + "&" + "<" + ">" + "'" + """ + "&something_else;" "</script>"; auto stream = MakeProxy(input); @@ -451,7 +458,7 @@ TEST(CFX_XMLParserTest, Entities) { ASSERT_EQ(FX_XmlSyntaxResult::ElementBreak, parser.DoSyntaxParse()); ASSERT_EQ(FX_XmlSyntaxResult::Text, parser.DoSyntaxParse()); - ASSERT_EQ(L"BTH\xab48", parser.GetTextData()); + ASSERT_EQ(L"BTjH\xab48&<>'\"", parser.GetTextData()); ASSERT_EQ(FX_XmlSyntaxResult::ElementClose, parser.DoSyntaxParse()); ASSERT_EQ(L"script", parser.GetTextData()); |