You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2025/11/11 17:08:51 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing xalan-j xslt 3.0 implementation improvements for xsl:result-document instruction
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_xslt3.0_mvn
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_xslt3.0_mvn by this push:
new 3f9ca823b committing xalan-j xslt 3.0 implementation improvements for xsl:result-document instruction
3f9ca823b is described below
commit 3f9ca823b42a7c377c4649a73b72c71f965cbb32
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Tue Nov 11 22:38:26 2025 +0530
committing xalan-j xslt 3.0 implementation improvements for xsl:result-document instruction
---
.../org/apache/xalan/processor/XSLTSchema.java | 28 ++--
.../apache/xalan/templates/ElemResultDocument.java | 165 +++++++++++++++------
.../java/org/apache/xalan/templates/ElemTry.java | 26 ++--
.../apache/xalan/transformer/TransformerImpl.java | 27 ++--
src/main/java/org/apache/xalan/xslt/Process.java | 50 ++-----
.../apache/xalan/xslt/util/XslTransformData.java | 10 ++
src/main/java/org/apache/xml/dtm/DTMManager.java | 31 ++++
.../xalan/tests/util/XslTransformTestsUtil.java | 7 +-
.../tests/w3c/xslt3/W3CXslTransformTestsUtil.java | 12 +-
.../result/decl/_character-map-test-set_result.xml | 29 ++--
.../result/decl/_function-test-set_result.xml | 78 +++++++---
.../xslt3/result/fn/_position-test-set_result.xml | 41 +++--
.../xslt3/result/insn/_copy-test-set_result.xml | 72 ++++++---
.../insn/_for-each-group-test-set_result.xml | 16 +-
.../w3c/xslt3/result/insn/_try-test-set_result.xml | 24 +--
.../result/w3c_xslt3_testsuite_xalan-j_result.xml | 14 +-
16 files changed, 397 insertions(+), 233 deletions(-)
diff --git a/src/main/java/org/apache/xalan/processor/XSLTSchema.java b/src/main/java/org/apache/xalan/processor/XSLTSchema.java
index de329187a..30b43734f 100644
--- a/src/main/java/org/apache/xalan/processor/XSLTSchema.java
+++ b/src/main/java/org/apache/xalan/processor/XSLTSchema.java
@@ -107,11 +107,15 @@ public class XSLTSchema extends XSLTElementDef
XSLTAttributeDef hrefAttr = new XSLTAttributeDef(null, "href",
XSLTAttributeDef.T_URL, true, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// Support AVT
- // xsl:result-document, xsl:source-document
+ // xsl:source-document
XSLTAttributeDef hrefAVTRequired = new XSLTAttributeDef(null, "href",
- XSLTAttributeDef.T_AVT, true, true, XSLTAttributeDef.WARNING);
+ XSLTAttributeDef.T_AVT, true, true, XSLTAttributeDef.ERROR);
+
+ // xsl:result-document
+ XSLTAttributeDef hrefAVTOpt = new XSLTAttributeDef(null, "href",
+ XSLTAttributeDef.T_AVT, false, true, XSLTAttributeDef.ERROR);
// xsl:import-schema
XSLTAttributeDef namespaceAttr = new XSLTAttributeDef(null, "namespace",
@@ -141,12 +145,12 @@ public class XSLTSchema extends XSLTElementDef
XSLTAttributeDef xslCopyNamespacesOpt = new XSLTAttributeDef(null, "copy-namespaces",
XSLTAttributeDef.T_YESNO, false, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// xsl:output-character
XSLTAttributeDef characterAttrRequired = new XSLTAttributeDef(null, "character",
XSLTAttributeDef.T_UNICODE_CHAR, true, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// xsl:output-character
XSLTAttributeDef stringAttrRequired = new XSLTAttributeDef(null, "string",
XSLTAttributeDef.T_STRING, true, false, XSLTAttributeDef.ERROR);
@@ -187,21 +191,21 @@ public class XSLTSchema extends XSLTElementDef
XSLTAttributeDef.T_QNAME, false, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// It is an error if the name attribute is not present on any of these elements
// xsl:key, xsl:attribute-set, xsl:call-template, xsl:with-param, xsl:variable, xsl:param,
// xsl:function, xsl:character-map
XSLTAttributeDef nameAttrRequired = new XSLTAttributeDef(null, "name",
XSLTAttributeDef.T_QNAME, true, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// Support AVT
// xsl:element, xsl:attribute
XSLTAttributeDef nameAVTRequired = new XSLTAttributeDef(null, "name",
XSLTAttributeDef.T_AVT_QNAME, true, true, XSLTAttributeDef.WARNING);
- // Required.
+ // Required
// Support AVT
// xsl:processing-instruction
XSLTAttributeDef nameAVT_NCNAMERequired = new XSLTAttributeDef(null, "name",
@@ -309,7 +313,7 @@ public class XSLTSchema extends XSLTElementDef
XSLTAttributeDef.T_EXPR, true, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// xsl:for-each, xsl:copy-of, xsl:for-each-group, xsl:analyze-string, xsl:iterate, xsl:merge-source
XSLTAttributeDef selectAttrRequired = new XSLTAttributeDef(null,
"select",
@@ -335,7 +339,7 @@ public class XSLTSchema extends XSLTElementDef
"separator",
XSLTAttributeDef.T_STRING, false, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// xsl:evaluate
XSLTAttributeDef xpathAttrRequired = new XSLTAttributeDef(null,
"xpath",
@@ -347,7 +351,7 @@ public class XSLTSchema extends XSLTElementDef
"context-item",
XSLTAttributeDef.T_EXPR, false, false, XSLTAttributeDef.ERROR);
- // Required.
+ // Required
// xsl:analyze-string
XSLTAttributeDef regexAVTRequired = new XSLTAttributeDef(null, "regex",
XSLTAttributeDef.T_AVT, true, true, XSLTAttributeDef.ERROR);
@@ -734,7 +738,7 @@ public class XSLTSchema extends XSLTElementDef
XSLTElementDef xslResultDocument = new XSLTElementDef(this,
Constants.S_XSLNAMESPACEURL, "result-document",
null /*alias */, templateElements,
- new XSLTAttributeDef[]{ hrefAVTRequired, methodAttr,
+ new XSLTAttributeDef[]{ hrefAVTOpt, methodAttr,
omitXmlDeclarationAttr, spaceAttr },
new ProcessorTemplateElem(),
ElemResultDocument.class /* class object */, true, false, true, 20, true);
diff --git a/src/main/java/org/apache/xalan/templates/ElemResultDocument.java b/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
index 37b93b388..6be191313 100644
--- a/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
+++ b/src/main/java/org/apache/xalan/templates/ElemResultDocument.java
@@ -36,10 +36,12 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.dom.DOMSource;
import org.apache.xalan.transformer.TransformerImpl;
+import org.apache.xalan.xslt.util.XslTransformData;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMCursorIterator;
import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.serializer.SerializationHandler;
import org.apache.xml.utils.QName;
import org.apache.xpath.Expression;
import org.apache.xpath.ExpressionOwner;
@@ -50,6 +52,7 @@ import org.apache.xpath.objects.XNodeSetForDOM;
import org.apache.xpath.objects.XObject;
import org.apache.xpath.objects.XPathMap;
import org.apache.xpath.objects.XRTreeFrag;
+import org.apache.xpath.objects.XString;
import org.json.JSONException;
import org.json.JSONObject;
import org.w3c.dom.Document;
@@ -230,45 +233,65 @@ public class ElemResultDocument extends ElemTemplateElement
transformer.getTraceManager().emitTraceEvent(this);
}
- String hrefStrVal = m_href.evaluate(xctxt, xctxt.getContextNode(), this); // Mandatory
+ String hrefStrVal = null;
+ if (m_href != null) {
+ hrefStrVal = m_href.evaluate(xctxt, xctxt.getContextNode(), this);
+ }
+ else {
+ hrefStrVal = "";
+ }
+
+ if (!XslTransformData.m_xslResultDocumentUriStrList.contains(hrefStrVal)) {
+ XslTransformData.m_xslResultDocumentUriStrList.add(hrefStrVal);
+ }
+ else {
+ throw new javax.xml.transform.TransformerException("XTDE1490 : An XSL 'result-document' instruction attempted "
+ + "to produce result contents twice with the URI '"
+ + hrefStrVal + "'.", srcLocator);
+ }
URL resolvedHrefUrl = null;
- try {
- URI url = new URI(hrefStrVal);
- String stylesheetSystemId = srcLocator.getSystemId(); // base uri of stylesheet, if available
+ if (!"".equals(hrefStrVal)) {
+ try {
+ URI url = new URI(hrefStrVal);
+ String stylesheetSystemId = srcLocator.getSystemId(); // base uri of stylesheet, if available
- if (!url.isAbsolute()) {
- if (m_BaseOutputUriStrAbsValue != null) {
- URI resolvedUriArg = (new URI(m_BaseOutputUriStrAbsValue)).resolve(hrefStrVal);
- resolvedHrefUrl = resolvedUriArg.toURL();
- }
- else if (stylesheetSystemId != null) {
- URI resolvedUriArg = (new URI(stylesheetSystemId)).resolve(hrefStrVal);
- resolvedHrefUrl = resolvedUriArg.toURL();
- }
- }
+ if (!url.isAbsolute()) {
+ if (m_BaseOutputUriStrAbsValue != null) {
+ URI resolvedUriArg = (new URI(m_BaseOutputUriStrAbsValue)).resolve(hrefStrVal);
+ resolvedHrefUrl = resolvedUriArg.toURL();
+ }
+ else if (stylesheetSystemId != null) {
+ URI resolvedUriArg = (new URI(stylesheetSystemId)).resolve(hrefStrVal);
+ resolvedHrefUrl = resolvedUriArg.toURL();
+ }
+ }
- if (resolvedHrefUrl == null) {
- resolvedHrefUrl = new URL(hrefStrVal);
- }
- }
- catch (URISyntaxException ex) {
- throw new javax.xml.transform.TransformerException("FODC0005 : An XSL 'result-document' instruction's href uri '" + hrefStrVal + "' "
- + "is not a valid absolute uri, "
- + "or cannot be resolved to an absolute uri.", srcLocator);
- }
- catch (MalformedURLException ex) {
- throw new javax.xml.transform.TransformerException("FODC0005 : An XSL 'result-document' instruction's href uri '" + hrefStrVal + "' "
- + "is not a valid absolute uri, or cannot be resolved to "
- + "an absolute uri.", srcLocator);
- }
+ if (resolvedHrefUrl == null) {
+ resolvedHrefUrl = new URL(hrefStrVal);
+ }
+ }
+ catch (URISyntaxException ex) {
+ throw new javax.xml.transform.TransformerException("FODC0005 : An XSL 'result-document' instruction's href uri '" + hrefStrVal + "' "
+ + "is not a valid absolute uri, "
+ + "or cannot be resolved to an absolute uri.", srcLocator);
+ }
+ catch (MalformedURLException ex) {
+ throw new javax.xml.transform.TransformerException("FODC0005 : An XSL 'result-document' instruction's href uri '" + hrefStrVal + "' "
+ + "is not a valid absolute uri, or cannot be resolved to "
+ + "an absolute uri.", srcLocator);
+ }
+ }
- QName methodQname = m_method; // Optional, with default value "xml"
+ QName methodQname = m_method; // Optional, with default value "xml"
- boolean omitXmlDeclarationAttr = m_omitXmlDeclaration; // Optional, with default value "false"
+ boolean omitXmlDeclaration = m_omitXmlDeclaration; // Optional, with default value "false"
- String resolvedHrefStrVal = resolvedHrefUrl.toString();
+ String resolvedHrefStrVal = null;
+ if (resolvedHrefUrl != null) {
+ resolvedHrefStrVal = resolvedHrefUrl.toString();
+ }
if ((methodQname == null) || ((Constants.ATTRVAL_OUTPUT_METHOD_XML).equals(methodQname.toString()))) {
int xdmNodeHandle = transformer.transformToRTF(this);
@@ -281,7 +304,7 @@ public class ElemResultDocument extends ElemTemplateElement
DTM dtm1 = xctxt.getDTM(nodeHandle);
Node node = dtm1.getNode(nodeHandle);
String xmlStrValue = XslTransformEvaluationHelper.serializeXmlDomElementNode(node);
- if (omitXmlDeclarationAttr) {
+ if (omitXmlDeclaration) {
int xmlPrologEndStrIndex = xmlStrValue.indexOf("?>");
xmlStrValue = xmlStrValue.substring(xmlPrologEndStrIndex + 2);
}
@@ -305,9 +328,27 @@ public class ElemResultDocument extends ElemTemplateElement
m_fnTransformResult.put(new XSString(resolvedHrefStrVal), getFnTransformResultComponent(xctxt, xmlStrValue));
}
}
- else {
+ else if (resolvedHrefStrVal != null) {
writeStringContentsToFile(resolvedHrefStrVal, xmlStrValue);
}
+ else {
+ /**
+ * xsl:result-document instruction 'href' attribute's value is a zero length string.
+ * Therefore, xsl:result-document instruction's evaluation result is XSL transformation's
+ * principal result, which is XSL transformation's result produced by template rule or
+ * function nominated as XSL transformation's entry point.
+ */
+
+ DTMManager dtmManager = xctxt.getDTMManager();
+ DTM dtm = dtmManager.getXmlDTMTreeFromString(xmlStrValue);
+ int docNodeHandle = dtm.getDocument();
+
+ XMLNodeCursorImpl xmlNodeCursorImpl = new XMLNodeCursorImpl(docNodeHandle, xctxt);
+
+ SerializationHandler rhandler = transformer.getSerializationHandler();
+
+ ElemCopyOf.copyOfActionOnNodeSet(xmlNodeCursorImpl, transformer, rhandler, xctxt);
+ }
}
else if ((Constants.ATTRVAL_OUTPUT_METHOD_TEXT).equals(methodQname.toString())) {
String textStrValue = transformer.transformToString(this);
@@ -320,9 +361,21 @@ public class ElemResultDocument extends ElemTemplateElement
m_fnTransformResult.put(new XSString(resolvedHrefStrVal), getFnTransformResultComponent(xctxt, textStrValue));
}
}
- else {
+ else if (resolvedHrefStrVal != null) {
writeStringContentsToFile(resolvedHrefStrVal, textStrValue);
}
+ else {
+ /**
+ * xsl:result-document instruction 'href' attribute's value is a zero length string.
+ * Therefore, xsl:result-document instruction's evaluation result is XSL transformation's
+ * principal result, which is XSL transformation's result produced by template rule or
+ * function nominated as XSL transformation's entry point.
+ */
+
+ SerializationHandler rhandler = transformer.getSerializationHandler();
+
+ (new XString(textStrValue)).dispatchCharactersEvents(rhandler);
+ }
}
else if ((Constants.ATTRVAL_OUTPUT_METHOD_JSON).equals(methodQname.toString())) {
String jsonStrValue = transformer.transformToString(this);
@@ -332,6 +385,8 @@ public class ElemResultDocument extends ElemTemplateElement
* Verify that, the string value represents a legible JSON document.
*/
JSONObject jsonObject = new JSONObject(jsonStrValue);
+
+ jsonStrValue = jsonStrValue.trim();
}
catch (JSONException ex) {
throw new TransformerException("XPTY0004 : An XSL 'result-document' instruction within a stylesheet has attribute "
@@ -343,25 +398,37 @@ public class ElemResultDocument extends ElemTemplateElement
if (m_fnTransformResult != null) {
if (m_BaseOutputUriStrAbsValue != null) {
- m_fnTransformResult.put(new XSString(m_BaseOutputUriStrAbsValue), getFnTransformResultComponent(xctxt, jsonStrValue.trim()));
+ m_fnTransformResult.put(new XSString(m_BaseOutputUriStrAbsValue), getFnTransformResultComponent(xctxt, jsonStrValue));
}
else {
- m_fnTransformResult.put(new XSString(resolvedHrefStrVal), getFnTransformResultComponent(xctxt, jsonStrValue.trim()));
+ m_fnTransformResult.put(new XSString(resolvedHrefStrVal), getFnTransformResultComponent(xctxt, jsonStrValue));
}
}
+ else if (resolvedHrefStrVal != null) {
+ writeStringContentsToFile(resolvedHrefStrVal, jsonStrValue);
+ }
else {
- writeStringContentsToFile(resolvedHrefStrVal, jsonStrValue.trim());
+ /**
+ * xsl:result-document instruction 'href' attribute's value is a zero length string.
+ * Therefore, xsl:result-document instruction's evaluation result is XSL transformation's
+ * principal result, which is XSL transformation's result produced by template rule or
+ * function nominated as XSL transformation's entry point.
+ */
+
+ SerializationHandler rhandler = transformer.getSerializationHandler();
+
+ (new XString(jsonStrValue)).dispatchCharactersEvents(rhandler);
}
}
else if ((Constants.ATTRVAL_OUTPUT_METHOD_HTML).equals(methodQname.toString())) {
- ElemTemplateElement t = this.m_firstChild;
- if (!(t instanceof ElemLiteralResult)) {
+ ElemTemplateElement xslChildElem = this.m_firstChild;
+ if (!(xslChildElem instanceof ElemLiteralResult)) {
throw new TransformerException("XPTY0004 : An XSL 'result-document' instruction's serialization method is 'html', but "
- + "result-document's immmediate child content doesn't starts "
- + "constructing a legible HTML document.", srcLocator);
+ + "result-document's immmediate child content doesn't starts "
+ + "constructing a legible HTML document.", srcLocator);
}
else {
- StylesheetRoot stylesheetRoot = t.getStylesheetRoot();
+ StylesheetRoot stylesheetRoot = xslChildElem.getStylesheetRoot();
/**
* This object instance is a clone of related internal
@@ -407,9 +474,21 @@ public class ElemResultDocument extends ElemTemplateElement
m_fnTransformResult.put(new XSString(resolvedHrefStrVal), getFnTransformResultComponent(xctxt, htmlStrValue));
}
}
- else {
+ else if (resolvedHrefStrVal != null) {
writeStringContentsToFile(resolvedHrefStrVal, htmlStrValue);
}
+ else {
+ /**
+ * xsl:result-document instruction 'href' attribute's value is a zero length string.
+ * Therefore, xsl:result-document instruction's evaluation result is XSL transformation's
+ * principal result, which is XSL transformation's result produced by template rule or
+ * function nominated as XSL transformation's entry point.
+ */
+
+ SerializationHandler rhandler = transformer.getSerializationHandler();
+
+ (new XString(htmlStrValue)).dispatchCharactersEvents(rhandler);
+ }
/**
* This is an original xsl:output information that has to be restored
diff --git a/src/main/java/org/apache/xalan/templates/ElemTry.java b/src/main/java/org/apache/xalan/templates/ElemTry.java
index d136ace23..9d605cceb 100644
--- a/src/main/java/org/apache/xalan/templates/ElemTry.java
+++ b/src/main/java/org/apache/xalan/templates/ElemTry.java
@@ -17,14 +17,10 @@
*/
package org.apache.xalan.templates;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
import java.util.Vector;
-import javax.xml.transform.Source;
import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;
@@ -351,20 +347,18 @@ public class ElemTry extends ElemTemplateElement implements ExpressionOwner {
ElemCatch elemCatch = getXslCatchElemToHandleException(transformer, xctxt, errCodeLocalStr, this);
- if (elemCatch != null) {
- Source trfSource = transformer.getSource();
- String xslTrfSystemId = trfSource.getSystemId();
- String xslTrfModuleStr = null;
- if (xslTrfSystemId != null) {
- try {
- URI xslStylesheetUri = new URI(xslTrfSystemId);
- xslTrfModuleStr = xslStylesheetUri.toString();
- }
- catch (URISyntaxException ex2) {
- File file = new File(xslTrfSystemId);
- xslTrfModuleStr = (file.toURI()).toString();
+ if (elemCatch != null) {
+ String xslTrfModuleStr = transformer.getUriStrOfXslStylesheet();
+ if (xslTrfModuleStr != null) {
+ int idx = xslTrfModuleStr.lastIndexOf('/');
+ if (idx > -1) {
+ int strLength = xslTrfModuleStr.length();
+ xslTrfModuleStr = "/" + xslTrfModuleStr.substring(idx + 1, strLength);
}
}
+ else {
+ xslTrfModuleStr = "";
+ }
String errMesg2 = null;
if (errCodeLocalStr.length() > 8) {
diff --git a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
index 306f228c5..f7e33f112 100644
--- a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
+++ b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
@@ -171,6 +171,9 @@ public class TransformerImpl extends Transformer
/** The base URL of the source tree. */
private String m_urlOfSource = null;
+
+ /** The absolute URI string value of an XSL stylesheet. */
+ private String m_uriStrOfXslStylesheet = null;
/** The Result object at the start of the transform, if any. */
private Result m_outputTarget = null;
@@ -356,13 +359,6 @@ public class TransformerImpl extends Transformer
* An XSL stylesheet initial template name.
*/
private String m_init_template_name = null;
-
- /**
- * This variable having boolean value true means that, an
- * XSL transformation's initial template name has been provided
- * and an XML input source is absent.
- */
- private boolean m_xmlSourceAbsent = false;
/**
* This is a compile-time flag to turn off calling
@@ -2712,7 +2708,6 @@ public class TransformerImpl extends Transformer
xctxt.setSAXLocator(t);
m_currentTemplateElements.setElementAt(t,currentTemplateElementsTop);
- t.setXMLSourceAbsent(m_xmlSourceAbsent);
t.execute(this);
}
}
@@ -4220,14 +4215,6 @@ public class TransformerImpl extends Transformer
public void setSource(Source source) {
this.m_source = source;
}
-
- public void setXMLSourceAbsent(boolean xmlSourceAbsent) {
- m_xmlSourceAbsent = xmlSourceAbsent;
- }
-
- public boolean getXMLSourceAbsent() {
- return m_xmlSourceAbsent;
- }
/**
* Method definition to populate CharacterMapConfig run-time
@@ -4969,5 +4956,13 @@ public class TransformerImpl extends Transformer
}
}
+ public String getUriStrOfXslStylesheet() {
+ return m_uriStrOfXslStylesheet;
+ }
+
+ public void setUriStrOfXslStylesheet(String uriStrOfXslStylesheet) {
+ this.m_uriStrOfXslStylesheet = uriStrOfXslStylesheet;
+ }
+
} // end TransformerImpl class
diff --git a/src/main/java/org/apache/xalan/xslt/Process.java b/src/main/java/org/apache/xalan/xslt/Process.java
index e46e7f800..045f37c74 100644
--- a/src/main/java/org/apache/xalan/xslt/Process.java
+++ b/src/main/java/org/apache/xalan/xslt/Process.java
@@ -24,6 +24,7 @@ import java.io.FileWriter;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringReader;
+import java.net.URI;
import java.util.Properties;
import java.util.ResourceBundle;
import java.util.Vector;
@@ -826,6 +827,12 @@ public class Process
}
Transformer transformer = flavor.equals("th") ? null : stylesheet.newTransformer();
+
+ if (null != xslFileName) {
+ File file = new File(xslFileName);
+ URI uri = file.toURI();
+ ((TransformerImpl)transformer).setUriStrOfXslStylesheet(uri.toString());
+ }
if (isXslEvaluate) {
((TransformerImpl)transformer).setProperty(TransformerImpl.XSL_EVALUATE_PROPERTY, Boolean.TRUE);
@@ -943,7 +950,7 @@ public class Process
// Using an XMLReader to construct SAXSource for an XML input
// document, enables correct XML namespace processing.
- XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ XMLReader xmlReader = XMLReaderFactory.createXMLReader();
transformer.transform(new SAXSource(xmlReader, inpSrc), new DOMResult(outNode));
@@ -1113,44 +1120,9 @@ public class Process
}
}
else
- {
- if (initialTemplateName == null) {
- StringReader reader = new StringReader("<?xml version=\"1.0\"?><doc/>");
- transformer.transform(new StreamSource(reader), strResult);
- }
- else {
- DOMSource xslDomSource = null;
-
- if (null != xslFileName)
- {
- System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
-
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
-
- if (isSecureProcessing)
- {
- try
- {
- dfactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
- }
- catch (ParserConfigurationException pce) {}
- }
-
- DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
- Document xslDOM = docBuilder.parse(new InputSource(xslFileName));
-
- xslDomSource = new DOMSource(xslDOM, xslFileName);
- }
-
- if (xslDomSource != null) {
- ((TransformerImpl)transformer).setXMLSourceAbsent(true);
- transformer.transform(xslDomSource, strResult);
- }
- else {
- transformer.transform(null, strResult);
- }
- }
+ {
+ StringReader strReader = new StringReader("<?xml version=\"1.0\"?><unlikely_xml_element/>");
+ transformer.transform(new StreamSource(strReader), strResult);
}
}
else
diff --git a/src/main/java/org/apache/xalan/xslt/util/XslTransformData.java b/src/main/java/org/apache/xalan/xslt/util/XslTransformData.java
index 00e22cc4f..998ea2fef 100644
--- a/src/main/java/org/apache/xalan/xslt/util/XslTransformData.java
+++ b/src/main/java/org/apache/xalan/xslt/util/XslTransformData.java
@@ -16,6 +16,9 @@
*/
package org.apache.xalan.xslt.util;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.xalan.templates.StylesheetRoot;
import org.apache.xpath.objects.ResultSequence;
import org.apache.xpath.objects.XMLNodeCursorImpl;
@@ -99,6 +102,12 @@ public class XslTransformData {
*/
public static XMLNodeCursorImpl m_xslDocumentEvaluationResult;
+ /**
+ * This class field is used to refer to, list of URI strings
+ * processed by xsl:result-document instruction.
+ */
+ public static List<String> m_xslResultDocumentUriStrList = new ArrayList<String>();
+
/**
* Class field, to support Xalan-J's test driver for W3C XSLT 3.0 test suite.
*/
@@ -119,6 +128,7 @@ public class XslTransformData {
m_xpathCallingOpCode = Integer.MIN_VALUE;
m_xpathNamedFunctionRefSequence.clear();
m_xslDocumentEvaluationResult = null;
+ m_xslResultDocumentUriStrList.clear();
m_is_xsl_test_invocation = false;
}
diff --git a/src/main/java/org/apache/xml/dtm/DTMManager.java b/src/main/java/org/apache/xml/dtm/DTMManager.java
index 2f65c9813..e5b756be2 100644
--- a/src/main/java/org/apache/xml/dtm/DTMManager.java
+++ b/src/main/java/org/apache/xml/dtm/DTMManager.java
@@ -20,6 +20,8 @@
*/
package org.apache.xml.dtm;
+import java.io.StringReader;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMSource;
@@ -38,6 +40,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
/**
* A DTMManager instance can be used to create DTM and
@@ -345,6 +348,34 @@ public abstract class DTMManager
throw new DTMException(ex);
}
}
+
+ /**
+ * Method definition, to construct DTM object instance, corresponding
+ * to the supplied XML document string.
+ *
+ * @param xmlStr The supplied XML document string
+ * @return The constructed DTM object instance
+ */
+ public DTM getXmlDTMTreeFromString(String xmlStr) {
+
+ try {
+ System.setProperty(Constants.XML_DOCUMENT_BUILDER_FACTORY_KEY, Constants.XML_DOCUMENT_BUILDER_FACTORY_VALUE);
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder dBuilder = dbf.newDocumentBuilder();
+
+ StringReader strReader = new StringReader(xmlStr);
+ InputSource inpSource = new InputSource(strReader);
+
+ Document document = dBuilder.parse(inpSource);
+
+ return getDTM(new DOMSource(document), true, null, false, false);
+ }
+ catch (Exception ex) {
+ throw new DTMException(ex);
+ }
+ }
/**
* Release a DTM either to a lru pool, or completely remove reference.
diff --git a/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java b/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
index 8a786ee35..5b7acb77f 100644
--- a/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
+++ b/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.StringReader;
import java.io.StringWriter;
import java.net.URL;
import java.nio.file.Files;
@@ -146,9 +147,9 @@ public class XslTransformTestsUtil extends FileComparisonUtil {
}
Source xmlInpSrc = null;
- if ((m_initTemplateName != null) && (xmlFilePath == null)) {
- xmlInpSrc = xsltStreamSrc;
- ((TransformerImpl)transformer).setXMLSourceAbsent(true);
+ if ((m_initTemplateName != null) && (xmlFilePath == null)) {
+ StringReader strReader = new StringReader("<?xml version=\"1.0\"?><unlikely_xml_element/>");
+ xmlInpSrc = new StreamSource(strReader);
}
else {
xmlInpSrc = xmlDomSrc;
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/W3CXslTransformTestsUtil.java b/src/test/java/org/apache/xalan/tests/w3c/xslt3/W3CXslTransformTestsUtil.java
index f5ea3cb51..26b2f252a 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/W3CXslTransformTestsUtil.java
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/W3CXslTransformTestsUtil.java
@@ -288,6 +288,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
}
StreamSource xslStreamSrc = new StreamSource(xslStylesheetUriStr);
+ xslStreamSrc.setSystemId(xslStylesheetUriStr);
try {
Map<String, XObject> xslParamMap = new HashMap<String, XObject>();
@@ -624,13 +625,16 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
Transformer transformer = m_xslTransformerFactory.newTransformer(xslStreamSrc);
+ TransformerImpl transformerImpl = (TransformerImpl)transformer;
+ transformerImpl.setUriStrOfXslStylesheet(xslStreamSrc.getSystemId());
+
if (xslParamMap.size() > 0) {
Set<String> keySet = xslParamMap.keySet();
Iterator<String> keyIter = keySet.iterator();
while (keyIter.hasNext()) {
String key = keyIter.next();
XObject value = xslParamMap.get(key);
- ((TransformerImpl)transformer).setParameter(key, value);
+ transformerImpl.setParameter(key, value);
}
}
@@ -666,9 +670,9 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
}
Source xmlInpSrc = null;
- if ((m_initTemplateName != null) && (xmlInpDomSource == null)) {
- xmlInpSrc = xslStreamSrc;
- ((TransformerImpl)transformer).setXMLSourceAbsent(true);
+ if ((m_initTemplateName != null) && (xmlInpDomSource == null)) {
+ StringReader strReader = new StringReader("<?xml version=\"1.0\"?><unlikely_xml_element/>");
+ xmlInpSrc = new StreamSource(strReader);
}
else {
xmlInpSrc = xmlInpDomSource;
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
index 61e1d1700..62731a609 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_character-map-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:50Z" fail="12" name="character-map" pass="15" skipped="1" statusUnknown="1" totalRun="28">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:44Z" fail="13" name="character-map" pass="14" skipped="1" statusUnknown="1" totalRun="28">
<testResult status="pass" testName="character-map-001"/>
<testResult status="pass" testName="character-map-002"/>
<testResult status="pass" testName="character-map-003"/>
@@ -15,25 +15,10 @@
<outResult/>
</testResult>
<testResult status="pass" testName="character-map-014"/>
- <testResult status="fail" testName="character-map-015">
- <outResult>
- <errTrace>XTSE0010 : xsl:result-document requires attribute: href</errTrace>
- <errTrace>XPTY0004 : An exception occured while evaluating an XSL 'result-document' instruction. Following run-time error occured : null.</errTrace>
- </outResult>
- </testResult>
- <testResult status="fail" testName="character-map-016">
- <outResult>
- <errTrace>XTSE0010 : xsl:result-document requires attribute: href</errTrace>
- <errTrace>XPTY0004 : An exception occured while evaluating an XSL 'result-document' instruction. Following run-time error occured : null.</errTrace>
- </outResult>
- </testResult>
+ <testResult status="fail" testName="character-map-015"/>
+ <testResult status="fail" testName="character-map-016"/>
<testResult status="fail" testName="character-map-017"/>
- <testResult status="fail" testName="character-map-018">
- <outResult>
- <errTrace>XTSE0010 : xsl:result-document requires attribute: href</errTrace>
- <errTrace>XPTY0004 : An exception occured while evaluating an XSL 'result-document' instruction. Following run-time error occured : null.</errTrace>
- </outResult>
- </testResult>
+ <testResult status="fail" testName="character-map-018"/>
<testResult status="pass" testName="character-map-019"/>
<testResult status="fail" testName="character-map-020">
<outResult><?xml version="1.0" encoding="UTF-8"?><doc><a value="ab{C}de">vwx{Y}z</a></doc></outResult>
@@ -41,7 +26,11 @@
<testResult status="fail" testName="character-map-021">
<outResult><?xml version="1.0" encoding="UTF-8"?><doc><a value="ab{C}de">vwx{Y}z</a></doc></outResult>
</testResult>
- <testResult status="pass" testName="character-map-022"/>
+ <testResult status="fail" testName="character-map-022">
+ <outResult>
+ <errTrace>XTSE1580 : An XSL stylesheet contains more than one xsl:character-map instruction with name 'map02'.</errTrace>
+ </outResult>
+ </testResult>
<testResult status="fail" testName="character-map-023"/>
<testResult status="fail" testName="character-map-024"/>
<testResult testName="character-map-025"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
index 06e634227..85971a10b 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_function-test-set_result.xml
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:50Z" fail="32" name="function" pass="56" skipped="22" statusUnknown="0" totalRun="88">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:43Z" fail="35" name="function" pass="53" skipped="22" statusUnknown="0" totalRun="88">
<testResult status="fail" testName="function-0001">
- <outResult/>
+ <outResult>
+ <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}format-integer()</errTrace>
+ <errTrace>function token not found.</errTrace>
+ <errTrace>java.lang.NullPointerException</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="function-0002"/>
<testResult status="pass" testName="function-0003"/>
@@ -21,20 +25,29 @@
<testResult status="pass" testName="function-0114"/>
<testResult status="pass" testName="function-0115"/>
<testResult status="pass" testName="function-0116"/>
- <testResult status="pass" testName="function-0117"/>
+ <testResult status="fail" testName="function-0117">
+ <outResult>
+ <errTrace>java.util.MissingResourceException: Can't find resource for bundle org.apache.xalan.res.XSLTErrorResources, key XTSE0020 : An xsl:function instruction app:count-elements has both the attributes 'override' and 'override-extension-function', but they don't have the same value.</errTrace>
+ </outResult>
+ </testResult>
<testResult status="pass" testName="function-0118"/>
- <testResult status="skipped" testName="function-0119a" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-0119a" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="function-0119b"/>
- <testResult status="skipped" testName="function-0120a" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-0120a" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="function-0120b"/>
<testResult status="pass" testName="function-0121"/>
- <testResult status="pass" testName="function-0122"/>
+ <testResult status="fail" testName="function-0122">
+ <outResult>
+ <errTrace>XTSE0740 : An XSL function's name attribute doesn't have a URI reference</errTrace>
+ <errTrace>java.lang.RuntimeException: ElemTemplateElement error: xsl:function must have a name attribute.</errTrace>
+ </outResult>
+ </testResult>
<testResult status="pass" testName="function-0201"/>
<testResult status="pass" testName="function-0202"/>
<testResult status="pass" testName="function-0203"/>
<testResult status="pass" testName="function-0205"/>
<testResult status="pass" testName="function-0301"/>
- <testResult status="skipped" testName="function-0302" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-0302" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="function-0302b"/>
<testResult status="pass" testName="function-0303"/>
<testResult status="pass" testName="function-0401"/>
@@ -48,7 +61,7 @@
<testResult status="pass" testName="function-0602"/>
<testResult status="fail" testName="function-0701">
<outResult>
- <errTrace>java.lang.NumberFormatException</errTrace>
+ <errTrace>XPST0003 : An XPath 'if' expression doesn't contain expected token 'else'.</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="function-0901"/>
@@ -66,7 +79,11 @@
<testResult status="fail" testName="function-1013"/>
<testResult status="fail" testName="function-1014"/>
<testResult status="pass" testName="function-1015"/>
- <testResult status="pass" testName="function-1016"/>
+ <testResult status="fail" testName="function-1016">
+ <outResult>
+ <errTrace>java.lang.RuntimeException: ElemTemplateElement error: XTSE0770 : Found more than one XSL stylesheet function named: x:test with arity 1</errTrace>
+ </outResult>
+ </testResult>
<testResult status="fail" testName="function-1017">
<outResult>
<errTrace>Unknown error in XPath.</errTrace>
@@ -85,7 +102,7 @@
<outResult><?xml version="1.0" encoding="UTF-8"?><out xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:x="http://xxx.com/"/></outResult>
</testResult>
<testResult status="pass" testName="function-1022"/>
- <testResult status="skipped" testName="function-1023" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-1023" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="fail" testName="function-1024">
<outResult>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}format-integer()</errTrace>
@@ -94,15 +111,24 @@
</outResult>
</testResult>
<testResult status="fail" testName="function-1025">
- <outResult/>
+ <outResult>
+ <errTrace>A location path was expected, but the following token was encountered: )</errTrace>
+ <errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="function-1026"/>
<testResult status="fail" testName="function-1027">
- <outResult/>
+ <outResult>
+ <errTrace>A location path was expected, but the following token was encountered: )</errTrace>
+ <errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="function-1028"/>
<testResult status="fail" testName="function-1029">
- <outResult/>
+ <outResult>
+ <errTrace>A location path was expected, but the following token was encountered: )</errTrace>
+ <errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="function-1030"/>
<testResult status="pass" testName="function-1031"/>
@@ -120,17 +146,28 @@
<testResult status="pass" testName="function-1401"/>
<testResult status="pass" testName="function-1501"/>
<testResult status="fail" testName="function-1601">
- <outResult/>
+ <outResult>
+ <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}environment-variable()</errTrace>
+ <errTrace>function token not found.</errTrace>
+ <errTrace>java.lang.NullPointerException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="function-1701">
- <outResult/>
+ <outResult>
+ <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}format-integer()</errTrace>
+ <errTrace>function token not found.</errTrace>
+ <errTrace>java.lang.NullPointerException</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="function-1901"/>
- <testResult status="skipped" testName="function-1902" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-1902" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="function-2001"/>
- <testResult status="skipped" testName="function-2002" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="function-2002" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="fail" testName="function-2101">
- <outResult/>
+ <outResult>
+ <errTrace>XTSE0010 : t:function requires attribute: name</errTrace>
+ <errTrace>java.lang.RuntimeException: ElemTemplateElement error: xsl:function must have a name attribute.</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="function-2102">
<outResult>
@@ -155,7 +192,10 @@
<outResult><?xml version="1.0" encoding="UTF-8"?><out>abc</out></outResult>
</testResult>
<testResult status="fail" testName="function-2109">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException: org.apache.xpath.objects.XNumber cannot be cast to java.lang.String</errTrace>
+ </outResult>
</testResult>
<testResult feature="streaming" status="skipped" testName="function-5001"/>
<testResult feature="streaming" status="skipped" testName="function-5002"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
index 494abcaae..4efb18dc4 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_position-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:57Z" fail="11" name="position" pass="126" skipped="0" statusUnknown="1" totalRun="138">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:51Z" fail="10" name="position" pass="127" skipped="0" statusUnknown="1" totalRun="138">
<testResult status="pass" testName="position-0101"/>
<testResult status="fail" testName="position-0102"/>
<testResult status="fail" testName="position-0103"/>
@@ -109,13 +109,7 @@
<testResult status="pass" testName="position-1901"/>
<testResult status="pass" testName="position-2001"/>
<testResult status="fail" testName="position-2101"/>
- <testResult status="fail" testName="position-2201">
- <outResult>
- <errTrace>"input-type-annotations" attribute is not allowed on the xsl:transform element!</errTrace>
- <errTrace>XTSE0010 : xsl:result-document requires attribute: href</errTrace>
- <errTrace>XPTY0004 : An exception occured while evaluating an XSL 'result-document' instruction. Following run-time error occured : null.</errTrace>
- </outResult>
- </testResult>
+ <testResult status="pass" testName="position-2201"/>
<testResult status="pass" testName="position-2301"/>
<testResult status="pass" testName="position-2401"/>
<testResult status="pass" testName="position-2402"/>
@@ -129,22 +123,41 @@
<testResult status="pass" testName="position-2805"/>
<testResult status="pass" testName="position-2806"/>
<testResult status="fail" testName="position-2901">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-2902">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-2903">
- <outResult/>
+ <outResult>
+ <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}element()</errTrace>
+ <errTrace>function token not found.</errTrace>
+ <errTrace>java.lang.NullPointerException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-3001">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-3002">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-3003">
- <outResult/>
+ <outResult>
+ <errTrace>Expected ), but found: ,</errTrace>
+ <errTrace>java.lang.ClassCastException</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="position-3004"/>
<testResult status="pass" testName="position-3101"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
index f23c18c2f..94f170ea5 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-06T12:29:58Z" fail="25" name="copy" pass="34" skipped="0" statusUnknown="1" totalRun="60">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:39Z" fail="26" name="copy" pass="33" skipped="0" statusUnknown="1" totalRun="60">
<testResult status="pass" testName="copy-0101"/>
<testResult status="pass" testName="copy-0102"/>
<testResult status="pass" testName="copy-0103"/>
@@ -7,7 +7,11 @@
<errTrace>XTSE0010 : in is not allowed in this position in the stylesheet</errTrace>
</outResult>
</testResult>
- <testResult status="pass" testName="copy-0105"/>
+ <testResult status="fail" testName="copy-0105">
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute 'match' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
+ </testResult>
<testResult status="pass" testName="copy-0201"/>
<testResult status="pass" testName="copy-0202"/>
<testResult status="pass" testName="copy-0203"/>
@@ -25,52 +29,84 @@
<testResult status="pass" testName="copy-0610"/>
<testResult status="pass" testName="copy-0611"/>
<testResult status="fail" testName="copy-0612">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0613">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0614">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0615">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0616">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0617">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0618">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0619">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0620">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0621">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0622">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0623">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0624">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0625">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0626">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="fail" testName="copy-0627">
- <outResult/>
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute '_copy-namespaces' is not allowed to appear on XSL element "copy-of".</errTrace>
+ </outResult>
</testResult>
<testResult status="pass" testName="copy-0701"/>
<testResult status="pass" testName="copy-0801"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
index f83b94951..a2ec3b344 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_for-each-group-test-set_result.xml
@@ -1,7 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:44Z" fail="24" name="for-each-group" pass="49" skipped="4" statusUnknown="1" totalRun="74">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:37Z" fail="25" name="for-each-group" pass="48" skipped="4" statusUnknown="1" totalRun="74">
<testResult status="pass" testName="for-each-group-001"/>
- <testResult status="skipped" testName="for-each-group-002a" xsltVersion="XSLT 2.0 only"/>
- <testResult status="pass" testName="for-each-group-002"/>
+ <testResult status="skipped" testName="for-each-group-002a" xsltVersion="XSLT 2.0/1.0 only test case"/>
+ <testResult status="fail" testName="for-each-group-002">
+ <outResult>
+ <errTrace>org.apache.xml.utils.WrappedRuntimeException: XTSE0090 : An attribute 'bind-group' is not allowed to appear on XSL element "for-each-group".</errTrace>
+ </outResult>
+ </testResult>
<testResult status="pass" testName="for-each-group-003"/>
<testResult status="pass" testName="for-each-group-005"/>
<testResult status="pass" testName="for-each-group-007"/>
@@ -10,7 +14,7 @@
<testResult status="pass" testName="for-each-group-012"/>
<testResult status="pass" testName="for-each-group-013"/>
<testResult status="pass" testName="for-each-group-014"/>
- <testResult status="skipped" testName="for-each-group-015a" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="for-each-group-015a" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="for-each-group-015b"/>
<testResult status="pass" testName="for-each-group-016"/>
<testResult status="pass" testName="for-each-group-018"/>
@@ -37,7 +41,7 @@
<testResult status="pass" testName="for-each-group-043"/>
<testResult status="pass" testName="for-each-group-044"/>
<testResult status="fail" testName="for-each-group-045"/>
- <testResult status="skipped" testName="for-each-group-046" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="for-each-group-046" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="for-each-group-046a"/>
<testResult status="pass" testName="for-each-group-047"/>
<testResult status="pass" testName="for-each-group-048"/>
@@ -101,7 +105,7 @@
</outResult>
</testResult>
<testResult status="pass" testName="for-each-group-080"/>
- <testResult status="skipped" testName="for-each-group-081a" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="for-each-group-081a" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="for-each-group-081b"/>
<testResult status="fail" testName="for-each-group-082"/>
<testResult status="pass" testName="for-each-group-083"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
index 86de9364d..5fde08c6b 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_try-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-05T17:18:46Z" fail="8" name="try" pass="26" skipped="8" statusUnknown="0" totalRun="34">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-11-11T16:48:38Z" fail="7" name="try" pass="27" skipped="8" statusUnknown="0" totalRun="34">
<testResult status="pass" testName="try-001"/>
<testResult status="pass" testName="try-002"/>
<testResult status="pass" testName="try-003"/>
@@ -11,24 +11,16 @@
<testResult status="pass" testName="try-010"/>
<testResult status="pass" testName="try-011"/>
<testResult status="pass" testName="try-012"/>
- <testResult status="skipped" testName="try-013" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="try-013" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="try-014"/>
- <testResult status="skipped" testName="try-015" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="try-015" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="try-016"/>
- <testResult status="skipped" testName="try-017" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="try-017" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="try-018"/>
<testResult status="pass" testName="try-019"/>
<testResult status="pass" testName="try-020"/>
- <testResult status="fail" testName="try-021">
- <outResult/>
- </testResult>
- <testResult status="fail" testName="try-022">
- <outResult>
- <errTrace>XPTY0004 : An exception occured while evaluating an XSL 'result-document' instruction. Following run-time error occured : d:\xslt30-test-master\tests\insn\try (Access is denied).</errTrace>
- <errTrace>XPST0081 : An XML namespace binding for prefix '' is not available.</errTrace>
- <errTrace>XPST0081 : An XML namespace binding for prefix '' is not available.</errTrace>
- </outResult>
- </testResult>
+ <testResult status="pass" testName="try-021"/>
+ <testResult status="fail" testName="try-022"/>
<testResult status="fail" testName="try-023">
<outResult/>
</testResult>
@@ -39,8 +31,8 @@
<errTrace>java.lang.ArrayIndexOutOfBoundsException</errTrace>
</outResult>
</testResult>
- <testResult status="skipped" testName="try-025" xsltVersion="XSLT 2.0 only"/>
- <testResult status="skipped" testName="try-026" xsltVersion="XSLT 2.0 only"/>
+ <testResult status="skipped" testName="try-025" xsltVersion="XSLT 2.0/1.0 only test case"/>
+ <testResult status="skipped" testName="try-026" xsltVersion="XSLT 2.0/1.0 only test case"/>
<testResult status="pass" testName="try-027"/>
<testResult status="fail" testName="try-028">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
index 19a891acb..b947e377e 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/w3c_xslt3_testsuite_xalan-j_result.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2025-11-09T11:58:40Z" desc="W3C XSLT 3.0 test suite results" fail="632" pass="1867" skipped="168" success="74.26%" totalRun="2514" xslt_processor="Xalan-J XSLT 3.0 development code">
+<testResult dateTime="2025-11-11T16:49:08Z" desc="W3C XSLT 3.0 test suite results" fail="636" pass="1863" skipped="168" success="74.11%" totalRun="2514" xslt_processor="Xalan-J XSLT 3.0 development code">
<attr>
<as fail="24" pass="79" skipped="5" success="75.96%" totalRun="104"/>
<avt fail="14" pass="21" skipped="0" success="60.0%" totalRun="35"/>
@@ -11,8 +11,8 @@
</attr>
<decl>
<attribute-set fail="8" pass="41" skipped="1" success="83.67%" totalRun="49"/>
- <character-map fail="12" pass="15" skipped="1" success="53.57%" totalRun="28"/>
- <function fail="32" pass="56" skipped="22" success="63.64%" totalRun="88"/>
+ <character-map fail="13" pass="14" skipped="1" success="50.0%" totalRun="28"/>
+ <function fail="35" pass="53" skipped="22" success="60.23%" totalRun="88"/>
<variable fail="4" pass="14" skipped="1" success="73.68%" totalRun="19"/>
</decl>
<expr>
@@ -31,7 +31,7 @@
<format-number fail="32" pass="38" skipped="4" success="54.29%" totalRun="70"/>
<json-to-xml fail="7" pass="25" skipped="0" success="75.76%" totalRun="33"/>
<key fail="29" pass="54" skipped="0" success="65.06%" totalRun="83"/>
- <position fail="11" pass="126" skipped="0" success="91.3%" totalRun="138"/>
+ <position fail="10" pass="127" skipped="0" success="92.03%" totalRun="138"/>
<root fail="3" pass="7" skipped="0" success="70.0%" totalRun="10"/>
</fn>
<insn>
@@ -40,13 +40,13 @@
<attribute fail="10" pass="12" skipped="7" success="52.17%" totalRun="23"/>
<call-template fail="13" pass="27" skipped="2" success="67.5%" totalRun="40"/>
<choose fail="6" pass="48" skipped="1" success="88.89%" totalRun="54"/>
- <copy fail="25" pass="34" skipped="0" success="56.67%" totalRun="60"/>
+ <copy fail="26" pass="33" skipped="0" success="55.0%" totalRun="60"/>
<element fail="14" pass="15" skipped="0" success="51.72%" totalRun="29"/>
- <for-each-group fail="24" pass="49" skipped="4" success="66.22%" totalRun="74"/>
+ <for-each-group fail="25" pass="48" skipped="4" success="64.86%" totalRun="74"/>
<iterate fail="0" pass="44" skipped="0" success="100.0%" totalRun="44"/>
<sequence fail="15" pass="10" skipped="1" success="38.46%" totalRun="26"/>
<sort fail="30" pass="51" skipped="0" success="62.96%" totalRun="81"/>
- <try fail="8" pass="26" skipped="8" success="76.47%" totalRun="34"/>
+ <try fail="7" pass="27" skipped="8" success="79.41%" totalRun="34"/>
<xsl-document fail="11" pass="14" skipped="0" success="56.0%" totalRun="25"/>
</insn>
<misc>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org