dmarston 2002/09/16 09:16:06 Modified: test/tests/conf/axes axes62.xsl axes62.xml axes59.xsl Log: Revised tests of namespace axis; axes62 fails. Revision Changes Path 1.3 +9 -16 xml-xalan/test/tests/conf/axes/axes62.xsl Index: axes62.xsl =================================================================== RCS file: /home/cvs/xml-xalan/test/tests/conf/axes/axes62.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- axes62.xsl 31 Jan 2001 22:35:58 -0000 1.2 +++ axes62.xsl 16 Sep 2002 16:16:05 -0000 1.3 @@ -1,38 +1,31 @@ <?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0" - xmlns:ped="http://ped.lotus.com"; - xmlns:bdd="http://bdd.lotus.com";> + xmlns:bdd="http://bdd.lotus.com"; + exclude-result-prefixes="bdd"> <!-- FileName: axes62 --> <!-- Document: http://www.w3.org/TR/xpath --> <!-- DocVersion: 19991116 --> <!-- Section: 2.2 Axes--> <!-- Creator: David Marston --> - <!-- Purpose: Check the namespace axes with a specified name. --> + <!-- Purpose: Use a NameTest on the namespace axis. --> + +<xsl:output method="xml" encoding="UTF-8" indent="yes" /> <xsl:template match="/"> <out> - <xsl:apply-templates/> + <xsl:apply-templates select="doc"/> </out> </xsl:template> <xsl:template match="doc"> -<!-- Output number of NS nodes and what they are --> -There are <xsl:value-of select="count(namespace::*)"/> Namespace Nodes.<xsl:text>
</xsl:text> - <xsl:for-each select="namespace::*"> - <xsl:sort select="name(.)"/> - <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element><xsl:text>,
</xsl:text> - </xsl:for-each><xsl:text>
</xsl:text> - -<!-- Map stylesheet's "ped" NS node to source document's equivalent ~ OK1 --> <xsl:for-each select="namespace::ped"> - <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element><xsl:text>
</xsl:text> + <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element> </xsl:for-each> - -<!-- Map stylesheet's "bdd" NS node to source document's equivalent ~ OK2 --> + <!-- Do the same when the prefix is also declared here in the stylesheet. Shouldn't conflict. --> <xsl:for-each select="namespace::bdd"> <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element> </xsl:for-each> </xsl:template> -</xsl:stylesheet> +</xsl:stylesheet> \ No newline at end of file 1.3 +2 -8 xml-xalan/test/tests/conf/axes/axes62.xml Index: axes62.xml =================================================================== RCS file: /home/cvs/xml-xalan/test/tests/conf/axes/axes62.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- axes62.xml 13 Feb 2001 21:23:36 -0000 1.2 +++ axes62.xml 16 Sep 2002 16:16:05 -0000 1.3 @@ -1,12 +1,6 @@ <?xml version="1.0"?> -<docs> - <doc +<doc xmlns:ext="http://somebody.elses.extension"; xmlns:java="http://xml.apache.org/xslt/java"; xmlns:ped="http://tester.com"; - xmlns:bdd="http://buster.com"; - xmlns:jad="http://administrator.com"; - xmlns:ok1="http://ped.lotus.com"; - xmlns:ok2="http://bdd.lotus.com"/> - <doc/> -</docs> \ No newline at end of file + xmlns:bdd="http://buster.com"/> \ No newline at end of file 1.3 +8 -3 xml-xalan/test/tests/conf/axes/axes59.xsl Index: axes59.xsl =================================================================== RCS file: /home/cvs/xml-xalan/test/tests/conf/axes/axes59.xsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- axes59.xsl 31 Jan 2001 22:35:59 -0000 1.2 +++ axes59.xsl 16 Sep 2002 16:16:05 -0000 1.3 @@ -6,20 +6,25 @@ <!-- DocVersion: 19991116 --> <!-- Section: 2.2 Axes--> <!-- Creator: David Marston --> - <!-- Purpose: Check the namespace axis. --> + <!-- Purpose: Step through names on the namespace axis. Ensure attributes aren't counted. --> + +<xsl:output method="xml" encoding="UTF-8" indent="yes" /> <xsl:template match="/"> <out> - <xsl:text>
</xsl:text> <xsl:apply-templates/> </out> </xsl:template> <xsl:template match="doc"> + <xsl:text>doc #</xsl:text> + <xsl:number level="single" count="doc" from="docs"/> + <xsl:text>: 
</xsl:text> <xsl:for-each select="namespace::*"> <xsl:sort select="name(.)"/> - <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element><xsl:text>,
</xsl:text> + <xsl:element name="{name(.)}"><xsl:value-of select="."/></xsl:element> </xsl:for-each> + <xsl:text>
</xsl:text> </xsl:template> <xsl:template match="text()"/><!-- To suppress empty lines -->
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
