diff options
Diffstat (limited to 'tools/aapt2/format/binary/XmlFlattener_test.cpp')
-rw-r--r-- | tools/aapt2/format/binary/XmlFlattener_test.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/aapt2/format/binary/XmlFlattener_test.cpp b/tools/aapt2/format/binary/XmlFlattener_test.cpp index 25786b1659e7..1dac493359e4 100644 --- a/tools/aapt2/format/binary/XmlFlattener_test.cpp +++ b/tools/aapt2/format/binary/XmlFlattener_test.cpp @@ -118,7 +118,7 @@ TEST_F(XmlFlattenerTest, FlattenXmlWithNoCompiledAttributes) { ASSERT_THAT(tree.getAttributeCount(), Eq(0u)); ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::TEXT)); - EXPECT_THAT(tree.getText(&len), StrEq(u"Some text\\")); + EXPECT_THAT(tree.getText(&len), StrEq(u"Some text\\\\")); ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); EXPECT_THAT(tree.getElementNamespace(&len), IsNull()); @@ -283,7 +283,7 @@ TEST_F(XmlFlattenerTest, ProcessEscapedStrings) { EXPECT_THAT(tree.getAttributeStringValue(idx, &len), StrEq(u"\"")); ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::TEXT)); - EXPECT_THAT(tree.getText(&len), StrEq(u"\\d{5}")); + EXPECT_THAT(tree.getText(&len), StrEq(u"\\\\d{5}")); } TEST_F(XmlFlattenerTest, ProcessQuotes) { @@ -360,6 +360,7 @@ I J </item> + <item>\t K \n </item> <item> </item> </root>)"); @@ -439,6 +440,12 @@ I ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); EXPECT_THAT(tree.getElementName(&len), StrEq(u"item")); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::TEXT)); + EXPECT_THAT(tree.getText(&len), StrEq(u"\\t K \\n ")); + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); + + ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::START_TAG)); + EXPECT_THAT(tree.getElementName(&len), StrEq(u"item")); ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); ASSERT_THAT(tree.next(), Eq(android::ResXMLTree::END_TAG)); |