From e91b5e305966f5d03fb1f8fc3fa5f2e4dac16041 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sun, 30 May 2010 07:52:18 +0000
Subject: tests: Added tests for principal node types with attributes for all
 axes that can return attributes

git-svn-id: http://pugixml.googlecode.com/svn/trunk@471 99668b35-9821-0410-8761-19e4c4f06640
---
 tests/test_xpath_xalan_3.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests/test_xpath_xalan_3.cpp')

diff --git a/tests/test_xpath_xalan_3.cpp b/tests/test_xpath_xalan_3.cpp
index e36788a..6514560 100644
--- a/tests/test_xpath_xalan_3.cpp
+++ b/tests/test_xpath_xalan_3.cpp
@@ -59,7 +59,8 @@ 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::*")) % 2 % 9 % 13 % 20 % 21 % 22 % 23;
+	CHECK_XPATH_NODESET(center, STR("@*/ancestor-or-self::node()")) % 1 % 2 % 9 % 13 % 20 % 21 % 22 % 23;
+	CHECK_XPATH_NODESET(center, STR("@*/ancestor-or-self::*")) % 2 % 9 % 13 % 20;
 	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;
@@ -318,9 +319,9 @@ TEST_XML(xpath_xalan_axes_18, "<north><center center-attr='here'><south/></cente
 	xml_node center = doc.child(STR("north")).child(STR("center"));
 
 	CHECK_XPATH_NODESET(center, STR("@*/self::node()")) % 4;
-	CHECK_XPATH_NODESET(center, STR("@*/self::*")) % 4; // $$$ wrong - should be empty, since * test tests for principal node type
+	CHECK_XPATH_NODESET(center, STR("@*/self::*")); // * tests for principal node type
 	CHECK_XPATH_NODESET(center, STR("@*/self::text()"));
-	CHECK_XPATH_NODESET(center, STR("@*/self::center-attr")) % 4; // $$$ wrong - should be empty, since name test tests for principal node type
+	CHECK_XPATH_NODESET(center, STR("@*/self::center-attr")); // * tests for principal node type
 }
 
 #endif
-- 
cgit v1.2.3