Integrated changes from unicode branch to trunk

git-svn-id: http://pugixml.googlecode.com/svn/trunk@383 99668b35-9821-0410-8761-19e4c4f06640

1 files changed, 74 insertions, 74 deletions

diff --git a/tests/test_xpath_paths_abbrev_w3c.cpp b/tests/test_xpath_paths_abbrev_w3c.cpp
index 9d4e810..7fd092c 100644
--- a/tests/test_xpath_paths_abbrev_w3c.cpp
+++ b/tests/test_xpath_paths_abbrev_w3c.cpp
@@ -7,10 +7,10 @@ TEST_XML(xpath_paths_abbrev_w3c_1, "<node><para/><foo/><para/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para");

-	CHECK_XPATH_NODESET(n, "para") % 3 % 5;

+	CHECK_XPATH_NODESET(c, STR("para"));

+	CHECK_XPATH_NODESET(n, STR("para")) % 3 % 5;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_2, "<node><para/><foo/><para/></node>")

@@ -18,10 +18,10 @@ TEST_XML(xpath_paths_abbrev_w3c_2, "<node><para/><foo/><para/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "*");

-	CHECK_XPATH_NODESET(n, "*") % 3 % 4 % 5;

+	CHECK_XPATH_NODESET(c, STR("*"));

+	CHECK_XPATH_NODESET(n, STR("*")) % 3 % 4 % 5;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_3, "<node>pcdata<child/><![CDATA[cdata]]></node>")

@@ -29,10 +29,10 @@ TEST_XML(xpath_paths_abbrev_w3c_3, "<node>pcdata<child/><![CDATA[cdata]]></node>
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "text()");

-	CHECK_XPATH_NODESET(n, "text()") % 3 % 5;

+	CHECK_XPATH_NODESET(c, STR("text()"));

+	CHECK_XPATH_NODESET(n, STR("text()")) % 3 % 5;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_4, "<node name='value' foo='bar' />")

@@ -40,10 +40,10 @@ TEST_XML(xpath_paths_abbrev_w3c_4, "<node name='value' foo='bar' />")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "@name");

-	CHECK_XPATH_NODESET(n, "@name") % 3;

+	CHECK_XPATH_NODESET(c, STR("@name"));

+	CHECK_XPATH_NODESET(n, STR("@name")) % 3;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_5, "<node name='value' foo='bar' />")

@@ -51,10 +51,10 @@ TEST_XML(xpath_paths_abbrev_w3c_5, "<node name='value' foo='bar' />")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "@*");

-	CHECK_XPATH_NODESET(n, "@*") % 3 % 4;

+	CHECK_XPATH_NODESET(c, STR("@*"));

+	CHECK_XPATH_NODESET(n, STR("@*")) % 3 % 4;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_6, "<node><para/><para/><para/><para/></node>")

@@ -62,10 +62,10 @@ TEST_XML(xpath_paths_abbrev_w3c_6, "<node><para/><para/><para/><para/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[1]");

-	CHECK_XPATH_NODESET(n, "para[1]") % 3;

+	CHECK_XPATH_NODESET(c, STR("para[1]"));

+	CHECK_XPATH_NODESET(n, STR("para[1]")) % 3;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_7, "<node><para/><para/><para/><para/></node>")

@@ -73,10 +73,10 @@ TEST_XML(xpath_paths_abbrev_w3c_7, "<node><para/><para/><para/><para/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[last()]");

-	CHECK_XPATH_NODESET(n, "para[last()]") % 6;

+	CHECK_XPATH_NODESET(c, STR("para[last()]"));

+	CHECK_XPATH_NODESET(n, STR("para[last()]")) % 6;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_8, "<node><para><para/><para/><foo><para/></foo></para><foo/><para/></node>")

@@ -85,8 +85,8 @@ TEST_XML(xpath_paths_abbrev_w3c_8, "<node><para><para/><para/><foo><para/></foo>
 

 	xml_node c;

 

-	CHECK_XPATH_NODESET(c, "*/para");

-	CHECK_XPATH_NODESET(doc, "*/para") % 3 % 9;

+	CHECK_XPATH_NODESET(c, STR("*/para"));

+	CHECK_XPATH_NODESET(doc, STR("*/para")) % 3 % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_9, "<doc><chapter/><chapter/><chapter/><chapter/><chapter><section/><section/><section/></chapter><chapter/></doc>")

@@ -94,11 +94,11 @@ TEST_XML(xpath_paths_abbrev_w3c_9, "<doc><chapter/><chapter/><chapter/><chapter/
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("doc").child("chapter");

+	xml_node n = doc.child(STR("doc")).child(STR("chapter"));

 

-	CHECK_XPATH_NODESET(c, "/doc/chapter[5]/section[2]");

-	CHECK_XPATH_NODESET(n, "/doc/chapter[5]/section[2]") % 9;

-	CHECK_XPATH_NODESET(doc, "/doc/chapter[5]/section[2]") % 9;

+	CHECK_XPATH_NODESET(c, STR("/doc/chapter[5]/section[2]"));

+	CHECK_XPATH_NODESET(n, STR("/doc/chapter[5]/section[2]")) % 9;

+	CHECK_XPATH_NODESET(doc, STR("/doc/chapter[5]/section[2]")) % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_10, "<chapter><para><para/><para/><foo><para/></foo></para><foo/><para/></chapter>")

