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/05/19 17:34:37 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing few bug fixes and updating xsl test suite run-time status
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 fa959c8ea committing few bug fixes and updating xsl test suite run-time status
fa959c8ea is described below
commit fa959c8ea7bfe55733303ade1981710591bae5ed
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Mon May 19 23:04:16 2025 +0530
committing few bug fixes and updating xsl test suite run-time status
---
README | 6 +-
.../xalan/templates/ElemTemplateElement.java | 10 ++
.../apache/xalan/transformer/TransformerImpl.java | 19 +++-
src/main/java/org/apache/xalan/xslt/Process.java | 30 +++++-
src/main/java/org/apache/xpath/XPath.java | 30 +++++-
.../org/apache/xpath/compiler/XPathParser.java | 78 +++++++++++++-
.../xalan/tests/util/XslTransformTestsUtil.java | 16 ++-
.../tests/w3c/xslt3/W3CXslTransformTestsUtil.java | 14 ++-
.../result/_analyze-string-test-set_result.xml | 9 +-
.../result/_apply-templates-test-set_result.xml | 118 ++++++++++++++++++++-
.../xslt3/result/_attribute-test-set_result.xml | 5 +-
.../w3c/xslt3/result/_axes-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_boolean-test-set_result.xml | 2 +-
.../result/_call-template-test-set_result.xml | 6 +-
.../w3c/xslt3/result/_castable-test-set_result.xml | 2 +-
.../result/_character-map-test-set_result.xml | 12 +--
.../w3c/xslt3/result/_choose-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_copy-test-set_result.xml | 3 +-
.../xslt3/result/_expression-test-set_result.xml | 2 +-
.../result/_for-each-group-test-set_result.xml | 9 +-
.../w3c/xslt3/result/_for-test-set_result.xml | 4 +-
.../w3c/xslt3/result/_function-test-set_result.xml | 14 +--
.../_higher-order-functions-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_iterate-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_math-test-set_result.xml | 4 +-
.../w3c/xslt3/result/_node-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_nodetest-test-set_result.xml | 16 +--
.../w3c/xslt3/result/_path-test-set_result.xml | 2 +-
.../xslt3/result/_predicate-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_sequence-test-set_result.xml | 4 +-
.../w3c/xslt3/result/_string-test-set_result.xml | 2 +-
.../w3c/xslt3/result/_try-test-set_result.xml | 6 +-
.../xpath3/XPathSequenceConstructorMiscTests.java | 10 ++
.../xalan/tests/xslt3/XslInitialTemplateTests.java | 22 ++--
.../xpath_sequence_constructor/misc/gold/test4.out | 7 ++
.../xpath_sequence_constructor/misc/test4.xsl | 40 +++++++
.../resources/xsl_initial_template/gold/test6.out | 5 +
src/test/resources/xsl_initial_template/test5.xsl | 25 ++++-
src/test/resources/xsl_initial_template/test6.xsl | 50 +++++++++
39 files changed, 487 insertions(+), 107 deletions(-)
diff --git a/README b/README
index ba3bd29f9..4c76201db 100644
--- a/README
+++ b/README
@@ -59,16 +59,16 @@ This produces Maven build output with trailing information like following:
[INFO] T E S T S
[INFO] -------------------------------------------------------
[INFO] Running org.apache.xalan.tests.main.AllXalanXSLT3Tests
-[INFO] Tests run: 1050, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.804 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
+[INFO] Tests run: 1052, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 89.462 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
[INFO]
[INFO] Results:
[INFO]
-[INFO] Tests run: 1050, Failures: 0, Errors: 0, Skipped: 0
+[INFO] Tests run: 1052, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 01:44 min
+[INFO] Total time: 03:17 min
To run Xalan-J's XSL 3 processor for invoking an XSL stylesheet transformation, the jar file xalan-java-3.0.1.jar and other
jar files available within 'libs' folder need to be made available on Java run-time's classpath.
diff --git a/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java b/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
index 19e3875cc..bc0a7cbf8 100644
--- a/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
+++ b/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
@@ -121,6 +121,8 @@ public class ElemTemplateElement extends UnImplNode
* This class field stores an XPath context object.
*/
private XPathContext m_xpathContext;
+
+ private boolean m_xmlSourceAbsent;
/**
* Construct a template element instance.
@@ -2219,4 +2221,12 @@ public class ElemTemplateElement extends UnImplNode
return evalResult;
}
+ public void setXMLSourceAbsent(boolean xmlSourceAbsent) {
+ m_xmlSourceAbsent = xmlSourceAbsent;
+ }
+
+ public boolean getXMLSourceAbsent() {
+ return m_xmlSourceAbsent;
+ }
+
}
diff --git a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
index 052f2650e..19e755700 100644
--- a/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
+++ b/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
@@ -325,6 +325,13 @@ 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
@@ -2361,7 +2368,8 @@ public class TransformerImpl extends Transformer
m_xcontext.pushContextNodeList(cnl);
m_xcontext.setSAXLocator(template);
- m_xcontext.getVarStack().link(template.m_frameSize);
+ m_xcontext.getVarStack().link(template.m_frameSize);
+
executeChildTemplates(template, true);
if (m_debug)
@@ -2618,6 +2626,7 @@ public class TransformerImpl extends Transformer
xctxt.setSAXLocator(t);
m_currentTemplateElements.setElementAt(t,currentTemplateElementsTop);
+ t.setXMLSourceAbsent(m_xmlSourceAbsent);
t.execute(this);
}
}
@@ -4130,5 +4139,13 @@ public class TransformerImpl extends Transformer
}
}
+ public void setXMLSourceAbsent(boolean xmlSourceAbsent) {
+ m_xmlSourceAbsent = xmlSourceAbsent;
+ }
+
+ public boolean getXMLSourceAbsent() {
+ return m_xmlSourceAbsent;
+ }
+
} // 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 c17c26ce4..dedbe211f 100644
--- a/src/main/java/org/apache/xalan/xslt/Process.java
+++ b/src/main/java/org/apache/xalan/xslt/Process.java
@@ -1073,7 +1073,35 @@ public class Process
transformer.transform(new StreamSource(reader), strResult);
}
else {
- transformer.transform(null, strResult);
+ DOMSource xslDomSource = null;
+
+ if (null != xslFileName)
+ {
+ 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);
+ }
}
}
}
diff --git a/src/main/java/org/apache/xpath/XPath.java b/src/main/java/org/apache/xpath/XPath.java
index 67ece63e4..444b6f789 100644
--- a/src/main/java/org/apache/xpath/XPath.java
+++ b/src/main/java/org/apache/xpath/XPath.java
@@ -29,6 +29,7 @@ import javax.xml.transform.TransformerException;
import org.apache.xalan.processor.StylesheetHandler;
import org.apache.xalan.res.XSLMessages;
+import org.apache.xalan.templates.ElemCopyOf;
import org.apache.xalan.templates.ElemTemplateElement;
import org.apache.xalan.templates.XMLNSDecl;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
@@ -762,13 +763,38 @@ public class XPath implements Serializable, ExpressionOwner
if (m_mainExp instanceof LocPathIterator) {
LocPathIterator locPathIterator = (LocPathIterator)m_mainExp;
- DTMCursorIterator dtmIter = null;
- try {
+ DTMCursorIterator dtmIter = null;
+ String xpathExprStr = null;
+
+ try {
+ ExpressionNode exprNode = m_mainExp.getExpressionOwner();
+ if (exprNode instanceof ElemCopyOf) {
+ ElemCopyOf elemCopyOf = (ElemCopyOf)exprNode;
+ boolean isXmlSourceAbsent = elemCopyOf.getXMLSourceAbsent();
+ XPath elemCopyOfSelect = elemCopyOf.getSelect();
+ xpathExprStr = elemCopyOfSelect.getPatternString();
+
+ // An XPath expression string, starting with character '$'
+ // means that an XPath expression is a variable reference.
+
+ if (isXmlSourceAbsent && !xpathExprStr.startsWith("$")) {
+ contextNode = DTM.NULL;
+ }
+ }
+ else {
+ // REVISIT : Other XSL template elements needs to be handled
+ }
+
dtmIter = locPathIterator.asIterator(xctxt, contextNode);
}
catch (ClassCastException ex) {
isProcessAsNodeset = false;
}
+ catch (Exception ex) {
+ String xpathExprStrErr = ((xpathExprStr != null) ? " " + xpathExprStr : "");
+ throw new TransformerException("XPTY0004 : An error occured while evaluating an XPath expression" +
+ xpathExprStrErr + ".", srcLocator);
+ }
}
try {
diff --git a/src/main/java/org/apache/xpath/compiler/XPathParser.java b/src/main/java/org/apache/xpath/compiler/XPathParser.java
index c0ebd1fb7..d79b764f5 100644
--- a/src/main/java/org/apache/xpath/compiler/XPathParser.java
+++ b/src/main/java/org/apache/xpath/compiler/XPathParser.java
@@ -336,7 +336,75 @@ public class XPathParser
Expr();
if (null != m_token)
- {
+ {
+ // Retry once again, by parenthesizing the original
+ // XPath expression.
+
+ boolean isTrySecondTime = true;
+
+ String newExpression = null;
+
+ if (!(expression.startsWith("(") && expression.endsWith(")"))) {
+ String[] strArr = expression.split(",");
+ if (strArr.length > 1) {
+ boolean fl1 = true;
+ for (int idx = 0; idx < strArr.length; idx++) {
+ String str1 = strArr[idx];
+ if (!XslTransformEvaluationHelper.isStrHasBalancedParentheses(str1, '(', ')')) {
+ fl1 = false;
+ }
+ }
+
+ if (fl1) {
+ newExpression = "(" + expression + ")";
+ }
+ }
+ }
+
+ if (newExpression != null) {
+ (m_ops.m_tokenQueue).removeAllElements();
+ lexer = new Lexer(compiler, namespaceContext, this);
+ lexer.tokenize(newExpression);
+
+ m_ops.setOp(0,OpCodes.OP_XPATH);
+ m_ops.setOp(OpMap.MAPINDEX_LENGTH,2);
+
+ try {
+ nextToken();
+
+ m_isXPathExprBeginParse = true;
+
+ Expr();
+
+ if (null != m_token)
+ {
+ String extraTokens = "";
+
+ while (null != m_token)
+ {
+ extraTokens += "'" + m_token + "'";
+
+ nextToken();
+
+ if (null != m_token)
+ extraTokens += ", ";
+ }
+
+ error(XPATHErrorResources.ER_EXTRA_ILLEGAL_TOKENS,
+ new Object[]{ extraTokens });
+ }
+ }
+ catch (org.apache.xpath.XPathProcessorException e)
+ {
+ if(CONTINUE_AFTER_FATAL_ERROR.equals(e.getMessage()))
+ {
+ initXPath(compiler, "/..", namespaceContext, false);
+ }
+ else
+ throw e;
+ }
+ }
+
String extraTokens = "";
while (null != m_token)
@@ -349,8 +417,10 @@ public class XPathParser
extraTokens += ", ";
}
- error(XPATHErrorResources.ER_EXTRA_ILLEGAL_TOKENS,
- new Object[]{ extraTokens });
+ if (!isTrySecondTime) {
+ error(XPATHErrorResources.ER_EXTRA_ILLEGAL_TOKENS,
+ new Object[]{ extraTokens });
+ }
}
}
@@ -1722,7 +1792,7 @@ public class XPathParser
handleXPathParseNamedFuncRefWithoutNSQual(opPos);
}
else {
- ExprSingle();
+ ExprSingle();
}
}
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 2a1a6625d..71974d8fe 100644
--- a/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
+++ b/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
@@ -29,6 +29,7 @@ import java.time.OffsetDateTime;
import java.util.Date;
import java.util.List;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
@@ -119,8 +120,10 @@ public class XslTransformTestsUtil extends FileComparisonUtil {
if (m_initTemplateName != null) {
m_xslTransformerFactory.setAttribute(XalanProperties.INIT_TEMPLATE, m_initTemplateName);
}
+
+ StreamSource xsltStreamSrc = new StreamSource(xslDocumentUriStr);
- Transformer transformer = m_xslTransformerFactory.newTransformer(new StreamSource(xslDocumentUriStr));
+ Transformer transformer = m_xslTransformerFactory.newTransformer(xsltStreamSrc);
setXslTransformProperties(transformer);
@@ -138,7 +141,16 @@ public class XslTransformTestsUtil extends FileComparisonUtil {
xmlDomSrc = new DOMSource(node, xmlDocumentUriStr);
}
- transformer.transform(xmlDomSrc, new StreamResult(resultStrWriter));
+ Source xmlInpSrc = null;
+ if ((m_initTemplateName != null) && (xmlFilePath == null)) {
+ xmlInpSrc = xsltStreamSrc;
+ ((TransformerImpl)transformer).setXMLSourceAbsent(true);
+ }
+ else {
+ xmlInpSrc = xmlDomSrc;
+ }
+
+ transformer.transform(xmlInpSrc, new StreamResult(resultStrWriter));
if (xslTransformErrHandler != null) {
List<String> trfErrorList = xslTransformErrHandler.getTrfErrorList();
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 6b3845c95..f2295a830 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
@@ -30,6 +30,7 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -37,6 +38,7 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.xalan.tests.util.XslTestsErrorHandler;
import org.apache.xalan.tests.util.XslTransformTestsUtil;
+import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.transformer.XalanProperties;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -281,7 +283,6 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
try {
m_xslTransformerFactory.setErrorListener(xslTransformErrHandler);
-
if (m_initTemplateName != null) {
m_xslTransformerFactory.setAttribute(XalanProperties.INIT_TEMPLATE, m_initTemplateName);
}
@@ -300,7 +301,16 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
expErrCodeName = ((Element)nodeExpected).getAttribute("code");
}
- transformer.transform(xmlInpDomSource, new StreamResult(resultStrWriter));
+ Source xmlInpSrc = null;
+ if ((m_initTemplateName != null) && (xmlInpDomSource == null)) {
+ xmlInpSrc = xsltStreamSrc;
+ ((TransformerImpl)transformer).setXMLSourceAbsent(true);
+ }
+ else {
+ xmlInpSrc = xmlInpDomSource;
+ }
+
+ transformer.transform(xmlInpSrc, new StreamResult(resultStrWriter));
if (EXPECTED_NODE_KIND_ERROR.equals(expectedNodeKindName)) {
if ((trfErrorList.size() > 0) || (trfFatalErrorList.size() > 0)) {
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_analyze-string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_analyze-string-test-set_result.xml
index f1b9a3242..2abe38b79 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_analyze-string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_analyze-string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:29Z" fail="19" name="analyze-string" pass="33" skipped="5" statusUnknown="1" totalRun="58">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:33Z" fail="19" name="analyze-string" pass="33" skipped="5" statusUnknown="1" totalRun="58">
<testResult status="pass" testName="analyze-string-001"/>
<testResult status="pass" testName="analyze-string-002"/>
<testResult status="pass" testName="analyze-string-003"/>
@@ -64,7 +64,8 @@
<outResult>
<errTrace>Variable v1 is directly or indirectly referencing itself!</errTrace>
<errTrace>Variable $v1 accessed before it is bound!.</errTrace>
- <errTrace>Extra illegal tokens: '"s "', '10', 'Grand', '", mister"'</errTrace>
+ <errTrace>Expected ), but found: "s "</errTrace>
+ <errTrace>java.lang.ClassCastException: org.apache.xpath.objects.XNumber cannot be cast to java.lang.String</errTrace>
</outResult>
</testResult>
<testResult status="pass" testName="analyze-string-093"/>
@@ -88,9 +89,7 @@
</outResult>
</testResult>
<testResult status="fail" testName="analyze-string-098">
- <outResult>
- <errTrace>java.lang.NullPointerException</errTrace>
- </outResult>
+ <outResult/>
</testResult>
<testResult status="fail" testName="analyze-string-099">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_apply-templates-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_apply-templates-test-set_result.xml
index 2ec532eb3..5a0225c49 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_apply-templates-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_apply-templates-test-set_result.xml
@@ -1,11 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:31Z" fail="26" name="apply-templates" pass="22" skipped="2" statusUnknown="0" totalRun="50">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:36Z" fail="26" name="apply-templates" pass="22" skipped="2" statusUnknown="0" totalRun="50">
<testResult status="fail" testName="apply-templates-001">
- <outResult>
- <errTrace>java.lang.NullPointerException</errTrace>
- </outResult>
+ <outResult><?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</outResult>
</testResult>
<testResult status="fail" testName="apply-templates-002">
- <outResult><?xml version="1.0" encoding="UTF-8"?></outResult>
+ <outResult><?xml version="1.0" encoding="UTF-8"?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</outResult>
</testResult>
<testResult status="pass" testName="conflict-resolution-0101"/>
<testResult status="pass" testName="conflict-resolution-0102a"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_attribute-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_attribute-test-set_result.xml
index 069c7802b..1d29c72aa 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_attribute-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_attribute-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:36Z" fail="11" name="attribute" pass="7" skipped="0" statusUnknown="3" totalRun="21">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:40Z" fail="11" name="attribute" pass="7" skipped="0" statusUnknown="3" totalRun="21">
<testResult status="fail" testName="attribute-0001"/>
<testResult status="fail" testName="attribute-0002">
<outResult/>
@@ -15,10 +15,7 @@
<outResult>
<errTrace>Attempting to generate a namespace prefix with a null URI</errTrace>
<errTrace>Prefix must resolve to a namespace: http</errTrace>
- <errTrace>Extra illegal tokens: '{', '/', '/', 'www.ns0.com', '}', 'Attr0', '=', '"Hello"'</errTrace>
- <errTrace>Extra illegal tokens: '{', '}', 'Attr1', '=', '"Whatsup"'</errTrace>
<errTrace>Prefix must resolve to a namespace: http</errTrace>
- <errTrace>Extra illegal tokens: '{', '/', '/', 'ped.test.com', '}', 'Attr2', '=', '"Goodbye"'</errTrace>
</outResult>
</testResult>
<testResult testName="attribute-0701"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_axes-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_axes-test-set_result.xml
index a95a9f123..8117a8596 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_axes-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_axes-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:49Z" fail="28" name="axes" pass="173" skipped="0" statusUnknown="0" totalRun="201">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:54Z" fail="28" name="axes" pass="173" skipped="0" statusUnknown="0" totalRun="201">
<testResult status="pass" testName="axes-001"/>
<testResult status="pass" testName="axes-002"/>
<testResult status="pass" testName="axes-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_boolean-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_boolean-test-set_result.xml
index 36bd4aabd..418804a55 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_boolean-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_boolean-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:03Z" fail="23" name="boolean" pass="89" skipped="0" statusUnknown="0" totalRun="112">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:10Z" fail="23" name="boolean" pass="89" skipped="0" statusUnknown="0" totalRun="112">
<testResult status="pass" testName="boolean-001"/>
<testResult status="pass" testName="boolean-002"/>
<testResult status="pass" testName="boolean-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_call-template-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_call-template-test-set_result.xml
index d83dfe0d3..42e9000b1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_call-template-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_call-template-test-set_result.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:38Z" fail="14" name="call-template" pass="25" skipped="1" statusUnknown="2" totalRun="42">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:42Z" fail="14" name="call-template" pass="25" skipped="1" statusUnknown="2" totalRun="42">
<testResult status="fail" testName="call-template-0001">
<outResult>
- <errTrace>java.lang.NullPointerException</errTrace>
+ <errTrace>XPTY0004 : An error occured while evaluating an XPath expression ancestor-or-self::*.</errTrace>
</outResult>
</testResult>
<testResult status="pass" testName="call-template-0101"/>
@@ -33,7 +33,6 @@
</testResult>
<testResult status="fail" testName="call-template-0111">
<outResult>
- <errTrace>Extra illegal tokens: '!', '$', 'in'</errTrace>
<errTrace>XTTE0590 : The required item type of the value of parameter in is xs:string. The supplied value doesn't match the expected item type.</errTrace>
</outResult>
</testResult>
@@ -56,7 +55,6 @@
<errTrace>Illegal value: Q{}pvar2 used for QNAME attribute: name</errTrace>
<errTrace>Illegal value: Q{http://0702.com/}pvar1 used for QNAME attribute: name</errTrace>
<errTrace>Prefix must resolve to a namespace: http</errTrace>
- <errTrace>Extra illegal tokens: '{', '/', '/', '0702.com', '/', '}', 'pvar1'</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
</testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_castable-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_castable-test-set_result.xml
index d24496fc3..ebad46d51 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_castable-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_castable-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:54Z" fail="9" name="castable" pass="0" skipped="0" statusUnknown="0" totalRun="9">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:00Z" fail="9" name="castable" pass="0" skipped="0" statusUnknown="0" totalRun="9">
<testResult status="fail" testName="castable-001"/>
<testResult status="fail" testName="castable-002">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_character-map-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_character-map-test-set_result.xml
index a876ffb8d..1825c10dd 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_character-map-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_character-map-test-set_result.xml
@@ -1,36 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:49Z" fail="18" name="character-map" pass="1" skipped="0" statusUnknown="10" totalRun="29">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:54Z" fail="18" name="character-map" pass="1" skipped="0" statusUnknown="10" totalRun="29">
<testResult status="fail" testName="character-map-001">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'ab', '\', '[', 'C', '\', ']', 'de', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="character-map-002">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'ab', '\', '[', 'C', '\', ']', 'de', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="character-map-003">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'ab', '\', '{', 'C', '\', '}', 'de', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="character-map-004">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'ab', '\', '[', 'C', '\', ']', 'de', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="character-map-005">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', '\', '[', 'A', '\', ']', 'b', '\', '{', 'C', '\', '}', 'de', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
@@ -41,14 +36,12 @@
<testResult status="fail" testName="character-map-008">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', '\', '[', 'A', '\', ']', '\', '[', 'B', '\', ']', 'cde', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="character-map-009">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'z-linkage', '\', '.html', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
@@ -66,7 +59,6 @@
<testResult status="fail" testName="character-map-017">
<outResult>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', 'te', '\', '[', 'X', '\', ']', 't', '/', 'html;', '\', '[', 'C', '\', ']', 'harset', '=', 'UTF-8', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
@@ -87,9 +79,7 @@
</testResult>
<testResult status="fail" testName="character-map-023">
<outResult>
- <errTrace>Extra illegal tokens: 'World'</errTrace>
<errTrace>A location path was expected, but the following token was encountered: [</errTrace>
- <errTrace>Extra illegal tokens: '[', '""', ']', '<', 'GT', '<', 'GT', '[', '""', ']'</errTrace>
<errTrace>java.lang.RuntimeException: Programmer's assertion in getNextStepPos: unknown stepType: -1</errTrace>
</outResult>
</testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_choose-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_choose-test-set_result.xml
index 4e9647fa9..6910a5fef 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_choose-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_choose-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:39Z" fail="3" name="choose" pass="17" skipped="0" statusUnknown="4" totalRun="24">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:43Z" fail="3" name="choose" pass="17" skipped="0" statusUnknown="4" totalRun="24">
<testResult status="pass" testName="choose-0101"/>
<testResult status="pass" testName="choose-0102"/>
<testResult status="fail" testName="choose-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_copy-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_copy-test-set_result.xml
index 761197551..313308dd9 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_copy-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_copy-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:41Z" fail="38" name="copy" pass="16" skipped="0" statusUnknown="6" totalRun="60">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:46Z" fail="38" name="copy" pass="16" skipped="0" statusUnknown="6" totalRun="60">
<testResult status="fail" testName="copy-0101"/>
<testResult status="pass" testName="copy-0102"/>
<testResult status="fail" testName="copy-0103"/>
@@ -10,7 +10,6 @@
<testResult status="fail" testName="copy-0105">
<outResult>
<errTrace>Extra illegal tokens: 'processing-instruction', '(', ')|', 'text', '(', ')'</errTrace>
- <errTrace>Extra illegal tokens: 'processing-instruction', '(', ')|', 'text', '(', ')'</errTrace>
</outResult>
</testResult>
<testResult status="pass" testName="copy-0201"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_expression-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_expression-test-set_result.xml
index a7c843271..237fc4e89 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_expression-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_expression-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:54Z" fail="0" name="expression" pass="9" skipped="0" statusUnknown="1" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:00Z" fail="0" name="expression" pass="9" skipped="0" statusUnknown="1" totalRun="10">
<testResult status="pass" testName="expression-0101"/>
<testResult status="pass" testName="expression-0301"/>
<testResult status="pass" testName="expression-0302"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-each-group-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-each-group-test-set_result.xml
index 5ade5788c..c903d9ca2 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-each-group-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-each-group-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:32Z" fail="34" name="for-each-group" pass="37" skipped="4" statusUnknown="2" totalRun="77">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:37Z" fail="33" name="for-each-group" pass="39" skipped="4" statusUnknown="2" totalRun="78">
<testResult status="pass" testName="for-each-group-001"/>
<testResult status="skipped" xsltVersion="2.0 only"/>
<testResult status="fail" testName="for-each-group-002">
@@ -26,7 +26,7 @@
<testResult status="fail" testName="for-each-group-026"/>
<testResult status="fail" testName="for-each-group-027"/>
<testResult status="fail" testName="for-each-group-028"/>
- <testResult status="fail" testName="for-each-group-029"/>
+ <testResult status="pass" testName="for-each-group-029"/>
<testResult status="pass" testName="for-each-group-030"/>
<testResult status="pass" testName="for-each-group-031"/>
<testResult status="pass" testName="for-each-group-032"/>
@@ -69,13 +69,11 @@
<testResult status="pass" testName="for-each-group-056"/>
<testResult status="fail" testName="for-each-group-059">
<outResult>
- <errTrace>Extra illegal tokens: ',', '1', 'to', '10', ',', ''b'', ',', '11', 'to', '20'</errTrace>
<errTrace>java.lang.ClassCastException: org.apache.xpath.objects.XString cannot be cast to org.apache.xpath.objects.XMLNodeCursorImpl</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="for-each-group-060">
<outResult>
- <errTrace>Extra illegal tokens: ',', '1', 'to', '10', ',', ''b'', ',', '11', 'to', '20'</errTrace>
<errTrace>java.lang.ClassCastException: org.apache.xpath.objects.XString cannot be cast to org.apache.xpath.objects.XMLNodeCursorImpl</errTrace>
</outResult>
</testResult>
@@ -121,5 +119,6 @@
</outResult>
</testResult>
<testResult status="fail" testName="for-each-group-082"/>
- <testResult testName="for-each-group-083"/>
+ <testResult status="pass" testName="for-each-group-083"/>
+ <testResult testName="for-each-group-084"/>
</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-test-set_result.xml
index e754ab46a..1ff136e34 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_for-test-set_result.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:55Z" fail="3" name="for" pass="0" skipped="0" statusUnknown="1" totalRun="4">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:01Z" fail="2" name="for" pass="1" skipped="0" statusUnknown="1" totalRun="4">
<testResult status="fail" testName="for-001"/>
<testResult status="fail" testName="for-002"/>
- <testResult status="fail" testName="for-003"/>
+ <testResult status="pass" testName="for-003"/>
<testResult testName="for-004"/>
</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_function-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_function-test-set_result.xml
index ed0057ffe..0d3d6a71e 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_function-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_function-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:47Z" fail="28" name="function" pass="20" skipped="4" statusUnknown="18" totalRun="70">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:52Z" fail="28" name="function" pass="20" skipped="4" statusUnknown="18" totalRun="70">
<testResult status="fail" testName="function-0001">
<outResult>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}format-integer()</errTrace>
@@ -15,7 +15,6 @@
</testResult>
<testResult status="fail" testName="function-0003">
<outResult>
- <errTrace>Extra illegal tokens: '(', '-', '2', ')'</errTrace>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}function-name()</errTrace>
<errTrace>function token not found.</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
@@ -23,7 +22,6 @@
</testResult>
<testResult status="fail" testName="function-0004">
<outResult>
- <errTrace>Extra illegal tokens: '(', '1.23456', ')'</errTrace>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}function-name()</errTrace>
<errTrace>function token not found.</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
@@ -84,8 +82,7 @@
<testResult status="pass" testName="function-0602"/>
<testResult status="fail" testName="function-0701">
<outResult>
- <errTrace>Extra illegal tokens: ')', '=', '0', ']'</errTrace>
- <errTrace>Variable $empty-board accessed before it is bound!.</errTrace>
+ <errTrace>XPTY0004 : The function call result for function {http://www.wrox.com/5067/tour}place-knight(), doesn't match the declared function result type xs:integer*.</errTrace>
</outResult>
</testResult>
<testResult status="fail" testName="function-0901"/>
@@ -108,12 +105,7 @@
<testResult status="fail" testName="function-1009"/>
<testResult testName="function-1011"/>
<testResult status="pass" testName="function-1012"/>
- <testResult status="fail" testName="function-1013">
- <outResult>
- <errTrace>Extra illegal tokens: ')', '=', '0', ']', '/', '..', '/', '..', '/', '..', '/', '..'</errTrace>
- <errTrace>org.apache.xml.utils.WrappedRuntimeException: Variable $x accessed before it is bound!.</errTrace>
- </outResult>
- </testResult>
+ <testResult status="fail" testName="function-1013"/>
<testResult status="fail" testName="function-1014">
<outResult>
<errTrace>java.lang.RuntimeException: ElemTemplateElement error: Found more than one stylesheet function named: f:maximum</errTrace>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_higher-order-functions-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_higher-order-functions-test-set_result.xml
index 997a068a5..9e1ae5b28 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_higher-order-functions-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_higher-order-functions-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:02Z" fail="18" name="higher-order-functions" pass="6" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:09Z" fail="18" name="higher-order-functions" pass="6" skipped="0" statusUnknown="1" totalRun="25">
<testResult status="pass" testName="higher-order-functions-001"/>
<testResult status="fail" testName="higher-order-functions-002">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_iterate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_iterate-test-set_result.xml
index a501602cf..0b9e2349b 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_iterate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_iterate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:43Z" fail="32" name="iterate" pass="8" skipped="0" statusUnknown="4" totalRun="44">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:48Z" fail="32" name="iterate" pass="8" skipped="0" statusUnknown="4" totalRun="44">
<testResult status="pass" testName="iterate-001"/>
<testResult status="pass" testName="iterate-002"/>
<testResult status="pass" testName="iterate-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_math-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_math-test-set_result.xml
index 0af24d97a..cb40a7237 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_math-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_math-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:57Z" fail="34" name="math" pass="25" skipped="0" statusUnknown="89" totalRun="148">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:03Z" fail="33" name="math" pass="26" skipped="0" statusUnknown="89" totalRun="148">
<testResult testName="math-0101"/>
<testResult status="fail" testName="math-0102">
<outResult>
@@ -206,7 +206,7 @@
<testResult status="fail" testName="math-3310"/>
<testResult status="fail" testName="math-3310a"/>
<testResult status="pass" testName="math-3311"/>
- <testResult status="fail" testName="math-3312"/>
+ <testResult status="pass" testName="math-3312"/>
<testResult status="fail" testName="math-3313"/>
<testResult status="fail" testName="math-3314"/>
<testResult status="fail" testName="math-3315">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_node-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_node-test-set_result.xml
index 05bc4a767..3758d4bbf 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_node-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_node-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:05Z" fail="17" name="node" pass="15" skipped="0" statusUnknown="0" totalRun="32">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:13Z" fail="17" name="node" pass="15" skipped="0" statusUnknown="0" totalRun="32">
<testResult status="pass" testName="node-0101"/>
<testResult status="pass" testName="node-0201"/>
<testResult status="fail" testName="node-0301">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_nodetest-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_nodetest-test-set_result.xml
index 91e4f86b0..e3478e05f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_nodetest-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_nodetest-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:00Z" fail="36" name="nodetest" pass="2" skipped="0" statusUnknown="0" totalRun="38">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:06Z" fail="36" name="nodetest" pass="2" skipped="0" statusUnknown="0" totalRun="38">
<testResult status="pass" testName="nodetest-001"/>
<testResult status="pass" testName="nodetest-002"/>
<testResult status="fail" testName="nodetest-003">
@@ -94,7 +94,6 @@
<errTrace>Failed calling setNamespace method</errTrace>
<errTrace>Failed calling setSchemaLocation method</errTrace>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}schema-element()</errTrace>
- <errTrace>Extra illegal tokens: 'schema-element', '(', 'http://www.schemanodetest.example.com/ns/various', ':', 'complexMixedUserElem', ')', '/', '@', 'age'</errTrace>
<errTrace>function token not found.</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
@@ -150,7 +149,6 @@
<errTrace>Failed calling setNamespace method</errTrace>
<errTrace>Failed calling setSchemaLocation method</errTrace>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}schema-element()</errTrace>
- <errTrace>Extra illegal tokens: 'schema-element', '(', 'http://www.schemanodetest.example.com/ns/subgroup', ':', 'book', ')', '/', 'http://www.schemanodetest.example.com/ns/subgroup', ':', 'price'</errTrace>
<errTrace>function token not found.</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
@@ -192,16 +190,7 @@
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
</testResult>
- <testResult status="fail" testName="nodetest-027">
- <outResult>
- <errTrace>Failed calling setNamespace method</errTrace>
- <errTrace>Failed calling setSchemaLocation method</errTrace>
- <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}schema-attribute()</errTrace>
- <errTrace>Extra illegal tokens: ',', 'schema-attribute', '(', 'http://www.schemanodetest.example.com/ns/various', ':', 'listParts', ')'</errTrace>
- <errTrace>function token not found.</errTrace>
- <errTrace>java.lang.NullPointerException</errTrace>
- </outResult>
- </testResult>
+ <testResult status="fail" testName="nodetest-027"/>
<testResult status="fail" testName="nodetest-028">
<outResult>
<errTrace>Failed calling setNamespace method</errTrace>
@@ -230,7 +219,6 @@
<errTrace>Failed calling setNamespace method</errTrace>
<errTrace>Failed calling setSchemaLocation method</errTrace>
<errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}schema-attribute()</errTrace>
- <errTrace>Extra illegal tokens: 'schema-attribute', '(', 'http://www.schemanodetest.example.com/ns/various', ':', 'count', ')', '/', 'self', '::', 'node', '(', ')', '/', 'name', '(', ')'</errTrace>
<errTrace>function token not found.</errTrace>
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_path-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_path-test-set_result.xml
index 2e41641c5..1c61d8c1f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_path-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_path-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:01Z" fail="3" name="path" pass="7" skipped="0" statusUnknown="0" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:07Z" fail="3" name="path" pass="7" skipped="0" statusUnknown="0" totalRun="10">
<testResult status="pass" testName="path-001"/>
<testResult status="pass" testName="path-002"/>
<testResult status="pass" testName="path-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_predicate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_predicate-test-set_result.xml
index 25eb162f5..9563bfe1c 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_predicate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_predicate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:01Z" fail="7" name="predicate" pass="49" skipped="0" statusUnknown="1" totalRun="57">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:08Z" fail="7" name="predicate" pass="49" skipped="0" statusUnknown="1" totalRun="57">
<testResult status="fail" testName="predicate-001"/>
<testResult status="fail" testName="predicate-002"/>
<testResult status="fail" testName="predicate-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_sequence-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_sequence-test-set_result.xml
index dc0de7af2..331d169b3 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_sequence-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_sequence-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:45Z" fail="19" name="sequence" pass="7" skipped="0" statusUnknown="1" totalRun="27">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:50Z" fail="18" name="sequence" pass="8" skipped="0" statusUnknown="1" totalRun="27">
<testResult status="fail" testName="sequence-0101"/>
<testResult status="fail" testName="sequence-0102"/>
<testResult status="pass" testName="sequence-0103"/>
@@ -38,7 +38,7 @@
<testResult status="pass" testName="sequence-0117"/>
<testResult status="pass" testName="sequence-0118"/>
<testResult status="fail" testName="sequence-0119"/>
- <testResult status="fail" testName="sequence-0120"/>
+ <testResult status="pass" testName="sequence-0120"/>
<testResult status="pass" testName="sequence-0121"/>
<testResult status="fail" testName="sequence-0122"/>
<testResult status="fail" testName="sequence-0123"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_string-test-set_result.xml
index addefd967..92aa302e2 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:57:05Z" fail="6" name="string" pass="128" skipped="0" statusUnknown="2" totalRun="136">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:13:13Z" fail="6" name="string" pass="128" skipped="0" statusUnknown="2" totalRun="136">
<testResult status="pass" testName="string-001"/>
<testResult status="pass" testName="string-002"/>
<testResult status="pass" testName="string-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_try-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_try-test-set_result.xml
index f90314117..ee0424ec9 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_try-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/_try-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-18T06:56:35Z" fail="21" name="try" pass="11" skipped="5" statusUnknown="5" totalRun="42">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-05-19T17:12:39Z" fail="21" name="try" pass="11" skipped="5" statusUnknown="5" totalRun="42">
<testResult status="pass" testName="try-001"/>
<testResult status="fail" testName="try-002">
<outResult/>
@@ -42,9 +42,7 @@
</outResult>
</testResult>
<testResult status="fail" testName="try-019">
- <outResult>
- <errTrace>Extra illegal tokens: ',', '$', 'http://www.w3.org/2005/xqt-errors', ':', 'code', ',', '$', 'http://www.w3.org/2005/xqt-errors', ':', 'description', ',', '$', 'http://www.w3.org/2005/xqt-errors', ':', 'value', ',', 'tokenize', '(', '$', 'http://www.w3.org/2005/xqt-errors', ':', 'module', ',', ''/'', ')', '[', 'last', '(', ')', ']', ',', '(', ''#'', '||', '$', '||', 'http://www.w3.org/2005/xqt-errors', ':', 'line-number||', ''#'', ')', ',', '$', 'http://www.w3.org/2005/ [...]
- </outResult>
+ <outResult/>
</testResult>
<testResult status="pass" testName="try-020"/>
<testResult status="fail" testName="try-021">
diff --git a/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java b/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java
index c33cc195b..589f90973 100644
--- a/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java
+++ b/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java
@@ -77,5 +77,15 @@ public class XPathSequenceConstructorMiscTests extends XslTransformTestsUtil {
runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
}
+
+ @Test
+ public void xslSequenceConstructorMiscTest4() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test4.xsl";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test4.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test4.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
}
diff --git a/src/test/java/org/apache/xalan/tests/xslt3/XslInitialTemplateTests.java b/src/test/java/org/apache/xalan/tests/xslt3/XslInitialTemplateTests.java
index aa8a5bb7c..e8b823140 100644
--- a/src/test/java/org/apache/xalan/tests/xslt3/XslInitialTemplateTests.java
+++ b/src/test/java/org/apache/xalan/tests/xslt3/XslInitialTemplateTests.java
@@ -100,15 +100,7 @@ public class XslInitialTemplateTests extends XslTransformTestsUtil {
@Test
public void xslInitialTemplateTest5() {
- /**
- * We don't have an XML input document available for this XSL
- * transformation. Name of an XSL initial template is provided.
- * An XSL transformation shall take place with an absent initial
- * focus.
- */
-
- String xmlFilePath = null;
-
+ String xmlFilePath = null;
String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test5.xsl";
String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test5.out";
@@ -117,5 +109,17 @@ public class XslInitialTemplateTests extends XslTransformTestsUtil {
runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
}
+
+ @Test
+ public void xslInitialTemplateTest6() {
+ String xmlFilePath = null;
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test6.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test6.out";
+
+ m_initTemplateName = "main";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
}
diff --git a/src/test/resources/xpath_sequence_constructor/misc/gold/test4.out b/src/test/resources/xpath_sequence_constructor/misc/gold/test4.out
new file mode 100644
index 000000000..cac4064b8
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/gold/test4.out
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ <item>4</item>
+ <item>5</item>
+</result>
diff --git a/src/test/resources/xpath_sequence_constructor/misc/test4.xsl b/src/test/resources/xpath_sequence_constructor/misc/test4.xsl
new file mode 100644
index 000000000..25eb5ad33
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/test4.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- An XSL stylesheet test case, to test XPath literal sequence
+ constructor expression without beginning and trailing parenthesis. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <result>
+ <xsl:for-each select="1,2,3,4,5">
+ <item>
+ <xsl:value-of select="."/>
+ </item>
+ </xsl:for-each>
+ </result>
+ </xsl:template>
+
+ <!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+</xsl:stylesheet>
diff --git a/src/test/resources/xsl_initial_template/gold/test6.out b/src/test/resources/xsl_initial_template/gold/test6.out
new file mode 100644
index 000000000..b12f5b78e
--- /dev/null
+++ b/src/test/resources/xsl_initial_template/gold/test6.out
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+ <id>1</id>
+ <id>2</id>
+ <id>3</id>
+</result>
diff --git a/src/test/resources/xsl_initial_template/test5.xsl b/src/test/resources/xsl_initial_template/test5.xsl
index 9e7718e79..46ffc5ded 100644
--- a/src/test/resources/xsl_initial_template/test5.xsl
+++ b/src/test/resources/xsl_initial_template/test5.xsl
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="3.0">
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- An XSL stylesheet test case, to test XSL transformation with
+ an initial named template. -->
<xsl:output method="xml" indent="yes"/>
@@ -14,4 +19,22 @@
</result>
</xsl:template>
+ <!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
</xsl:stylesheet>
diff --git a/src/test/resources/xsl_initial_template/test6.xsl b/src/test/resources/xsl_initial_template/test6.xsl
new file mode 100644
index 000000000..5fb3fdc91
--- /dev/null
+++ b/src/test/resources/xsl_initial_template/test6.xsl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- An XSL stylesheet test case, to test XSL transformation with
+ an initial named template. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:variable name="var1">
+ <info>
+ <a>
+ <id>1</id>
+ </a>
+ <b>
+ <id>2</id>
+ </b>
+ <c>
+ <id>3</id>
+ </c>
+ </info>
+ </xsl:variable>
+
+ <xsl:template name="main">
+ <result>
+ <xsl:copy-of select="$var1//id"/>
+ </result>
+ </xsl:template>
+
+ <!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+
+</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org