From 998a534df7232c142521c57e7abd5e366ac3a8eb Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 29 Aug 2010 15:49:06 +0000 Subject: tests: Changed XPath checking macros to avoid query copying under GCC git-svn-id: http://pugixml.googlecode.com/svn/trunk@692 99668b35-9821-0410-8761-19e4c4f06640 --- tests/test_xpath_api.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'tests/test_xpath_api.cpp') diff --git a/tests/test_xpath_api.cpp b/tests/test_xpath_api.cpp index b91910a..90f316e 100644 --- a/tests/test_xpath_api.cpp +++ b/tests/test_xpath_api.cpp @@ -169,10 +169,18 @@ TEST_XML(xpath_api_evaluate_attr, "") #ifdef PUGIXML_NO_EXCEPTIONS TEST_XML(xpath_api_evaluate_fail, "") { - CHECK_XPATH_BOOLEAN(doc, STR(""), false); - CHECK_XPATH_NUMBER_NAN(doc, STR("")); - CHECK_XPATH_STRING(doc, STR(""), STR("")); - CHECK_XPATH_NODESET(doc, STR("")); + xpath_query q(STR("")); + + CHECK(q.evaluate_boolean(doc) == false); + CHECK_DOUBLE_NAN(q.evaluate_number(doc)); + + CHECK(q.evaluate_string(0, 0, doc) == 1); // null terminator + +#ifndef PUGIXML_NO_STL + CHECK(q.evaluate_string(doc).empty()); +#endif + + CHECK(q.evaluate_node_set(doc).empty()); } #endif -- cgit v1.2.3