curcuru 00/11/28 13:47:17
Modified: test/tests/api/trax/stream StreamImpIncl.xml
StreamImpIncl.xsl
test/tests/api/trax/stream/impincl SimpleImport.xsl
SimpleInclude.xsl
Added: test/tests/api-gold/trax/stream StreamImpIncl.out
Log:
Updated to be simpler StreamImpIncl test, with gold .out file
Revision Changes Path
1.2 +6 -5 xml-xalan/test/tests/api/trax/stream/StreamImpIncl.xml
Index: StreamImpIncl.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/api/trax/stream/StreamImpIncl.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamImpIncl.xml 2000/11/14 19:55:46 1.1
+++ StreamImpIncl.xml 2000/11/28 21:46:37 1.2
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<doc>
<list>
- <item version="1">Xalan-J 1.x</item>
- <item version="2">Xalan-J 2.x</item>
- <item version="1">Xalan-C 1.x</item>
+ <item>Above Should be include-list then import-list</item>
+ <item match-by="import">Should be matched-by-import</item>
+ <item match-by="include">Should be matched-by-include</item>
+ <item match-by="main">Should be matched-by-import-also</item>
<list>
- <item>Xalan documentation</item>
- <item>Xalan tests</item>
+ <item>Should be matched-by-main</item>
+ <item>Should be matched-by-main</item>
</list>
</list>
</doc>
1.2 +8 -2 xml-xalan/test/tests/api/trax/stream/StreamImpIncl.xsl
Index: StreamImpIncl.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/api/trax/stream/StreamImpIncl.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamImpIncl.xsl 2000/11/14 19:55:46 1.1
+++ StreamImpIncl.xsl 2000/11/28 21:46:40 1.2
@@ -14,9 +14,15 @@
</xsl:template>
<xsl:template match="list" priority="-1">
- <out-list>
+ <main-list>
<xsl:apply-templates/>
- </out-list>
+ </main-list>
+</xsl:template>
+
+<xsl:template match="item[not(@match-by)]">
+ <matched-by-main>
+ <xsl:value-of select="." />
+ </matched-by-main>
</xsl:template>
</xsl:stylesheet>
1.2 +12 -6
xml-xalan/test/tests/api/trax/stream/impincl/SimpleImport.xsl
Index: SimpleImport.xsl
===================================================================
RCS file:
/home/cvs/xml-xalan/test/tests/api/trax/stream/impincl/SimpleImport.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleImport.xsl 2000/11/14 19:55:46 1.1
+++ SimpleImport.xsl 2000/11/28 21:47:01 1.2
@@ -5,15 +5,21 @@
<!-- Purpose: Basic import and include tests for StreamSource APIs. -->
<xsl:template match="list">
- <simple-import>
- <xsl:copy-of select="." />
- </simple-import>
+ <import-list>
+ <xsl:apply-templates/>
+ </import-list>
</xsl:template>
-<xsl:template match="[EMAIL PROTECTED]'2']">
- <simple-import>
+<xsl:template match="[EMAIL PROTECTED]'import']">
+ <matched-by-import>
<xsl:value-of select="." />
- </simple-import>
+ </matched-by-import>
+</xsl:template>
+
+<xsl:template match="item">
+ <matched-by-import-also>
+ <xsl:value-of select="." />
+ </matched-by-import-also>
</xsl:template>
</xsl:stylesheet>
1.2 +6 -6
xml-xalan/test/tests/api/trax/stream/impincl/SimpleInclude.xsl
Index: SimpleInclude.xsl
===================================================================
RCS file:
/home/cvs/xml-xalan/test/tests/api/trax/stream/impincl/SimpleInclude.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleInclude.xsl 2000/11/14 19:55:46 1.1
+++ SimpleInclude.xsl 2000/11/28 21:47:04 1.2
@@ -5,15 +5,15 @@
<!-- Purpose: Basic import and include tests for StreamSource APIs. -->
<xsl:template match="list">
- <simple-include>
- <xsl:copy-of select="." />
- </simple-include>
+ <include-list>
+ <xsl:apply-imports/>
+ </include-list>
</xsl:template>
-<xsl:template match="[EMAIL PROTECTED]'1']">
- <simple-include>
+<xsl:template match="[EMAIL PROTECTED]'include']">
+ <matched-by-include>
<xsl:value-of select="." />
- </simple-include>
+ </matched-by-include>
</xsl:template>
</xsl:stylesheet>
1.1
xml-xalan/test/tests/api-gold/trax/stream/StreamImpIncl.out
Index: StreamImpIncl.out
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<out>
<include-list><import-list>
<matched-by-main>Above Should be include-list then
import-list</matched-by-main>
<matched-by-import>Should be matched-by-import</matched-by-import>
<matched-by-include>Should be matched-by-include</matched-by-include>
<matched-by-import-also>Should be
matched-by-import-also</matched-by-import-also>
<include-list><import-list>
<matched-by-main>Should be matched-by-main</matched-by-main>
<matched-by-main>Should be matched-by-main</matched-by-main>
</import-list></include-list>
</import-list></include-list>
</out>
