From f542c5ebb8068ccd4f9176684eb62183afbe7e5c Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Thu, 6 May 2010 20:28:36 +0000 Subject: Integrated changes from unicode branch to trunk git-svn-id: http://pugixml.googlecode.com/svn/trunk@383 99668b35-9821-0410-8761-19e4c4f06640 --- tests/test_xpath_api.cpp | 56 +++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-) (limited to 'tests/test_xpath_api.cpp') diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp index 665e7e9..d7cc094 100644 --- a/tests/test_xpath_api.cpp +++ b/tests/test_xpath_api.cpp @@ -4,13 +4,15 @@ #include "helpers.hpp" +#include + TEST_XML(xpath_api_select_nodes, "") { doc.precompute_document_order(); - xpath_node_set ns1 = doc.select_nodes("node/foo"); + xpath_node_set ns1 = doc.select_nodes(STR("node/foo")); - xpath_query q("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); @@ -21,20 +23,20 @@ TEST_XML(xpath_api_select_single_node, "" { doc.precompute_document_order(); - xpath_node n1 = doc.select_single_node("node/foo"); + xpath_node n1 = doc.select_single_node(STR("node/foo")); - xpath_query q("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); - xpath_node n3 = doc.select_single_node("node/bar"); + xpath_node n3 = doc.select_single_node(STR("node/bar")); CHECK(!n3); - xpath_node n4 = doc.select_single_node("node/head/following-sibling::foo"); - xpath_node n5 = doc.select_single_node("node/tail/preceding-sibling::foo"); + 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); @@ -44,7 +46,7 @@ TEST(xpath_api_exception_what) { try { - xpath_query q(""); + xpath_query q(STR("")); } catch (const xpath_exception& e) { @@ -54,32 +56,32 @@ TEST(xpath_api_exception_what) TEST_XML(xpath_api_node_bool_ops, "") { - generic_bool_ops_test(doc.select_single_node("node")); - generic_bool_ops_test(doc.select_single_node("node/@attr")); + generic_bool_ops_test(doc.select_single_node(STR("node"))); + generic_bool_ops_test(doc.select_single_node(STR("node/@attr"))); } TEST_XML(xpath_api_node_eq_ops, "") { - generic_eq_ops_test(doc.select_single_node("node"), doc.select_single_node("node/@attr")); + generic_eq_ops_test(doc.select_single_node(STR("node")), doc.select_single_node(STR("node/@attr"))); } TEST_XML(xpath_api_node_accessors, "") { xpath_node null; - xpath_node node = doc.select_single_node("node"); - xpath_node attr = doc.select_single_node("node/@attr"); + xpath_node node = doc.select_single_node(STR("node")); + xpath_node attr = doc.select_single_node(STR("node/@attr")); CHECK(!null.node()); CHECK(!null.attribute()); CHECK(!null.parent()); - CHECK(node.node() == doc.child("node")); + CHECK(node.node() == doc.child(STR("node"))); CHECK(!node.attribute()); CHECK(node.parent() == doc); CHECK(!attr.node()); - CHECK(attr.attribute() == doc.child("node").attribute("attr")); - CHECK(attr.parent() == doc.child("node")); + CHECK(attr.attribute() == doc.child(STR("node")).attribute(STR("attr"))); + CHECK(attr.parent() == doc.child(STR("node"))); } inline void xpath_api_node_accessors_helper(const xpath_node_set& set) @@ -87,8 +89,8 @@ inline void xpath_api_node_accessors_helper(const xpath_node_set& set) CHECK(set.size() == 2); CHECK(set.type() == xpath_node_set::type_sorted); CHECK(!set.empty()); - CHECK_STRING(set[0].node().name(), "foo"); - CHECK_STRING(set[1].node().name(), "foo"); + CHECK_STRING(set[0].node().name(), STR("foo")); + CHECK_STRING(set[1].node().name(), STR("foo")); CHECK(!set[2]); CHECK(set.first() == set[0]); CHECK(set.begin() + 2 == set.end()); @@ -105,7 +107,7 @@ TEST_XML(xpath_api_nodeset_accessors, "") CHECK(!null.first()); CHECK(null.begin() == null.end()); - xpath_node_set set = doc.select_nodes("node/foo"); + xpath_node_set set = doc.select_nodes(STR("node/foo")); xpath_api_node_accessors_helper(set); xpath_node_set copy = set; @@ -120,21 +122,21 @@ TEST_XML(xpath_api_nodeset_accessors, "") TEST_XML(xpath_api_evaluate, "") { - xpath_query q("node/@attr"); + xpath_query q(STR("node/@attr")); CHECK(q.evaluate_boolean(doc)); CHECK(q.evaluate_number(doc) == 3); - CHECK(q.evaluate_string(doc) == "3"); + CHECK(q.evaluate_string(doc) == STR("3")); xpath_node_set ns = q.evaluate_node_set(doc); - CHECK(ns.size() == 1 && ns[0].attribute() == doc.child("node").attribute("attr")); + CHECK(ns.size() == 1 && ns[0].attribute() == doc.child(STR("node")).attribute(STR("attr"))); } TEST(xpath_api_evaluate_node_set) { try { - xpath_query q("1"); + xpath_query q(STR("1")); q.evaluate_node_set(xml_node()); } @@ -145,10 +147,10 @@ TEST(xpath_api_evaluate_node_set) TEST(xpath_api_return_type) { - CHECK(xpath_query("node").return_type() == xpath_type_node_set); - CHECK(xpath_query("1").return_type() == xpath_type_number); - CHECK(xpath_query("'s'").return_type() == xpath_type_string); - CHECK(xpath_query("true()").return_type() == xpath_type_boolean); + CHECK(xpath_query(STR("node")).return_type() == xpath_type_node_set); + CHECK(xpath_query(STR("1")).return_type() == xpath_type_number); + CHECK(xpath_query(STR("'s'")).return_type() == xpath_type_string); + CHECK(xpath_query(STR("true()")).return_type() == xpath_type_boolean); } #endif -- cgit v1.2.3