From 0a50eccd4e7c08814e7b982798b1c1346c304939 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sat, 29 May 2010 23:07:23 +0000 Subject: tests: Minor wchar_t mode fixes git-svn-id: http://pugixml.googlecode.com/svn/trunk@469 99668b35-9821-0410-8761-19e4c4f06640 --- tests/test_xpath_xalan_2.cpp | 17 ++++++++++------- tests/test_xpath_xalan_3.cpp | 6 +++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/test_xpath_xalan_2.cpp b/tests/test_xpath_xalan_2.cpp index 45b3196..13838d1 100644 --- a/tests/test_xpath_xalan_2.cpp +++ b/tests/test_xpath_xalan_2.cpp @@ -4,8 +4,6 @@ #include "common.hpp" -#include - #include TEST_XML(xpath_xalan_string_1, "ENCYCLOPEDIA") @@ -133,17 +131,22 @@ TEST_XML(xpath_xalan_string_4, "abcdef number_to_string(int number) { - char buf[128]; - sprintf(buf, "%d", number); + std::basic_string result; + + while (number) + { + result = static_cast('0' + number % 10) + result; + number /= 10; + } - return std::basic_string(buf, buf + strlen(buf)); + return result; } TEST(xpath_xalan_string_5) { std::basic_string query = STR("concat("); - for (int i = 0; i < 1000; ++i) + for (int i = 1; i < 1000; ++i) { query += STR("concat('t',"); query += number_to_string(i); @@ -154,7 +157,7 @@ TEST(xpath_xalan_string_5) std::basic_string expected; - for (int j = 0; j < 1000; ++j) + for (int j = 1; j < 1000; ++j) { expected += STR("t"); expected += number_to_string(j); diff --git a/tests/test_xpath_xalan_3.cpp b/tests/test_xpath_xalan_3.cpp index cd20188..d1be803 100644 --- a/tests/test_xpath_xalan_3.cpp +++ b/tests/test_xpath_xalan_3.cpp @@ -206,7 +206,7 @@ TEST_XML(xpath_xalan_axes_9, "") { - xml_node baz = doc.child("doc").child("baz"); + xml_node baz = doc.child(STR("doc")).child(STR("baz")); CHECK_XPATH_NODESET(baz, STR("preceding-sibling::foo[1]/@att1")) % 8; CHECK_XPATH_NODESET(baz, STR("(preceding-sibling::foo)[1]/@att1")) % 4; @@ -222,7 +222,7 @@ TEST_XML(xpath_xalan_axes_10, "
helloahoy
goodbyesayonaraadios
alohaA3b-1A3b-2shalom
") { - xml_node chapter = doc.child("chapter"); + xml_node chapter = doc.child(STR("chapter")); CHECK_XPATH_NUMBER(doc, STR("count(//@*)"), 16); CHECK_XPATH_NUMBER(doc, STR("count(//@title)"), 12); -- cgit v1.2.3