@@ -107,8 +107,8 @@ TEST_XML(xpath_paths_abbrev_w3c_10, "<chapter><para><para/><para/><foo><para/></
 

 	xml_node c;

 

-	CHECK_XPATH_NODESET(c, "chapter//para");

-	CHECK_XPATH_NODESET(doc, "chapter//para") % 3 % 4 % 5 % 7 % 9;

+	CHECK_XPATH_NODESET(c, STR("chapter//para"));

+	CHECK_XPATH_NODESET(doc, STR("chapter//para")) % 3 % 4 % 5 % 7 % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_11, "<node><para><para/><para/><foo><para/></foo></para><foo/><para/></node>")

@@ -116,11 +116,11 @@ TEST_XML(xpath_paths_abbrev_w3c_11, "<node><para><para/><para/><foo><para/></foo
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "//para");

-	CHECK_XPATH_NODESET(n, "//para") % 3 % 4 % 5 % 7 % 9;

-	CHECK_XPATH_NODESET(n.child("para"), "//para") % 3 % 4 % 5 % 7 % 9;

+	CHECK_XPATH_NODESET(c, STR("//para"));

+	CHECK_XPATH_NODESET(n, STR("//para")) % 3 % 4 % 5 % 7 % 9;

+	CHECK_XPATH_NODESET(n.child(STR("para")), STR("//para")) % 3 % 4 % 5 % 7 % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_12, "<node><olist><item/></olist><item/><olist><olist><item/><item/></olist></olist></node>")

@@ -128,11 +128,11 @@ TEST_XML(xpath_paths_abbrev_w3c_12, "<node><olist><item/></olist><item/><olist><
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "//olist/item");

-	CHECK_XPATH_NODESET(n, "//olist/item") % 4 % 8 % 9;

-	CHECK_XPATH_NODESET(n.child("olist"), "//olist/item") % 4 % 8 % 9;

+	CHECK_XPATH_NODESET(c, STR("//olist/item"));

+	CHECK_XPATH_NODESET(n, STR("//olist/item")) % 4 % 8 % 9;

+	CHECK_XPATH_NODESET(n.child(STR("olist")), STR("//olist/item")) % 4 % 8 % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_13, "<node><child/></node>")

@@ -140,11 +140,11 @@ TEST_XML(xpath_paths_abbrev_w3c_13, "<node><child/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, ".");

-	CHECK_XPATH_NODESET(n, ".") % 2;

-	CHECK_XPATH_NODESET(n.child("child"), ".") % 3;

+	CHECK_XPATH_NODESET(c, STR("."));

+	CHECK_XPATH_NODESET(n, STR(".")) % 2;

+	CHECK_XPATH_NODESET(n.child(STR("child")), STR(".")) % 3;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_14, "<node><para><para/><para/><foo><para/></foo></para><foo/><para/></node>")

@@ -152,11 +152,11 @@ TEST_XML(xpath_paths_abbrev_w3c_14, "<node><para><para/><para/><foo><para/></foo
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, ".//para");

-	CHECK_XPATH_NODESET(n, ".//para") % 3 % 4 % 5 % 7 % 9;

-	CHECK_XPATH_NODESET(n.child("para"), ".//para") % 4 % 5 % 7;

+	CHECK_XPATH_NODESET(c, STR(".//para"));

+	CHECK_XPATH_NODESET(n, STR(".//para")) % 3 % 4 % 5 % 7 % 9;

+	CHECK_XPATH_NODESET(n.child(STR("para")), STR(".//para")) % 4 % 5 % 7;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_15, "<node lang='en'><child/></node>")

@@ -164,11 +164,11 @@ TEST_XML(xpath_paths_abbrev_w3c_15, "<node lang='en'><child/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "..");

-	CHECK_XPATH_NODESET(n, "..") % 1;

-	CHECK_XPATH_NODESET(n.child("child"), "..") % 2;

+	CHECK_XPATH_NODESET(c, STR(".."));

+	CHECK_XPATH_NODESET(n, STR("..")) % 1;

+	CHECK_XPATH_NODESET(n.child(STR("child")), STR("..")) % 2;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_16, "<node lang='en'><child/></node>")

@@ -176,11 +176,11 @@ TEST_XML(xpath_paths_abbrev_w3c_16, "<node lang='en'><child/></node>")
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "../@lang");

-	CHECK_XPATH_NODESET(n, "../@lang");

-	CHECK_XPATH_NODESET(n.child("child"), "../@lang") % 3;

+	CHECK_XPATH_NODESET(c, STR("../@lang"));

+	CHECK_XPATH_NODESET(n, STR("../@lang"));

+	CHECK_XPATH_NODESET(n.child(STR("child")), STR("../@lang")) % 3;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_17, "<node><para/><para type='warning'/><para type='warning'/><para/><para type='error'/><para type='warning'/><para type='warning'/><para type='warning'/></node>")

