diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-21 03:33:37 +0000 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-10-21 03:33:37 +0000 |
| commit | 7774cdd96e01b2d89be16f7e240c1ffb2436b4c9 (patch) | |
| tree | fa4da5ddba8a0553fcf4d4569694a372d0e46d2f /tests/test_xpath_paths.cpp | |
| parent | 45b6315d995d70bc117b2ee7320112e54050463c (diff) | |
XPath: Make sure step_push is called with valid nodes
Some steps relied on step_push rejecting null inputs; this is no longer
the case. Additionally stepping now more rigorously filters null inputs.
git-svn-id: https://pugixml.googlecode.com/svn/trunk@1069 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'tests/test_xpath_paths.cpp')
| -rw-r--r-- | tests/test_xpath_paths.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/test_xpath_paths.cpp b/tests/test_xpath_paths.cpp index d791cdf..f1d52ad 100644 --- a/tests/test_xpath_paths.cpp +++ b/tests/test_xpath_paths.cpp @@ -616,4 +616,27 @@ TEST_XML(xpath_paths_optimize_step_once, "<node><para1><para2/><para3/><para4><p CHECK_XPATH_BOOLEAN(doc, STR("//@attr5/following::para6"), true); CHECK_XPATH_STRING(doc, STR("name(//@attr5/following::para6)"), STR("para6")); } + +TEST_XML(xpath_paths_null_nodeset_entries, "<node attr='value'/>") +{ + xpath_node nodes[] = + { + xpath_node(doc.first_child()), + xpath_node(xml_node()), + xpath_node(doc.first_child().first_attribute(), doc.first_child()), + xpath_node(xml_attribute(), doc.first_child()), + xpath_node(xml_attribute(), xml_node()), + }; + + xpath_node_set ns(nodes, nodes + sizeof(nodes) / sizeof(nodes[0])); + + xpath_variable_set vars; + vars.set(STR("x"), ns); + + xpath_node_set rs = xpath_query("$x/.", &vars).evaluate_node_set(xml_node()); + + CHECK(rs.size() == 2); + CHECK(rs[0] == nodes[0]); + CHECK(rs[1] == nodes[2]); +} #endif |