diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-03-06 15:06:49 -0800 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2019-03-06 15:06:49 -0800 |
| commit | 1d358ff5bb59f56ab19aa31d6afcf82c46b7c7bc (patch) | |
| tree | 5d06705d5d234da3899fc21c71a024e6f2592b5b /tools/aapt2/format/binary/XmlFlattener_test.cpp | |
| parent | f163c2111a72694f676f632762521376a6e80919 (diff) | |
Fix aapt2 whitespace diffs from aapt(1)
CDATA blocks were being processed differently in aapt2 so this change
fixes aapt2 to not treat cdata blocks differently and still trime
whitespace.
Also, aapt did not process escapes when compiling xml files. This
change removes over-processing of xml text nodes.
All test strings are what aapt(1) would output.
Test: aapt2_tests
Bug: 124470332
Change-Id: I90ee0c1e5e9208f8a5c60cee93e3ba02712c9b2c
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)); |