diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-30 07:04:46 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-05-30 07:04:46 +0000 |
| commit | 3bee04cd1145802784481cd13f4a951da83ff917 (patch) | |
| tree | 52376eb14c83407f9b5763b83a433ca9c07089e1 | |
| parent | 0a50eccd4e7c08814e7b982798b1c1346c304939 (diff) | |
tests: Fixed pointer order dependency for unsorted XPath results
git-svn-id: http://pugixml.googlecode.com/svn/trunk@470 99668b35-9821-0410-8761-19e4c4f06640
| -rw-r--r-- | tests/test.cpp | 3 | ||||
| -rw-r--r-- | tests/test_xpath_xalan_3.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/test.cpp b/tests/test.cpp index d12278b..be0d86b 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -128,6 +128,9 @@ xpath_node_set_tester::xpath_node_set_tester(const pugi::xpath_node_set& set, co {
result = set;
+ // only sort unsorted sets so that we're able to verify reverse order for some axes
+ if (result.type() == pugi::xpath_node_set::type_unsorted) result.sort();
+
if (result.empty())
{
document_order = 0;
diff --git a/tests/test_xpath_xalan_3.cpp b/tests/test_xpath_xalan_3.cpp index d1be803..e36788a 100644 --- a/tests/test_xpath_xalan_3.cpp +++ b/tests/test_xpath_xalan_3.cpp @@ -59,7 +59,7 @@ TEST_XML_FLAGS(xpath_xalan_axes_2, "<far-north> Level-1<north-north-west1/><nort CHECK_XPATH_NODESET(center, STR("@*/self::node()")) % 21 % 22 % 23;
CHECK_XPATH_NODESET(center, STR("@*/.")) % 21 % 22 % 23;
CHECK_XPATH_NODESET(center, STR("@*/descendant-or-self::node()")) % 21 % 22 % 23;
- CHECK_XPATH_NODESET(center, STR("@*/ancestor-or-self::*")) % 21 % 22 % 23 % 2 % 9 % 13 % 20;
+ CHECK_XPATH_NODESET(center, STR("@*/ancestor-or-self::*")) % 2 % 9 % 13 % 20 % 21 % 22 % 23;
CHECK_XPATH_NODESET(center, STR("@*/preceding-sibling::node()"));
CHECK_XPATH_NODESET(center, STR("@*/following-sibling::*"));
CHECK_XPATH_NODESET(center, STR("@*/ancestor::*/near-north/*[4]/@*/preceding::*")) % 4 % 5 % 14 % 15 % 16;
|