Escape single quotes in aapt2
Using #normalizeForOutput to normalize a string for output in order
to escape some special char.
Fix: 140373430
Test: atest libaapt_tests aapt2_tests
Change-Id: Ic49dbaaccd8e4b1c51a87de9f0e2e5f4a8da7d3d
diff --git a/tools/aapt2/xml/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp
index 6c717dc..3a2d656 100644
--- a/tools/aapt2/xml/XmlDom_test.cpp
+++ b/tools/aapt2/xml/XmlDom_test.cpp
@@ -139,6 +139,19 @@
EXPECT_THAT(attr->value, Eq("\""));
}
+TEST(XmlDomTest, XmlEscapeSingleQuotes) {
+ std::unique_ptr<XmlResource> doc = test::BuildXmlDom(R"(
+ <foo><![CDATA[oh no' (line=1001)
+E: this-is-not-an-element (line=88)
+ T: 'blah]]></foo>)");
+
+ Element* el = doc->root.get();
+ Text* text = xml::NodeCast<xml::Text>(el->children[0].get());
+ ASSERT_THAT(text, NotNull());
+ EXPECT_THAT(text->text,
+ Eq("oh no' (line=1001)\nE: this-is-not-an-element (line=88)\n T: 'blah"));
+}
+
class TestVisitor : public PackageAwareVisitor {
public:
using PackageAwareVisitor::Visit;