From 5ff56a6d68ce6fbab0980232d95b5d190e2ecdcf Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 9 May 2010 20:37:49 +0000 Subject: Removed document order optimization (it helps on a tiny percentage of queries), XPath tests now compute their own order git-svn-id: http://pugixml.googlecode.com/svn/trunk@400 99668b35-9821-0410-8761-19e4c4f06640 --- tests/test_xpath_api.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'tests/test_xpath_api.cpp') diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp index d7cc094..453220d 100644 --- a/tests/test_xpath_api.cpp +++ b/tests/test_xpath_api.cpp @@ -8,28 +8,24 @@ TEST_XML(xpath_api_select_nodes, "") { - doc.precompute_document_order(); - xpath_node_set ns1 = doc.select_nodes(STR("node/foo")); xpath_query q(STR("node/foo")); xpath_node_set ns2 = doc.select_nodes(q); - CHECK(ns1.size() == 2 && ns1[0].node().document_order() == 4 && ns1[1].node().document_order() == 5); - CHECK(ns2.size() == 2 && ns2[0].node().document_order() == 4 && ns2[1].node().document_order() == 5); + xpath_node_set_tester(ns1, "ns1") % 4 % 5; + xpath_node_set_tester(ns2, "ns2") % 4 % 5; } -TEST_XML(xpath_api_select_single_node, "") +TEST_XML(xpath_api_select_single_node, "") { - doc.precompute_document_order(); - xpath_node n1 = doc.select_single_node(STR("node/foo")); xpath_query q(STR("node/foo")); xpath_node n2 = doc.select_single_node(q); - CHECK(n1.node().document_order() == 4); - CHECK(n2.node().document_order() == 4); + CHECK(n1.node().attribute(STR("id")).as_int() == 1); + CHECK(n2.node().attribute(STR("id")).as_int() == 1); xpath_node n3 = doc.select_single_node(STR("node/bar")); @@ -38,8 +34,8 @@ TEST_XML(xpath_api_select_single_node, "" xpath_node n4 = doc.select_single_node(STR("node/head/following-sibling::foo")); xpath_node n5 = doc.select_single_node(STR("node/tail/preceding-sibling::foo")); - CHECK(n4.node().document_order() == 4); - CHECK(n5.node().document_order() == 4); + CHECK(n4.node().attribute(STR("id")).as_int() == 1); + CHECK(n5.node().attribute(STR("id")).as_int() == 1); } TEST(xpath_api_exception_what) -- cgit v1.2.3