@@ -188,10 +188,10 @@ TEST_XML(xpath_paths_abbrev_w3c_17, "<node><para/><para type='warning'/><para ty
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[@type=\"warning\"]");

-	CHECK_XPATH_NODESET(n, "para[@type=\"warning\"]") % 4 % 6 % 11 % 13 % 15;

+	CHECK_XPATH_NODESET(c, STR("para[@type=\"warning\"]"));

+	CHECK_XPATH_NODESET(n, STR("para[@type=\"warning\"]")) % 4 % 6 % 11 % 13 % 15;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_18, "<node><para/><para type='warning'/><para type='warning'/><para/><para type='error'/><para type='warning'/><para type='warning'/><para type='warning'/></node>")

@@ -199,10 +199,10 @@ TEST_XML(xpath_paths_abbrev_w3c_18, "<node><para/><para type='warning'/><para ty
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[@type=\"warning\"][5]");

-	CHECK_XPATH_NODESET(n, "para[@type=\"warning\"][5]") % 15;

+	CHECK_XPATH_NODESET(c, STR("para[@type=\"warning\"][5]"));

+	CHECK_XPATH_NODESET(n, STR("para[@type=\"warning\"][5]")) % 15;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_19a, "<node><para/><para type='warning'/><para type='warning'/><para/><para type='error'/><para type='warning'/><para type='warning'/><para type='warning'/></node>")

@@ -210,10 +210,10 @@ TEST_XML(xpath_paths_abbrev_w3c_19a, "<node><para/><para type='warning'/><para t
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[5][@type=\"warning\"]");

-	CHECK_XPATH_NODESET(n, "para[5][@type=\"warning\"]");

+	CHECK_XPATH_NODESET(c, STR("para[5][@type=\"warning\"]"));

+	CHECK_XPATH_NODESET(n, STR("para[5][@type=\"warning\"]"));

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_19b, "<node><para/><para type='warning'/><para type='warning'/><para/><para type='warning'/><para type='warning'/><para type='warning'/></node>")

@@ -221,10 +221,10 @@ TEST_XML(xpath_paths_abbrev_w3c_19b, "<node><para/><para type='warning'/><para t
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "para[5][@type=\"warning\"]");

-	CHECK_XPATH_NODESET(n, "para[5][@type=\"warning\"]") % 9;

+	CHECK_XPATH_NODESET(c, STR("para[5][@type=\"warning\"]"));

+	CHECK_XPATH_NODESET(n, STR("para[5][@type=\"warning\"]")) % 9;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_20, "<node><chapter><title>foo</title></chapter><chapter><title>Introduction</title></chapter><chapter><title>introduction</title></chapter><chapter/><chapter><title>Introduction</title><title>foo</title></chapter></node>")

@@ -232,10 +232,10 @@ TEST_XML(xpath_paths_abbrev_w3c_20, "<node><chapter><title>foo</title></chapter>
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "chapter[title=\"Introduction\"]");

-	CHECK_XPATH_NODESET(n, "chapter[title=\"Introduction\"]") % 6 % 13;

+	CHECK_XPATH_NODESET(c, STR("chapter[title=\"Introduction\"]"));

+	CHECK_XPATH_NODESET(n, STR("chapter[title=\"Introduction\"]")) % 6 % 13;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_21, "<node><chapter><title>foo</title></chapter><chapter><title>Introduction</title></chapter><chapter><title>introduction</title></chapter><chapter/><chapter><title>Introduction</title><title>foo</title></chapter></node>")

@@ -243,10 +243,10 @@ TEST_XML(xpath_paths_abbrev_w3c_21, "<node><chapter><title>foo</title></chapter>
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "chapter[title]");

-	CHECK_XPATH_NODESET(n, "chapter[title]") % 3 % 6 % 9 % 13;

+	CHECK_XPATH_NODESET(c, STR("chapter[title]"));

+	CHECK_XPATH_NODESET(n, STR("chapter[title]")) % 3 % 6 % 9 % 13;

 }

 

 TEST_XML(xpath_paths_abbrev_w3c_22, "<node><employee/><employee secretary=''/><employee assistant=''/><employee secretary='' assistant=''/><employee assistant='' secretary=''/></node>")

@@ -254,10 +254,10 @@ TEST_XML(xpath_paths_abbrev_w3c_22, "<node><employee/><employee secretary=''/><e
 	doc.precompute_document_order();

 

 	xml_node c;

-	xml_node n = doc.child("node");

+	xml_node n = doc.child(STR("node"));

 

-	CHECK_XPATH_NODESET(c, "employee[@secretary and @assistant]");

-	CHECK_XPATH_NODESET(n, "employee[@secretary and @assistant]") % 8 % 11;

+	CHECK_XPATH_NODESET(c, STR("employee[@secretary and @assistant]"));

+	CHECK_XPATH_NODESET(n, STR("employee[@secretary and @assistant]")) % 8 % 11;

 }

 

 #endif