From f542c5ebb8068ccd4f9176684eb62183afbe7e5c Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
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_parse.cpp | 82 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'tests/test_xpath_parse.cpp')

diff --git a/tests/test_xpath_parse.cpp b/tests/test_xpath_parse.cpp
index 8eee552..6dcd02b 100644
--- a/tests/test_xpath_parse.cpp
+++ b/tests/test_xpath_parse.cpp
@@ -5,88 +5,88 @@
 TEST(xpath_literal_parse)
 {
 	xml_node c;
-	CHECK_XPATH_STRING(c, "'a\"b'", "a\"b");
-	CHECK_XPATH_STRING(c, "\"a'b\"", "a'b");
-	CHECK_XPATH_STRING(c, "\"\"", "");
-	CHECK_XPATH_STRING(c, "\'\'", "");
+	CHECK_XPATH_STRING(c, STR("'a\"b'"), STR("a\"b"));
+	CHECK_XPATH_STRING(c, STR("\"a'b\""), STR("a'b"));
+	CHECK_XPATH_STRING(c, STR("\"\""), STR(""));
+	CHECK_XPATH_STRING(c, STR("\'\'"), STR(""));
 }
 
 TEST(xpath_literal_error)
 {
-	CHECK_XPATH_FAIL("\"");
-	CHECK_XPATH_FAIL("\'");
+	CHECK_XPATH_FAIL(STR("\""));
+	CHECK_XPATH_FAIL(STR("\'"));
 }
 
 TEST(xpath_number_parse)
 {
 	xml_node c;
-	CHECK_XPATH_NUMBER(c, "0", 0);
-	CHECK_XPATH_NUMBER(c, "123", 123);
-	CHECK_XPATH_NUMBER(c, "123.456", 123.456);
-	CHECK_XPATH_NUMBER(c, ".123", 0.123);
-	CHECK_XPATH_NUMBER(c, "123.4567890123456789012345", 123.4567890123456789012345);
+	CHECK_XPATH_NUMBER(c, STR("0"), 0);
+	CHECK_XPATH_NUMBER(c, STR("123"), 123);
+	CHECK_XPATH_NUMBER(c, STR("123.456"), 123.456);
+	CHECK_XPATH_NUMBER(c, STR(".123"), 0.123);
+	CHECK_XPATH_NUMBER(c, STR("123.4567890123456789012345"), 123.4567890123456789012345);
 }
 
 TEST(xpath_number_error)
 {
-	CHECK_XPATH_FAIL("123a");
-	CHECK_XPATH_FAIL("123.a");
-	CHECK_XPATH_FAIL(".123a");
+	CHECK_XPATH_FAIL(STR("123a"));
+	CHECK_XPATH_FAIL(STR("123.a"));
+	CHECK_XPATH_FAIL(STR(".123a"));
 }
 
 TEST(xpath_variables)
 {
-	CHECK_XPATH_FAIL("$var"); // not implemented
-	CHECK_XPATH_FAIL("$1");
+	CHECK_XPATH_FAIL(STR("$var")); // not implemented
+	CHECK_XPATH_FAIL(STR("$1"));
 }
 
 TEST(xpath_empty_expression)
 {
-	CHECK_XPATH_FAIL("");
+	CHECK_XPATH_FAIL(STR(""));
 }
 
 TEST(xpath_lexer_error)
 {
-	CHECK_XPATH_FAIL("!");
-	CHECK_XPATH_FAIL("&");
+	CHECK_XPATH_FAIL(STR("!"));
+	CHECK_XPATH_FAIL(STR("&"));
 }
 
 TEST(xpath_unmatched_braces)
 {
-	CHECK_XPATH_FAIL("node[");
-	CHECK_XPATH_FAIL("node[1");
-	CHECK_XPATH_FAIL("node[]]");
-	CHECK_XPATH_FAIL("node(");
-	CHECK_XPATH_FAIL("node(()");
-	CHECK_XPATH_FAIL("(node)[1");
-	CHECK_XPATH_FAIL("(1");
+	CHECK_XPATH_FAIL(STR("node["));
+	CHECK_XPATH_FAIL(STR("node[1"));
+	CHECK_XPATH_FAIL(STR("node[]]"));
+	CHECK_XPATH_FAIL(STR("node("));
+	CHECK_XPATH_FAIL(STR("node(()"));
+	CHECK_XPATH_FAIL(STR("(node)[1"));
+	CHECK_XPATH_FAIL(STR("(1"));
 }
 
 TEST(xpath_incorrect_step)
 {
-	CHECK_XPATH_FAIL("child::1");
-	CHECK_XPATH_FAIL("something::*");
-	CHECK_XPATH_FAIL("a::*");
-	CHECK_XPATH_FAIL("c::*");
-	CHECK_XPATH_FAIL("d::*");
-	CHECK_XPATH_FAIL("f::*");
-	CHECK_XPATH_FAIL("n::*");
-	CHECK_XPATH_FAIL("p::*");
+	CHECK_XPATH_FAIL(STR("child::1"));
+	CHECK_XPATH_FAIL(STR("something::*"));
+	CHECK_XPATH_FAIL(STR("a::*"));
+	CHECK_XPATH_FAIL(STR("c::*"));
+	CHECK_XPATH_FAIL(STR("d::*"));
+	CHECK_XPATH_FAIL(STR("f::*"));
+	CHECK_XPATH_FAIL(STR("n::*"));
+	CHECK_XPATH_FAIL(STR("p::*"));
 }
 
 TEST(xpath_semantics_error)
 {
-	CHECK_XPATH_FAIL("1[1]");
-	CHECK_XPATH_FAIL("1 | 1");
+	CHECK_XPATH_FAIL(STR("1[1]"));
+	CHECK_XPATH_FAIL(STR("1 | 1"));
 }
 
 TEST(xpath_semantics_posinv) // coverage for contains()
 {
-	xpath_query("(node)[substring(1, 2, 3)]");
-	xpath_query("(node)[concat(1, 2, 3, 4)]");
-	xpath_query("(node)[count(foo)]");
-	xpath_query("(node)[local-name()]");
-	xpath_query("(node)[(node)[1]]");
+	xpath_query(STR("(node)[substring(1, 2, 3)]"));
+	xpath_query(STR("(node)[concat(1, 2, 3, 4)]"));
+	xpath_query(STR("(node)[count(foo)]"));
+	xpath_query(STR("(node)[local-name()]"));
+	xpath_query(STR("(node)[(node)[1]]"));
 }
 
 #endif
-- 
cgit v1.2.3