curcuru 01/07/10 12:31:01
Modified: test/tests/conf/predicate predicate38.xsl predicate48.xsl
predicate49.xsl predicate50.xsl predicate51.xsl
predicate52.xsl predicate53.xsl predicate54.xsl
predicate55.xsl predicate56.xsl
Log:
Update tests to output a root <out> element so -flavor trax.dom passes; no
other changes
Revision Changes Path
1.2 +13 -6 xml-xalan/test/tests/conf/predicate/predicate38.xsl
Index: predicate38.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate38.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate38.xsl 2000/12/17 21:40:14 1.1
+++ predicate38.xsl 2001/07/10 19:30:44 1.2
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
+<xsl:output method="xml" indent="yes"/>
<!-- FileName: predicate38 -->
<!-- Document: http://www.w3.org/TR/xpath -->
@@ -10,25 +11,31 @@
<!-- Author: Paul Dick -->
<xsl:template match="doc">
+<out>
+ <predicate1>
<xsl:apply-templates select="foo[(bar[2])='this']"/>
+ </predicate1>
+ <predicate2>
<xsl:apply-templates select="foo[(bar[2][(baz[2])='goodbye'])]"/>
+ </predicate2>
+</out>
</xsl:template>
<xsl:template match="foo[(bar[2])='this']">
- 1 <xsl:for-each select="*">
- <xsl:value-of select="@attr"/>,
+ <xsl:text>1 is </xsl:text> <xsl:for-each select="*">
+ <xsl:value-of select="@attr"/><xsl:text>,</xsl:text>
</xsl:for-each>
</xsl:template>
<xsl:template match="foo[(bar[(baz[2])='goodbye'])]">
- 3 <xsl:for-each select="*">
- <xsl:value-of select="@attr"/>,
+ <xsl:text>3 is </xsl:text> <xsl:for-each select="*">
+ <xsl:value-of select="@attr"/><xsl:text>,</xsl:text>
</xsl:for-each>
</xsl:template>
<xsl:template match="foo[(bar[2][(baz[2])='goodbye'])]">
- 2 <xsl:for-each select="*">
- <xsl:value-of select="@attr"/>,
+ <xsl:text>2 is </xsl:text> <xsl:for-each select="*">
+ <xsl:value-of select="@attr"/><xsl:text>,</xsl:text>
</xsl:for-each>
</xsl:template>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate48.xsl
Index: predicate48.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate48.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate48.xsl 2001/06/15 20:57:33 1.1
+++ predicate48.xsl 2001/07/10 19:30:45 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a and b)
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a and b)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' and @b='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate49.xsl
Index: predicate49.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate49.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate49.xsl 2001/06/15 20:57:33 1.1
+++ predicate49.xsl 2001/07/10 19:30:46 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: ((a or b) and c)
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>((a or b) and c)</test-info>
+ <test-output>
<xsl:for-each select="bar[(@a='1' or @b='1') and @c='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate50.xsl
Index: predicate50.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate50.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate50.xsl 2001/06/15 20:57:33 1.1
+++ predicate50.xsl 2001/07/10 19:30:47 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a and (b or c) and d):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a and (b or c) and d)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' and (@b='1' or @c='1') and
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate51.xsl
Index: predicate51.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate51.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate51.xsl 2001/06/15 20:57:33 1.1
+++ predicate51.xsl 2001/07/10 19:30:48 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a and b or c and d):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a and b or c and d)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' and @b='1' or @c='1' and
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate52.xsl
Index: predicate52.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate52.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate52.xsl 2001/06/15 20:57:33 1.1
+++ predicate52.xsl 2001/07/10 19:30:48 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: ((a and b) or (c and d)):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>((a and b) or (c and d))</test-info>
+ <test-output>
<xsl:for-each select="bar[(@a='1' and @b='1') or (@c='1' and @d='1')]">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -4 xml-xalan/test/tests/conf/predicate/predicate53.xsl
Index: predicate53.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate53.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate53.xsl 2001/06/15 20:57:33 1.1
+++ predicate53.xsl 2001/07/10 19:30:49 1.2
@@ -9,13 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a or (b and c) or d):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a or (b and c) or d)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' or (@b='1' and @c='1') or
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate54.xsl
Index: predicate54.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate54.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate54.xsl 2001/06/15 20:57:33 1.1
+++ predicate54.xsl 2001/07/10 19:30:49 1.2
@@ -8,14 +8,14 @@
<!-- Purpose: Test ((a or b) and (c or d)) combination of logical
expressions in a predicate-->
<xsl:template match="foo">
-
- <xsl:text>Test: ((a or b) and (c or d)):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>((a or b) and (c or d))</test-info>
+ <test-output>
<xsl:for-each select="bar[(@a='1' or @b='1') and (@c='1' or @d='1')]">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate55.xsl
Index: predicate55.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate55.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate55.xsl 2001/06/15 20:57:33 1.1
+++ predicate55.xsl 2001/07/10 19:30:50 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a or b and c or d):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a or b and c or d)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' or @b='1' and @c='1' or
@d='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
1.2 +5 -5 xml-xalan/test/tests/conf/predicate/predicate56.xsl
Index: predicate56.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate56.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- predicate56.xsl 2001/06/15 20:57:33 1.1
+++ predicate56.xsl 2001/07/10 19:30:50 1.2
@@ -9,14 +9,14 @@
<!-- Author: Morten Jorgensen -->
<xsl:template match="foo">
-
- <xsl:text>Test: (a or b or c):
</xsl:text>
- <xsl:text>Match: </xsl:text>
+<out>
+ <test-info>(a or b or c)</test-info>
+ <test-output>
<xsl:for-each select="[EMAIL PROTECTED]'1' or @b='1' or @c='1']">
<xsl:value-of select="@seq"/><xsl:text> </xsl:text>
</xsl:for-each>
- <xsl:text>
</xsl:text>
-
+ </test-output>
+</out>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
