sboag 01/08/05 17:30:47
Modified: test/tests/bugzilla Bugzilla2925.xsl Bugzilla2925.out
Bugzilla2925.java
Log:
Added simple tests for return of extensions of DTM, DTMAxisIterator, and
DTMIterator, to test regression caused by fixes associated with this
bug.
Revision Changes Path
1.2 +40 -27 xml-xalan/test/tests/bugzilla/Bugzilla2925.xsl
Index: Bugzilla2925.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/bugzilla/Bugzilla2925.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Bugzilla2925.xsl 2001/08/03 02:44:50 1.1
+++ Bugzilla2925.xsl 2001/08/06 00:30:47 1.2
@@ -4,35 +4,48 @@
exclude-result-prefixes="xalan java"
extension-element-prefixes="sql"
xmlns:java="http://xml.apache.org/xslt/java";>
- <xsl:output method="xml" omit-xml-declaration="yes" standalone="yes"/>
+ <xsl:output method="xml" omit-xml-declaration="yes"
standalone="yes"/>
- <!-- Varaible that will be replaced by the XSL Dynamic Query Processor
-->
- <xsl:param name="stylesheets">
- <STYLESHEETS>
- <SUCCESS>
- <XSL_SHEET MEDIA="ns">success1.xsl</XSL_SHEET>
- <XSL_SHEET MEDIA="ie">success2.xsl</XSL_SHEET>
- <XSL_SHEET MEDIA="123">success3.xsl</XSL_SHEET>
- </SUCCESS>
- <ERROR>
- <XSL_SHEET MEDIA="456">error1.xsl</XSL_SHEET>
- <XSL_SHEET MEDIA="789">error2.xsl</XSL_SHEET>
- <XSL_SHEET MEDIA="000">error3.xsl</XSL_SHEET>
- </ERROR>
- </STYLESHEETS>
- </xsl:param>
+ <!-- Varaible that will be replaced by the XSL Dynamic Query
Processor -->
+ <xsl:param name="stylesheets">
+ <STYLESHEETS>
+ <SUCCESS>
+ <XSL_SHEET
MEDIA="ns">success1.xsl</XSL_SHEET>
+ <XSL_SHEET
MEDIA="ie">success2.xsl</XSL_SHEET>
+ <XSL_SHEET
MEDIA="123">success3.xsl</XSL_SHEET>
+ </SUCCESS>
+ <ERROR>
+ <XSL_SHEET MEDIA="456">error1.xsl</XSL_SHEET>
+ <XSL_SHEET MEDIA="789">error2.xsl</XSL_SHEET>
+ <XSL_SHEET MEDIA="000">error3.xsl</XSL_SHEET>
+ </ERROR>
+ </STYLESHEETS>
+ </xsl:param>
- <xsl:template match="/">
- <!-- P911X Response Element -->
- <xsl:element name="TEMPLATES">
- <!--xsl:copy-of select="xalan:nodeset($stylesheets)"/-->
- <!-- This is a test to make sure we can still call methods
on the
- passed in node. -->
- <xsl:value-of select="java:getNodeName($stylesheets)" />
+ <xsl:template match="/">
+ <!-- P911X Response Element -->
+ <xsl:element name="TEMPLATES">
+ <!--xsl:copy-of select="xalan:nodeset($stylesheets)"/-->
+ <!-- This is a test to make sure we can still call
methods on the
+ passed in node. -->
+ <xsl:text> ===== Test java:getNodeName from RTF
param. ===== </xsl:text>
+ <xsl:value-of select="java:getNodeName($stylesheets)" />
- <xsl:copy-of select="$stylesheets"/>
- <xsl:copy-of select="xalan:nodeset($stylesheets)"/>
- </xsl:element>
- </xsl:template>
+ <xsl:text> ===== Test xsl:copy-of of RTF param.
===== </xsl:text>
+ <xsl:copy-of select="$stylesheets"/>
+
+ <xsl:text> ===== Test return of xalan:nodeset of RTF
param. ===== </xsl:text>
+ <xsl:copy-of select="xalan:nodeset($stylesheets)"/>
+
+ <xsl:text> ===== Test return of DTM from extension.
===== </xsl:text>
+ <xsl:copy-of
select="java:Bugzilla2925.dtmTest('Bugzilla2925Params.xml')"/>
+
+ <xsl:text> ===== Test return of DTMAxisIterator from
extension. ===== </xsl:text>
+ <xsl:copy-of
select="java:Bugzilla2925.DTMAxisIteratorTest('Bugzilla2925Params.xml')"/>
+
+ <xsl:text> ===== Test return of DTMIterator from
extension. ===== </xsl:text>
+ <xsl:copy-of
select="java:Bugzilla2925.DTMIteratorTest('Bugzilla2925Params.xml')"/>
+ </xsl:element>
+ </xsl:template>
</xsl:stylesheet>
1.2 +65 -2 xml-xalan/test/tests/bugzilla/Bugzilla2925.out
Index: Bugzilla2925.out
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/bugzilla/Bugzilla2925.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Bugzilla2925.out 2001/08/03 02:44:50 1.1
+++ Bugzilla2925.out 2001/08/06 00:30:47 1.2
@@ -1,4 +1,8 @@
-<TEMPLATES>CONFIG_DATA<CONFIG_DATA>
+<TEMPLATES>
+===== Test java:getNodeName from RTF param. =====
+CONFIG_DATA
+===== Test xsl:copy-of of RTF param. =====
+<CONFIG_DATA>
<RegisterAccount>
<STYLESHEETS>
<SUCCESS>
@@ -15,7 +19,66 @@
</ERROR>
</STYLESHEETS>
</RegisterAccount>
-</CONFIG_DATA><CONFIG_DATA>
+</CONFIG_DATA>
+===== Test return of xalan:nodeset of RTF param. =====
+<CONFIG_DATA>
+ <RegisterAccount>
+ <STYLESHEETS>
+ <SUCCESS>
+ <XSL_SHEET
MEDIA="NS4">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="IE3">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="WML">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGCOMPLETE.XSL</XSL_SHEET>
+ </SUCCESS>
+ <ERROR>
+ <XSL_SHEET MEDIA="NS4">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="IE3">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="WML">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGISTER1.XSL</XSL_SHEET>
+ </ERROR>
+ </STYLESHEETS>
+ </RegisterAccount>
+</CONFIG_DATA>
+===== Test return of DTM from extension. =====
+<CONFIG_DATA>
+ <RegisterAccount>
+ <STYLESHEETS>
+ <SUCCESS>
+ <XSL_SHEET
MEDIA="NS4">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="IE3">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="WML">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGCOMPLETE.XSL</XSL_SHEET>
+ </SUCCESS>
+ <ERROR>
+ <XSL_SHEET MEDIA="NS4">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="IE3">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="WML">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGISTER1.XSL</XSL_SHEET>
+ </ERROR>
+ </STYLESHEETS>
+ </RegisterAccount>
+</CONFIG_DATA>
+===== Test return of DTMAxisIterator from extension. =====
+<CONFIG_DATA>
+ <RegisterAccount>
+ <STYLESHEETS>
+ <SUCCESS>
+ <XSL_SHEET
MEDIA="NS4">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="IE3">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="WML">REGCOMPLETE.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGCOMPLETE.XSL</XSL_SHEET>
+ </SUCCESS>
+ <ERROR>
+ <XSL_SHEET MEDIA="NS4">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="IE3">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET MEDIA="WML">REGISTER1.XSL</XSL_SHEET>
+ <XSL_SHEET
MEDIA="default">REGISTER1.XSL</XSL_SHEET>
+ </ERROR>
+ </STYLESHEETS>
+ </RegisterAccount>
+</CONFIG_DATA>
+===== Test return of DTMIterator from extension. =====
+<CONFIG_DATA>
<RegisterAccount>
<STYLESHEETS>
<SUCCESS>
1.2 +60 -2 xml-xalan/test/tests/bugzilla/Bugzilla2925.java
Index: Bugzilla2925.java
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/bugzilla/Bugzilla2925.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Bugzilla2925.java 2001/08/03 02:44:50 1.1
+++ Bugzilla2925.java 2001/08/06 00:30:47 1.2
@@ -22,6 +22,13 @@
import org.apache.xpath.*;
import org.apache.xpath.objects.*;
+import org.apache.xml.dtm.*;
+import org.apache.xml.dtm.ref.*;
+import org.apache.xml.dtm.ref.sax2dtm.*;
+
+import org.apache.xpath.XPathContext.XPathExpressionContext;
+import org.apache.xpath.axes.OneStepIterator;
+
import java.io.File;
/**
@@ -65,7 +72,9 @@
t.setParameter("stylesheets", doc.getDocumentElement());
t.transform(new StreamSource("bugzilla2925.xml"),
- new StreamResult("bugzilla2925.xsr"));
+ new StreamResult("bugzilla2925.xsr")
+ // new StreamResult(System.err)
+ );
// If we get here, attempt to validate the contents of
// the outputFile created
@@ -80,13 +89,62 @@
{
logger.checkFail(e.getMessage());
}
-
+
// Optional: use the Datalet d if supplied
// Call code to reproduce the bug here
// Call logger.checkFail("desc") (like Junit's assert(true, "desc")
// or logger.checkPass("desc") (like Junit's assert(false, "desc")
// to report the actual bug fail/pass status
}
+
+ public static DTM dtmTest(org.apache.xalan.extensions.ExpressionContext
exprContext,
+ String relativeURI)
+ {
+ XPathExpressionContext xpathExprContext =
(XPathExpressionContext)exprContext;
+ DTMManager dtmMgr = xpathExprContext.getDTMManager();
+
+ DTM dtm = dtmMgr.getDTM(new StreamSource(relativeURI), true, null,
false, true);
+ // System.err.println("Returning a DTM: "+dtm);
+ // ((DTMDefaultBase)dtm).dumpDTM();
+ return dtm;
+ }
+
+ public static DTMAxisIterator DTMAxisIteratorTest(
+ org.apache.xalan.extensions.ExpressionContext
exprContext,
+ String relativeURI)
+ {
+ XPathExpressionContext xpathExprContext =
(XPathExpressionContext)exprContext;
+ DTMManager dtmMgr = xpathExprContext.getDTMManager();
+
+ DTM dtm = dtmMgr.getDTM(new StreamSource(relativeURI), true, null,
false, true);
+ // System.err.println("Returning a DTM: "+dtm);
+ // ((DTMDefaultBase)dtm).dumpDTM();
+
+ DTMAxisIterator iter = dtm.getAxisIterator(Axis.SELF);
+ iter.setStartNode(dtm.getDocument());
+
+ return iter;
+ }
+
+ public static DTMIterator DTMIteratorTest(
+ org.apache.xalan.extensions.ExpressionContext
exprContext,
+ String relativeURI)
+ throws Exception
+ {
+ XPathExpressionContext xpathExprContext =
(XPathExpressionContext)exprContext;
+ DTMManager dtmMgr = xpathExprContext.getDTMManager();
+
+ DTM dtm = dtmMgr.getDTM(new StreamSource(relativeURI), true, null,
false, true);
+ // System.err.println("Returning a DTM: "+dtm);
+ // ((DTMDefaultBase)dtm).dumpDTM();
+
+ DTMIterator iterator = new
OneStepIterator(dtm.getAxisIterator(Axis.SELF));
+ iterator.setRoot(dtm.getDocument(), xpathExprContext.getXPathContext());
+
+ return iterator;
+ }
+
+
/**
* <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2925";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
