[SkXMLParser] Initial text node support

tests/SkDOMTest.cpp

Index: tests/SkDOMTest.cpp
diff --git a/tests/SkDOMTest.cpp b/tests/SkDOMTest.cpp
index 34bd8dd8b3e4a47ae2991b6adde29c732270cb77..30384e83567d15df442f03ac1b6eb1ea8a880bd4 100644
--- a/tests/SkDOMTest.cpp
+++ b/tests/SkDOMTest.cpp
@@ -11,14 +11,29 @@
 
 #include "SkDOM.h"
 

[robertphillips, 2016/07/18 15:29:18]

I think we go with file static over anonymous namespace.

[f(malita), 2016/07/18 17:36:32]

Done.

+namespace {
+
+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[] =
         "<root a='1' b='2'>"
             "<elem1 c='3' />"
             "<elem2 d='4' />"
             "<elem3 e='5'>"
-                "<subelem1/>"
+                "<subelem1>Some text.</subelem1>"
                 "<subelem2 f='6' g='7'/>"
+                "<subelem3>Some more text.</subelem3>"
             "</elem3>"
             "<elem4 h='8'/>"
         "</root>"
@@ -27,7 +42,7 @@ DEF_TEST(SkDOM_test, r) {
     SkDOM   dom;
     REPORTER_ASSERT(r, !dom.getRootNode());
 
-    const SkDOM::Node* root = dom.build(gDoc, sizeof(gDoc) - 1);
+    const auto* root = dom.build(gDoc, sizeof(gDoc) - 1);
     REPORTER_ASSERT(r, root && dom.getRootNode() == root);
 
     const char* v = dom.findAttr(root, "a");
@@ -39,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