From 125845553bfa25ef86b059d01254148cae708b59 Mon Sep 17 00:00:00 2001 From: fmalita Date: Mon, 18 Jul 2016 14:47:29 -0700 Subject: [SkXMLParser] Initial text node support Also disable entity processing. R=bungeman@google.com,robertphillips@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154853002 Review-Url: https://codereview.chromium.org/2154853002 --- tests/SkDOMTest.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'tests/SkDOMTest.cpp') diff --git a/tests/SkDOMTest.cpp b/tests/SkDOMTest.cpp index a7fbda7f21..6ea4e78974 100644 --- a/tests/SkDOMTest.cpp +++ b/tests/SkDOMTest.cpp @@ -12,14 +12,26 @@ #include "SkDOM.h" +static const SkDOM::Node* check_node(skiatest::Reporter* r, const SkDOM& dom, + const SkDOM::Node* node, const char* expectedName, + SkDOM::Type expectedType) { + REPORTER_ASSERT(r, node); + if (node) { + REPORTER_ASSERT(r, !strcmp(dom.getName(node), expectedName)); + REPORTER_ASSERT(r, dom.getType(node) == expectedType); + } + return node; +} + DEF_TEST(SkDOM_test, r) { static const char gDoc[] = "" "" "" "" - "" + "Some text." "" + "Some more text." "" "" "" @@ -42,6 +54,33 @@ DEF_TEST(SkDOM_test, r) { REPORTER_ASSERT(r, dom.getFirstChild(root, "elem1")); REPORTER_ASSERT(r, !dom.getFirstChild(root, "subelem1")); + + { + const auto* elem1 = check_node(r, dom, dom.getFirstChild(root), + "elem1", SkDOM::kElement_Type); + const auto* elem2 = check_node(r, dom, dom.getNextSibling(elem1), + "elem2", SkDOM::kElement_Type); + const auto* elem3 = check_node(r, dom, dom.getNextSibling(elem2), + "elem3", SkDOM::kElement_Type); + { + const auto* subelem1 = check_node(r, dom, dom.getFirstChild(elem3), + "subelem1", SkDOM::kElement_Type); + { + check_node(r, dom, dom.getFirstChild(subelem1), + "Some text.", SkDOM::kText_Type); + } + const auto* subelem2 = check_node(r, dom, dom.getNextSibling(subelem1), + "subelem2", SkDOM::kElement_Type); + const auto* subelem3 = check_node(r, dom, dom.getNextSibling(subelem2), + "subelem3", SkDOM::kElement_Type); + { + check_node(r, dom, dom.getFirstChild(subelem3), + "Some more text.", SkDOM::kText_Type); + } + } + check_node(r, dom, dom.getNextSibling(elem3), + "elem4", SkDOM::kElement_Type); + } } #endif // SK_XML -- cgit v1.2.3