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/08/08 16:36:10 UTC
(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing few xalan-j xslt 3.0 implementation improvements
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 f96e679bb committing few xalan-j xslt 3.0 implementation improvements
f96e679bb is described below
commit f96e679bbe32ac21e37ba7a29fd30e58c18b4312
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Fri Aug 8 22:05:45 2025 +0530
committing few xalan-j xslt 3.0 implementation improvements
---
README | 8 +--
.../org/apache/xalan/templates/AVTPartXPath.java | 9 +--
.../org/apache/xalan/templates/ElemValueOf.java | 55 ++++++++++++------
.../xslt/util/XslTransformEvaluationHelper.java | 34 ++++++++---
.../xslt/util/XslTransformSharedDatastore.java | 8 ++-
src/main/java/org/apache/xpath/Expression.java | 12 ++--
.../org/apache/xpath/compiler/XPathParser.java | 42 +++++++++++++-
.../xpath/functions/FuncRoundHalfToEven.java | 17 ++++--
.../java/org/apache/xpath/operations/Equals.java | 6 +-
src/main/java/org/apache/xpath/operations/Gt.java | 4 +-
src/main/java/org/apache/xpath/operations/Gte.java | 4 +-
src/main/java/org/apache/xpath/operations/Lt.java | 4 +-
src/main/java/org/apache/xpath/operations/Lte.java | 4 +-
src/main/java/org/apache/xpath/operations/Neg.java | 13 +++--
.../org/apache/xpath/operations/NotEquals.java | 4 +-
.../tests/w3c/xslt3/W3CXslTransformTestsUtil.java | 15 ++++-
.../w3c/xslt3/result/attr/_as-test-set_result.xml | 2 +-
.../w3c/xslt3/result/attr/_avt-test-set_result.xml | 2 +-
.../result/attr/_expand-text-test-set_result.xml | 2 +-
.../xslt3/result/attr/_match-test-set_result.xml | 2 +-
.../xslt3/result/attr/_select-test-set_result.xml | 2 +-
.../_xpath-default-namespace-test-set_result.xml | 2 +-
.../result/decl/_attribute-set-test-set_result.xml | 2 +-
.../result/decl/_character-map-test-set_result.xml | 2 +-
.../result/decl/_function-test-set_result.xml | 16 +++++-
.../result/decl/_variable-test-set_result.xml | 2 +-
.../xslt3/result/expr/_axes-test-set_result.xml | 6 +-
.../result/expr/_castable-test-set_result.xml | 2 +-
.../result/expr/_expression-test-set_result.xml | 2 +-
.../w3c/xslt3/result/expr/_for-test-set_result.xml | 2 +-
.../_higher-order-functions-test-set_result.xml | 2 +-
.../xslt3/result/expr/_math-test-set_result.xml | 15 ++---
.../result/expr/_nodetest-test-set_result.xml | 2 +-
.../xslt3/result/expr/_path-test-set_result.xml | 2 +-
.../result/expr/_predicate-test-set_result.xml | 2 +-
.../result/fn/_deep-equal-test-set_result.xml | 2 +-
.../result/fn/_format-number-test-set_result.xml | 2 +-
.../w3c/xslt3/result/fn/_key-test-set_result.xml | 2 +-
.../xslt3/result/fn/_position-test-set_result.xml | 2 +-
.../w3c/xslt3/result/fn/_root-test-set_result.xml | 2 +-
.../insn/_analyze-string-test-set_result.xml | 2 +-
.../insn/_apply-templates-test-set_result.xml | 4 +-
.../result/insn/_attribute-test-set_result.xml | 2 +-
.../result/insn/_call-template-test-set_result.xml | 2 +-
.../xslt3/result/insn/_choose-test-set_result.xml | 2 +-
.../xslt3/result/insn/_copy-test-set_result.xml | 4 +-
.../xslt3/result/insn/_element-test-set_result.xml | 2 +-
.../insn/_for-each-group-test-set_result.xml | 2 +-
.../xslt3/result/insn/_iterate-test-set_result.xml | 6 +-
.../result/insn/_sequence-test-set_result.xml | 2 +-
.../xslt3/result/insn/_sort-test-set_result.xml | 2 +-
.../w3c/xslt3/result/insn/_try-test-set_result.xml | 2 +-
.../result/insn/_xsl-document-test-set_result.xml | 2 +-
.../xslt3/result/misc/_regex-test-set_result.xml | 2 +-
.../xslt3/result/type/_boolean-test-set_result.xml | 4 +-
.../xslt3/result/type/_date-test-set_result.xml | 2 +-
.../xslt3/result/type/_node-test-set_result.xml | 2 +-
.../xslt3/result/type/_string-test-set_result.xml | 2 +-
.../result/w3c_xslt3_testsuite_xalan-j_result.xml | 14 ++---
.../xpath3/XPathSequenceConstructorMiscTests.java | 40 +++++++++++++
.../xpath_sequence_constructor/misc/gold/test6.out | 12 ++++
.../xpath_sequence_constructor/misc/gold/test7.out | 4 ++
.../xpath_sequence_constructor/misc/gold/test8.out | 1 +
.../xpath_sequence_constructor/misc/gold/test9.out | 1 +
.../xpath_sequence_constructor/misc/test6.xsl | 66 ++++++++++++++++++++++
.../xpath_sequence_constructor/misc/test7.xsl | 46 +++++++++++++++
.../xpath_sequence_constructor/misc/test8.xsl | 41 ++++++++++++++
.../xpath_sequence_constructor/misc/test9.xsl | 45 +++++++++++++++
68 files changed, 502 insertions(+), 132 deletions(-)
diff --git a/README b/README
index e54db992d..d7e187b05 100644
--- a/README
+++ b/README
@@ -17,7 +17,7 @@
Copyright 1999-2025 The Apache Software Foundation
-Document last modified : 2025-08-07
+Document last modified : 2025-08-08
Authors:
Gary Gregory <gg...@apache.org>
@@ -49,11 +49,11 @@ The Maven build results like following shall be produced:
[INFO] T E S T S
[INFO] -------------------------------------------------------
[INFO] Running org.apache.xalan.tests.main.AllXalanXSLT3Tests
-[INFO] Tests run: 1234, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 96.211 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
+[INFO] Tests run: 1238, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 40.248 s - in org.apache.xalan.tests.main.AllXalanXSLT3Tests
[INFO]
[INFO] Results:
[INFO]
-[INFO] Tests run: 1234, Failures: 0, Errors: 0, Skipped: 0
+[INFO] Tests run: 1238, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO]
[INFO] --- jar:3.3.0:jar (default-jar) @ xalan-java ---
@@ -62,7 +62,7 @@ The Maven build results like following shall be produced:
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 02:44 min
+[INFO] Total time: 02:13 min
If the user needs to run Xalan-J's XSLT 3.0 implementation via Java application code, the value of JVM's system property
diff --git a/src/main/java/org/apache/xalan/templates/AVTPartXPath.java b/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
index b03d0e292..01b3bc58c 100644
--- a/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
+++ b/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
@@ -20,6 +20,7 @@
*/
package org.apache.xalan.templates;
+import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
import org.apache.xml.utils.FastStringBuffer;
import org.apache.xpath.ExpressionNode;
import org.apache.xpath.XPath;
@@ -37,11 +38,10 @@ import xml.xpath31.processor.types.XSAnyType;
*/
public class AVTPartXPath extends AVTPart
{
- static final long serialVersionUID = -4460373807550527675L;
+ static final long serialVersionUID = -4460373807550527675L;
/**
* The XPath object contained in this part.
- * @serial
*/
private XPath m_xpath;
@@ -147,8 +147,9 @@ public class AVTPartXPath extends AVTPart
XObject xobj = m_xpath.execute(xctxt, context, nsNode);
if (xobj != null) {
- if (xobj instanceof XSAnyType) {
- ((XSAnyType)xobj).appendToFsb(buf);
+ if (xobj instanceof XSAnyType) {
+ String str1 = XslTransformEvaluationHelper.getStrVal(xobj);
+ buf.append(str1);
}
else {
xobj.appendToFsb(buf);
diff --git a/src/main/java/org/apache/xalan/templates/ElemValueOf.java b/src/main/java/org/apache/xalan/templates/ElemValueOf.java
index a392be3b6..225f75861 100644
--- a/src/main/java/org/apache/xalan/templates/ElemValueOf.java
+++ b/src/main/java/org/apache/xalan/templates/ElemValueOf.java
@@ -25,6 +25,7 @@ import javax.xml.transform.TransformerException;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xalan.xslt.util.XslTransformEvaluationHelper;
+import org.apache.xalan.xslt.util.XslTransformSharedDatastore;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMCursorIterator;
import org.apache.xml.dtm.DTMManager;
@@ -382,7 +383,7 @@ public class ElemValueOf extends ElemTemplateElement {
+ "'select' attribute and non-empty content.", srcLocator);
}
else {
- expr = m_selectExpression.getExpression();
+ expr = m_selectExpression.getExpression();
}
}
else {
@@ -390,13 +391,36 @@ public class ElemValueOf extends ElemTemplateElement {
return;
}
+
+ if ((XslTransformSharedDatastore.m_is_xsl_test_invocation) && (expr instanceof LocPathIterator)) {
+ // Support for, Xalan-J's test driver for W3C XSLT 3.0 test suite
+
+ LocPathIterator locPathIterator = (LocPathIterator)expr;
+
+ try {
+ DTMCursorIterator dtmIter = locPathIterator.asIterator(xctxt, current);
+
+ // If a non-empty node exists, return true else return false
+ if (dtmIter.nextNode() != DTM.NULL) {
+ (new XString("true")).dispatchCharactersEvents(rth);
+ }
+ else {
+ (new XString("false")).dispatchCharactersEvents(rth);
+ }
+
+ return;
+ }
+ catch (Exception ex) {
+ // NO OP
+ }
+ }
if (transformer.getDebug())
{
XObject obj = expr.execute(xctxt);
- transformer.getTraceManager().emitSelectedEvent(current, this,
- "select", m_selectExpression, obj);
+ transformer.getTraceManager().emitSelectedEvent(current, this, "select",
+ m_selectExpression, obj);
obj.dispatchCharactersEvents(rth);
}
else
@@ -461,7 +485,7 @@ public class ElemValueOf extends ElemTemplateElement {
}
}
else {
- strValue = ((XSAnyType)evalResult).stringValue();
+ strValue = XslTransformEvaluationHelper.getStrVal(evalResult);
}
}
else if (evalResult instanceof XMLNodeCursorImpl) {
@@ -599,16 +623,13 @@ public class ElemValueOf extends ElemTemplateElement {
try {
dtmIter = locPathIterator.asIterator(xctxt, current);
}
- catch (ClassCastException ex) {
- // no op
- }
catch (Exception ex) {
- // no op
- }
+ // NO OP
+ }
- if (dtmIter != null) {
- int nextNode;
+ if (dtmIter != null) {
StringBuffer strBuff = new StringBuffer();
+ int nextNode;
while ((nextNode = dtmIter.nextNode()) != DTM.NULL)
{
XMLNodeCursorImpl xdmNodeObj = new XMLNodeCursorImpl(nextNode, xctxt);
@@ -628,15 +649,15 @@ public class ElemValueOf extends ElemTemplateElement {
else {
resultStr = xdmNodeObj.str();
}
+
strBuff.append(resultStr + " ");
}
-
- String nodeSetStrValue = strBuff.toString();
+
+ String nodeSetStrValue = strBuff.toString();
if (nodeSetStrValue.length() > 1) {
- nodeSetStrValue = nodeSetStrValue.substring(0,
- nodeSetStrValue.length() - 1);
- (new XString(nodeSetStrValue)).dispatchCharactersEvents(rth);
- }
+ nodeSetStrValue = nodeSetStrValue.substring(0, nodeSetStrValue.length() - 1);
+ (new XString(nodeSetStrValue)).dispatchCharactersEvents(rth);
+ }
}
else {
String xpathPatternStr = m_selectExpression.getPatternString();
diff --git a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
index c2d52c345..dc8185b5f 100644
--- a/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
+++ b/src/main/java/org/apache/xalan/xslt/util/XslTransformEvaluationHelper.java
@@ -74,6 +74,7 @@ import org.w3c.dom.ls.LSSerializer;
import xml.xpath31.processor.types.XSAnyAtomicType;
import xml.xpath31.processor.types.XSAnyType;
import xml.xpath31.processor.types.XSBoolean;
+import xml.xpath31.processor.types.XSDecimal;
import xml.xpath31.processor.types.XSDouble;
import xml.xpath31.processor.types.XSNumericType;
import xml.xpath31.processor.types.XSUntyped;
@@ -169,19 +170,38 @@ public class XslTransformEvaluationHelper {
/**
* Given an XObject object reference, return the string value
- * of the object.
+ * for the object.
*/
- public static String getStrVal(XObject xObj) {
- String strVal = null;
+ public static String getStrVal(XObject xObj) {
- if (xObj instanceof XSAnyType) {
- strVal = ((XSAnyType)xObj).stringValue();
+ String result = null;
+
+ if (xObj instanceof XSDecimal) {
+ result = (((XSDecimal)xObj).getValue()).toPlainString();
+ int i = result.indexOf('.');
+ if (i > -1) {
+ // Delete trailing 0's to RHS of decimal point, for string value
+ String prefix = result.substring(0, i);
+ String suffix = result.substring(i + 1);
+ int suffixLength = suffix.length();
+ int j = suffixLength;
+ for (j = (suffixLength - 1); j > -1; j--) {
+ if (suffix.charAt(j) != '0') {
+ break;
+ }
+ }
+ suffix = suffix.substring(0, j + 1);
+ result = (suffix.length() > 0) ? (prefix + "." + suffix) : prefix;
+ }
+ }
+ else if (xObj instanceof XSAnyType) {
+ result = ((XSAnyType)xObj).stringValue();
}
else {
- strVal = xObj.str();
+ result = xObj.str();
}
- return strVal;
+ return result;
}
/**
diff --git a/src/main/java/org/apache/xalan/xslt/util/XslTransformSharedDatastore.java b/src/main/java/org/apache/xalan/xslt/util/XslTransformSharedDatastore.java
index 8333ff9a3..41e4c8a04 100644
--- a/src/main/java/org/apache/xalan/xslt/util/XslTransformSharedDatastore.java
+++ b/src/main/java/org/apache/xalan/xslt/util/XslTransformSharedDatastore.java
@@ -99,6 +99,11 @@ public class XslTransformSharedDatastore {
*/
public static XMLNodeCursorImpl m_xslDocumentEvaluationResult;
+ /**
+ * Class field, to support Xalan-J's test driver for W3C XSLT 3.0 test suite.
+ */
+ public static boolean m_is_xsl_test_invocation = false;
+
/**
* Method definition to reset the variable values specified
* within this class.
@@ -114,6 +119,7 @@ public class XslTransformSharedDatastore {
m_xpathCallingOpCode = Integer.MIN_VALUE;
m_xpathNamedFunctionRefSequence.clear();
m_xslDocumentEvaluationResult = null;
- }
+ m_is_xsl_test_invocation = false;
+ }
}
diff --git a/src/main/java/org/apache/xpath/Expression.java b/src/main/java/org/apache/xpath/Expression.java
index 8b25e94be..00aea9ebe 100644
--- a/src/main/java/org/apache/xpath/Expression.java
+++ b/src/main/java/org/apache/xpath/Expression.java
@@ -65,16 +65,14 @@ public abstract class Expression implements java.io.Serializable, ExpressionNode
*/
private ExpressionNode m_parent;
+ public static final String XS_SIMPLE_TYPE_NAME = "XS_SIMPLE_TYPE_NAME";
+
/**
- * XPath 3.1 support for, XPath.fixupVariables(..) action for feature
- * implementations like XPath function item, "for", "let", 'quantified'
- * expressions.
- *
- * We don't use, XalanJ XPath context's variable stack for this purpose.
+ * This class field implements support for, XPath.fixupVariables(..)
+ * function call for implementations like XPath function item, 'for',
+ * 'let', and quantified expressions.
*/
protected static List<QName> m_xpathVarList = new ArrayList<QName>();
-
- public static final String XS_SIMPLE_TYPE_NAME = "XS_SIMPLE_TYPE_NAME";
/**
* Tell if this expression or it's subexpressions can traverse outside
diff --git a/src/main/java/org/apache/xpath/compiler/XPathParser.java b/src/main/java/org/apache/xpath/compiler/XPathParser.java
index 0b6860f78..805030a0d 100644
--- a/src/main/java/org/apache/xpath/compiler/XPathParser.java
+++ b/src/main/java/org/apache/xpath/compiler/XPathParser.java
@@ -2896,6 +2896,42 @@ public class XPathParser
{
int opPos = m_ops.getOp(OpMap.MAPINDEX_LENGTH);
+ // XPath parse of, sequence of two or more 'if' expressions
+ m_prevTokQueueScanPosition = new TokenQueueScanPosition(m_queueMark, m_tokenChar, m_token);
+
+ StringBuffer strBuff = new StringBuffer();
+ while (m_token != null) {
+ if (tokenIs("and") || tokenIs("or")) {
+ strBuff.append(" " + m_token + " ");
+ }
+ else {
+ strBuff.append(m_token);
+ }
+
+ nextToken();
+ }
+
+ String strValue = strBuff.toString();
+
+ String[] strArr = strValue.split(",if");
+ if (strArr.length > 1) {
+ // There are sequence of, at-least two XPath 'if' expressions
+ for (int i = 1; i < strArr.length; i++) {
+ strArr[i] = "if" + strArr[i];
+ }
+
+ List<String> strList = Arrays.asList(strArr);
+
+ insertOp(opPos, 2, OpCodes.OP_SEQUENCE_CONSTRUCTOR_EXPR);
+ m_xpathSequenceConstructor = new XPathSequenceConstructor();
+ m_xpathSequenceConstructor.setSequenceConstructorXPathParts(strList);
+
+ return null;
+ }
+ else {
+ restoreTokenQueueScanPosition(m_prevTokQueueScanPosition);
+ }
+
insertOp(opPos, 2, OpCodes.OP_IF_EXPR);
XPathIfExpr ifExpr = new XPathIfExpr();
@@ -5715,12 +5751,12 @@ public class XPathParser
}
/**
+ *
+ * Number := NON_SCIENTIFIC_NUMBER | SCIENTIFIC_NUMBER
*
* NON_SCIENTIFIC_NUMBER ::= [0-9]+('.'[0-9]+)? | '.'[0-9]+
*
- * SCIENTIFIC_NUMBER := NON_SCIENTIFIC_NUMBER [e|E] [+|-]? [0-9]+
- *
- * Number := NON_SCIENTIFIC_NUMBER | SCIENTIFIC_NUMBER
+ * SCIENTIFIC_NUMBER := NON_SCIENTIFIC_NUMBER [e|E] [+|-]? [0-9]+
*
* @throws javax.xml.transform.TransformerException
*/
diff --git a/src/main/java/org/apache/xpath/functions/FuncRoundHalfToEven.java b/src/main/java/org/apache/xpath/functions/FuncRoundHalfToEven.java
index ff4b29d89..dfb55eb9f 100644
--- a/src/main/java/org/apache/xpath/functions/FuncRoundHalfToEven.java
+++ b/src/main/java/org/apache/xpath/functions/FuncRoundHalfToEven.java
@@ -152,12 +152,21 @@ public class FuncRoundHalfToEven extends Function2Args
result = new XSDecimal(roundValue);
}
else if (m_arg0 instanceof XNumber) {
- XNumber xNumber = (XNumber)m_arg0;
+ XNumber xNumber = (XNumber)m_arg0;
- BigDecimal arg0Decimal = new BigDecimal(xNumber.num());
- BigDecimal roundValue = arg0Decimal.setScale(precision, BigDecimal.ROUND_HALF_EVEN);
+ XSDecimal xsDecimal = xNumber.getXsDecimal();
+
+ BigDecimal arg0Decimal = null;
+ if (xsDecimal != null) {
+ arg0Decimal = xsDecimal.getValue();
+ }
+ else {
+ arg0Decimal = new BigDecimal(xNumber.num());
+ }
+
+ BigDecimal roundValue = arg0Decimal.setScale(precision, BigDecimal.ROUND_HALF_EVEN);
- result = new XSDecimal(roundValue);
+ result = new XSDecimal(roundValue);
}
else {
throw new javax.xml.transform.TransformerException("FORG0006 : The first argument to function fn:round-half-to-even "
diff --git a/src/main/java/org/apache/xpath/operations/Equals.java b/src/main/java/org/apache/xpath/operations/Equals.java
index 135abc182..8148cf822 100644
--- a/src/main/java/org/apache/xpath/operations/Equals.java
+++ b/src/main/java/org/apache/xpath/operations/Equals.java
@@ -83,8 +83,8 @@ public class Equals extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
- int nextNode = DTM.NULL;
+ DTMCursorIterator iter = nodeRef.iterRaw();
+ int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
java.lang.String nodeStrValue = nodeRef1.str();
@@ -100,7 +100,7 @@ public class Equals extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
diff --git a/src/main/java/org/apache/xpath/operations/Gt.java b/src/main/java/org/apache/xpath/operations/Gt.java
index d24580e21..546702f0d 100644
--- a/src/main/java/org/apache/xpath/operations/Gt.java
+++ b/src/main/java/org/apache/xpath/operations/Gt.java
@@ -80,7 +80,7 @@ public class Gt extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
@@ -97,7 +97,7 @@ public class Gt extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
diff --git a/src/main/java/org/apache/xpath/operations/Gte.java b/src/main/java/org/apache/xpath/operations/Gte.java
index 7b864b7aa..2e8ee251f 100644
--- a/src/main/java/org/apache/xpath/operations/Gte.java
+++ b/src/main/java/org/apache/xpath/operations/Gte.java
@@ -80,7 +80,7 @@ public class Gte extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
@@ -97,7 +97,7 @@ public class Gte extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
diff --git a/src/main/java/org/apache/xpath/operations/Lt.java b/src/main/java/org/apache/xpath/operations/Lt.java
index 99ed112a2..79b5e35c9 100644
--- a/src/main/java/org/apache/xpath/operations/Lt.java
+++ b/src/main/java/org/apache/xpath/operations/Lt.java
@@ -79,7 +79,7 @@ public class Lt extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
@@ -96,7 +96,7 @@ public class Lt extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
diff --git a/src/main/java/org/apache/xpath/operations/Lte.java b/src/main/java/org/apache/xpath/operations/Lte.java
index 557f076a8..863645790 100644
--- a/src/main/java/org/apache/xpath/operations/Lte.java
+++ b/src/main/java/org/apache/xpath/operations/Lte.java
@@ -80,7 +80,7 @@ public class Lte extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
@@ -97,7 +97,7 @@ public class Lte extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
diff --git a/src/main/java/org/apache/xpath/operations/Neg.java b/src/main/java/org/apache/xpath/operations/Neg.java
index 3c14bd678..40d00d8b8 100644
--- a/src/main/java/org/apache/xpath/operations/Neg.java
+++ b/src/main/java/org/apache/xpath/operations/Neg.java
@@ -24,18 +24,17 @@ import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
-import xml.xpath31.processor.types.XSDouble;
+import xml.xpath31.processor.types.XSNumericType;
/**
- * The unary '-' operation expression executer.
+ * An XPath unary '-' operation expression executer.
*/
public class Neg extends UnaryOperation
{
static final long serialVersionUID = -6280607702375702291L;
/**
- * Apply the operation to two operands, and return the result.
- *
+ * Apply XPath unary operator to an operand, and return the result.
*
* @param right non-null reference to the evaluated right operand.
*
@@ -47,8 +46,10 @@ public class Neg extends UnaryOperation
{
XObject result = null;
- if (right instanceof XSDouble) {
- result = new XNumber(-(((XSDouble)right).doubleValue()));
+ if (right instanceof XSNumericType) {
+ java.lang.String strValue = ((XSNumericType)right).stringValue();
+
+ result = new XNumber(-1 * (Double.valueOf(strValue)));
}
else {
result = new XNumber(-right.num());
diff --git a/src/main/java/org/apache/xpath/operations/NotEquals.java b/src/main/java/org/apache/xpath/operations/NotEquals.java
index b2cbb5593..312ff6fb9 100644
--- a/src/main/java/org/apache/xpath/operations/NotEquals.java
+++ b/src/main/java/org/apache/xpath/operations/NotEquals.java
@@ -80,7 +80,7 @@ public class NotEquals extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
@@ -97,7 +97,7 @@ public class NotEquals extends Operation
XMLNodeCursorImpl nodeRef = (XMLNodeCursorImpl)lObj;
DTMManager dtmManager = nodeRef.getDTMManager();
- DTMCursorIterator iter = nodeRef.iter();
+ DTMCursorIterator iter = nodeRef.iterRaw();
int nextNode = DTM.NULL;
while ((nextNode = iter.nextNode()) != DTM.NULL) {
XMLNodeCursorImpl nodeRef1 = new XMLNodeCursorImpl(nextNode, dtmManager);
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 c3ab524d5..eb847faf9 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
@@ -51,6 +51,7 @@ 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.apache.xalan.xslt.util.XslTransformSharedDatastore;
import org.apache.xml.utils.XML11Char;
import org.apache.xpath.jaxp.XPathFactoryImpl;
import org.apache.xpath.regex.Matcher;
@@ -628,11 +629,19 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
StringWriter strWriter = new StringWriter();
- Document documentToBeTransformed = m_xmlDocumentBuilder.parse(new ByteArrayInputStream((resultStrWriter.toString()).getBytes()));
+ Document documentToBeTransformed = m_xmlDocumentBuilder.parse(new ByteArrayInputStream((resultStrWriter.toString()).getBytes()));
- transformer.transform(new DOMSource(documentToBeTransformed), new StreamResult(strWriter));
+ XslTransformSharedDatastore.m_is_xsl_test_invocation = true;
+ try {
+ transformer.transform(new DOMSource(documentToBeTransformed), new StreamResult(strWriter));
+ }
+ finally {
+ XslTransformSharedDatastore.m_is_xsl_test_invocation = false;
+ }
+
+ String str2 = strWriter.toString();
- Document xmlInpDoc1 = m_xmlDocumentBuilder.parse(new ByteArrayInputStream((strWriter.toString()).getBytes()));
+ Document xmlInpDoc1 = m_xmlDocumentBuilder.parse(new ByteArrayInputStream(str2.getBytes()));
String xmlStr1 = serializeXmlDomElementNode(xmlInpDoc1);
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
index 1e91bdc8e..f9a6e1024 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_as-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:46Z" fail="51" name="as" pass="53" skipped="4" statusUnknown="1" totalRun="105">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:07Z" fail="51" name="as" pass="53" skipped="4" statusUnknown="1" totalRun="105">
<testResult status="pass" testName="as-0101"/>
<testResult status="pass" testName="as-0102"/>
<testResult status="pass" testName="as-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
index 9c2f0cc46..4db17f4e6 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_avt-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:49Z" fail="14" name="avt" pass="21" skipped="0" statusUnknown="0" totalRun="35">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:11Z" fail="14" name="avt" pass="21" skipped="0" statusUnknown="0" totalRun="35">
<testResult status="pass" testName="avt-0101"/>
<testResult status="fail" testName="avt-0201"/>
<testResult status="pass" testName="avt-0202"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_expand-text-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_expand-text-test-set_result.xml
index 312b3fbe5..de61419bd 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_expand-text-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_expand-text-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:39Z" fail="36" name="expand-text" pass="26" skipped="0" statusUnknown="0" totalRun="62">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:52Z" fail="36" name="expand-text" pass="26" skipped="0" statusUnknown="0" totalRun="62">
<testResult status="pass" testName="cvt-001"/>
<testResult status="pass" testName="cvt-002"/>
<testResult status="pass" testName="cvt-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
index aa040612c..56ab0b692 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_match-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:51Z" fail="61" name="match" pass="67" skipped="8" statusUnknown="1" totalRun="129">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:12Z" fail="61" name="match" pass="67" skipped="8" statusUnknown="1" totalRun="129">
<testResult status="pass" testName="match-001"/>
<testResult status="pass" testName="match-002"/>
<testResult status="pass" testName="match-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
index 97d54c1ff..bef2f19d7 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_select-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:55Z" fail="5" name="select" pass="19" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:16Z" fail="5" name="select" pass="19" skipped="0" statusUnknown="1" totalRun="25">
<testResult status="pass" testName="select-0101"/>
<testResult status="pass" testName="select-0102"/>
<testResult status="pass" testName="select-0201"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
index af5c5e084..aa77dbb38 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_xpath-default-namespace-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:38Z" fail="15" name="xpath-default-namespace" pass="11" skipped="0" statusUnknown="0" totalRun="26">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:51Z" fail="15" name="xpath-default-namespace" pass="11" skipped="0" statusUnknown="0" totalRun="26">
<testResult status="pass" testName="xpath-default-namespace-0101"/>
<testResult status="pass" testName="xpath-default-namespace-0102"/>
<testResult status="pass" testName="xpath-default-namespace-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
index 59a7b3a11..7b426f157 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_attribute-set-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:26Z" fail="8" name="attribute-set" pass="41" skipped="1" statusUnknown="0" totalRun="49">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:44Z" fail="8" name="attribute-set" pass="41" skipped="1" statusUnknown="0" totalRun="49">
<testResult status="pass" testName="attribute-set-0101"/>
<testResult status="fail" testName="attribute-set-0102">
<outResult/>
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 137c59232..9efeb0327 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-08-07T12:05:25Z" fail="12" name="character-map" pass="15" skipped="1" statusUnknown="1" totalRun="28">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:44Z" fail="12" name="character-map" pass="15" 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"/>
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 922cfa9ca..8dd0fb965 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,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:14Z" fail="21" name="function" pass="47" skipped="4" statusUnknown="1" totalRun="69">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:34Z" fail="21" name="function" pass="47" skipped="4" statusUnknown="1" totalRun="69">
<testResult status="fail" testName="function-0001">
<outResult/>
</testResult>
@@ -46,7 +46,19 @@
</testResult>
<testResult status="pass" testName="function-0601"/>
<testResult status="pass" testName="function-0602"/>
- <testResult status="fail" testName="function-0701"/>
+ <testResult status="fail" testName="function-0701">
+ <outResult>
+ <errTrace>XPST0008 : Could not find variable with the name of square-17</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-15</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-10</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-6</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-17</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-15</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-10</errTrace>
+ <errTrace>XPST0008 : Could not find variable with the name of square-6</errTrace>
+ <errTrace>java.lang.NullPointerException</errTrace>
+ </outResult>
+ </testResult>
<testResult status="fail" testName="function-0901"/>
<testResult status="pass" testName="function-1001"/>
<testResult status="pass" testName="function-1002"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
index 3dbe9f042..31d95092f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/decl/_variable-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:43Z" fail="3" name="variable" pass="16" skipped="0" statusUnknown="1" totalRun="20">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:00Z" fail="3" name="variable" pass="16" skipped="0" statusUnknown="1" totalRun="20">
<testResult status="pass" testName="variable-0101"/>
<testResult status="pass" testName="variable-0102"/>
<testResult status="pass" testName="variable-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
index 152c7359d..069b725c1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_axes-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:27Z" fail="20" name="axes" pass="181" skipped="0" statusUnknown="0" totalRun="201">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:46Z" fail="18" name="axes" pass="183" skipped="0" statusUnknown="0" totalRun="201">
<testResult status="pass" testName="axes-001"/>
<testResult status="pass" testName="axes-002"/>
<testResult status="pass" testName="axes-003"/>
@@ -73,7 +73,7 @@
<testResult status="pass" testName="axes-063"/>
<testResult status="pass" testName="axes-064"/>
<testResult status="fail" testName="axes-065"/>
- <testResult status="fail" testName="axes-066"/>
+ <testResult status="pass" testName="axes-066"/>
<testResult status="pass" testName="axes-067"/>
<testResult status="pass" testName="axes-068"/>
<testResult status="pass" testName="axes-069"/>
@@ -136,7 +136,7 @@
<testResult status="pass" testName="axes-126"/>
<testResult status="pass" testName="axes-127"/>
<testResult status="pass" testName="axes-128"/>
- <testResult status="fail" testName="axes-129"/>
+ <testResult status="pass" testName="axes-129"/>
<testResult status="pass" testName="axes-130"/>
<testResult status="pass" testName="axes-131"/>
<testResult status="fail" testName="axes-132">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
index 09468c67d..421a44283 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_castable-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:33Z" fail="5" name="castable" pass="4" skipped="0" statusUnknown="0" totalRun="9">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:50Z" fail="5" name="castable" pass="4" skipped="0" statusUnknown="0" totalRun="9">
<testResult status="pass" testName="castable-001"/>
<testResult status="pass" testName="castable-002"/>
<testResult status="pass" testName="castable-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
index 270df67f2..6e8d92004 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_expression-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:34Z" fail="0" name="expression" pass="9" skipped="0" statusUnknown="1" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:51Z" 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/expr/_for-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
index 0fed01e4f..af5689659 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_for-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:34Z" fail="2" name="for" pass="1" skipped="0" statusUnknown="1" totalRun="4">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:51Z" 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="pass" testName="for-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
index 3eddb117e..bbf775c58 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_higher-order-functions-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:42Z" fail="6" name="higher-order-functions" pass="18" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:56Z" fail="6" name="higher-order-functions" pass="18" skipped="0" statusUnknown="1" totalRun="25">
<testResult status="pass" testName="higher-order-functions-001"/>
<testResult status="pass" testName="higher-order-functions-002"/>
<testResult status="pass" testName="higher-order-functions-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
index dd4510bb3..c17df5613 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_math-test-set_result.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:37Z" fail="37" name="math" pass="110" skipped="0" statusUnknown="1" totalRun="148">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:52Z" fail="31" name="math" pass="117" skipped="0" statusUnknown="1" totalRun="149">
+ <testResult status="pass" testName="math-3315"/>
<testResult status="pass" testName="math-0101"/>
<testResult status="pass" testName="math-0102"/>
<testResult status="fail" testName="math-0103"/>
@@ -38,7 +39,7 @@
<testResult status="pass" testName="math-1510"/>
<testResult status="pass" testName="math-1511"/>
<testResult status="pass" testName="math-1512"/>
- <testResult status="fail" testName="math-1513"/>
+ <testResult status="pass" testName="math-1513"/>
<testResult status="pass" testName="math-1514"/>
<testResult status="pass" testName="math-1515"/>
<testResult status="pass" testName="math-1516"/>
@@ -122,8 +123,8 @@
<testResult status="pass" testName="math-3001"/>
<testResult status="fail" testName="math-3101"/>
<testResult status="pass" testName="math-3201"/>
- <testResult status="fail" testName="math-3301"/>
- <testResult status="fail" testName="math-3301a"/>
+ <testResult status="pass" testName="math-3301"/>
+ <testResult status="pass" testName="math-3301a"/>
<testResult status="fail" testName="math-3302"/>
<testResult status="fail" testName="math-3302a"/>
<testResult status="fail" testName="math-3303"/>
@@ -145,8 +146,8 @@
<testResult status="pass" testName="math-3311"/>
<testResult status="pass" testName="math-3312"/>
<testResult status="fail" testName="math-3313"/>
- <testResult status="fail" testName="math-3314"/>
- <testResult status="fail" testName="math-3315"/>
- <testResult status="fail" testName="math-3316"/>
+ <testResult status="pass" testName="math-3314"/>
+ <testResult status="pass" testName="math-3315"/>
+ <testResult status="pass" testName="math-3316"/>
<testResult testName="math-3317"/>
</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
index 6e1cce8e1..de7dd6c15 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_nodetest-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:41Z" fail="36" name="nodetest" pass="2" skipped="0" statusUnknown="0" totalRun="38">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:55Z" 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">
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
index 0e9f73e5f..f71285e66 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_path-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:42Z" fail="3" name="path" pass="7" skipped="0" statusUnknown="0" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:56Z" 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/expr/_predicate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
index eecc43c19..60f3a1673 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/expr/_predicate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:43Z" fail="7" name="predicate" pass="50" skipped="0" statusUnknown="0" totalRun="57">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:57Z" fail="7" name="predicate" pass="50" skipped="0" statusUnknown="0" 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/fn/_deep-equal-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
index 2cb24f967..a5c0347c6 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_deep-equal-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:28Z" fail="0" name="deep-equal" pass="2" skipped="0" statusUnknown="0" totalRun="2">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:43Z" fail="0" name="deep-equal" pass="2" skipped="0" statusUnknown="0" totalRun="2">
<testResult status="pass" testName="deep-equal-001"/>
<testResult status="pass" testName="deep-equal-002"/>
</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
index d3638e27b..656664b2c 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_format-number-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:35Z" fail="32" name="format-number" pass="38" skipped="4" statusUnknown="0" totalRun="70">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:48Z" fail="32" name="format-number" pass="38" skipped="4" statusUnknown="0" totalRun="70">
<testResult status="fail" testName="format-number-001"/>
<testResult status="fail" testName="format-number-002"/>
<testResult status="fail" testName="format-number-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
index 71dcad1a4..e09d009e4 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_key-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:34Z" fail="3" name="key" pass="21" skipped="0" statusUnknown="1" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:47Z" fail="3" name="key" pass="21" skipped="0" statusUnknown="1" totalRun="25">
<testResult status="pass" testName="key-001"/>
<testResult status="fail" testName="key-002"/>
<testResult status="pass" testName="key-003"/>
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 35d64fc99..4096c077c 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-08-07T12:07:28Z" fail="11" name="position" pass="126" skipped="0" statusUnknown="1" totalRun="138">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:43Z" fail="11" name="position" pass="126" skipped="0" statusUnknown="1" totalRun="138">
<testResult status="pass" testName="position-0101"/>
<testResult status="fail" testName="position-0102"/>
<testResult status="fail" testName="position-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
index 8b70d25d9..7b7f3722c 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/fn/_root-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:33Z" fail="3" name="root" pass="7" skipped="0" statusUnknown="0" totalRun="10">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:47Z" fail="3" name="root" pass="7" skipped="0" statusUnknown="0" totalRun="10">
<testResult status="pass" testName="root-0101"/>
<testResult status="fail" testName="root-0102"/>
<testResult status="pass" testName="root-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
index acfb303d6..61ac01e44 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_analyze-string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:32Z" fail="16" name="analyze-string" pass="37" skipped="5" statusUnknown="0" totalRun="53">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:45Z" fail="16" name="analyze-string" pass="37" skipped="5" statusUnknown="0" totalRun="53">
<testResult status="pass" testName="analyze-string-001"/>
<testResult status="pass" testName="analyze-string-002"/>
<testResult status="pass" testName="analyze-string-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
index 85bfcc8b3..fb99dbab1 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_apply-templates-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:55Z" fail="25" name="apply-templates" pass="21" skipped="4" statusUnknown="0" totalRun="46">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:17Z" fail="24" name="apply-templates" pass="22" skipped="4" statusUnknown="0" totalRun="46">
<testResult status="fail" testName="apply-templates-001">
<outResult><?xml version="1.0" encoding="UTF-8"?>
@@ -182,7 +182,7 @@
<errTrace>java.lang.NullPointerException</errTrace>
</outResult>
</testResult>
- <testResult status="fail" testName="conflict-resolution-1501"/>
+ <testResult status="pass" testName="conflict-resolution-1501"/>
<testResult status="pass" testName="conflict-resolution-1601"/>
<testResult status="fail" testName="conflict-resolution-1602">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
index afc9e66ce..089824464 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_attribute-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:00Z" fail="21" name="attribute" pass="8" skipped="0" statusUnknown="1" totalRun="30">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:21Z" fail="21" name="attribute" pass="8" skipped="0" statusUnknown="1" totalRun="30">
<testResult status="fail" testName="attribute-0001"/>
<testResult status="fail" testName="attribute-0002"/>
<testResult status="fail" testName="attribute-0003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
index cd1e416b0..2643a8f12 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_call-template-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:01Z" fail="14" name="call-template" pass="27" skipped="1" statusUnknown="0" totalRun="41">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:22Z" fail="14" name="call-template" pass="27" skipped="1" statusUnknown="0" totalRun="41">
<testResult status="fail" testName="call-template-0001">
<outResult><?xml version="1.0" encoding="UTF-8"?><out/></outResult>
</testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
index 3395b7d76..5381ac334 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_choose-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:02Z" fail="6" name="choose" pass="17" skipped="0" statusUnknown="1" totalRun="24">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:23Z" fail="6" name="choose" pass="17" skipped="0" statusUnknown="1" 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/insn/_copy-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_copy-test-set_result.xml
index dc00486ed..79f9261e0 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-08-07T12:05:05Z" fail="43" name="copy" pass="16" skipped="0" statusUnknown="1" totalRun="60">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:25Z" fail="42" name="copy" pass="17" skipped="0" statusUnknown="1" totalRun="60">
<testResult status="fail" testName="copy-0101"/>
<testResult status="pass" testName="copy-0102"/>
<testResult status="fail" testName="copy-0103"/>
@@ -90,7 +90,7 @@
</outResult>
</testResult>
<testResult status="fail" testName="copy-1211"/>
- <testResult status="fail" testName="copy-1212"/>
+ <testResult status="pass" testName="copy-1212"/>
<testResult status="fail" testName="copy-1213">
<outResult>
<errTrace>XTSE0010 : an instruction xsl:where-populated is not known to the XSLT processor.</errTrace>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
index 401242368..bd29fbbcd 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_element-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:11Z" fail="18" name="element" pass="11" skipped="0" statusUnknown="0" totalRun="29">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:31Z" fail="18" name="element" pass="11" skipped="0" statusUnknown="0" totalRun="29">
<testResult status="fail" testName="element-0001">
<outResult/>
</testResult>
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 6c2a089f8..d9c52a2b4 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,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:04:56Z" fail="26" name="for-each-group" pass="47" skipped="4" statusUnknown="1" totalRun="74">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:18Z" fail="26" name="for-each-group" pass="47" 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"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
index 3f3d44c93..18c5fe096 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_iterate-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:07Z" fail="28" name="iterate" pass="16" skipped="0" statusUnknown="0" totalRun="44">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:27Z" fail="26" name="iterate" pass="18" skipped="0" statusUnknown="0" totalRun="44">
<testResult status="pass" testName="iterate-001"/>
<testResult status="pass" testName="iterate-002"/>
<testResult status="pass" testName="iterate-003"/>
@@ -85,12 +85,12 @@
</testResult>
<testResult status="pass" testName="iterate-012"/>
<testResult status="pass" testName="iterate-013"/>
- <testResult status="fail" testName="iterate-014"/>
+ <testResult status="pass" testName="iterate-014"/>
<testResult status="pass" testName="iterate-015"/>
<testResult status="fail" testName="iterate-016"/>
<testResult status="fail" testName="iterate-017"/>
<testResult status="fail" testName="iterate-018"/>
- <testResult status="fail" testName="iterate-019"/>
+ <testResult status="pass" testName="iterate-019"/>
<testResult status="fail" testName="iterate-020"/>
<testResult status="fail" testName="iterate-021"/>
<testResult status="pass" testName="iterate-022"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
index 367d95bd3..d910a363f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sequence-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:08Z" fail="18" name="sequence" pass="7" skipped="1" statusUnknown="1" totalRun="26">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:28Z" fail="18" name="sequence" pass="7" skipped="1" statusUnknown="1" totalRun="26">
<testResult status="fail" testName="sequence-0101"/>
<testResult status="fail" testName="sequence-0102"/>
<testResult status="pass" testName="sequence-0103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
index c53769fc9..2b70149d7 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_sort-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:12Z" fail="44" name="sort" pass="36" skipped="0" statusUnknown="0" totalRun="80">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:32Z" fail="44" name="sort" pass="36" skipped="0" statusUnknown="0" totalRun="80">
<testResult status="pass" testName="sort-001"/>
<testResult status="pass" testName="sort-002"/>
<testResult status="fail" testName="sort-003"/>
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 462c7722d..84463fb8d 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-08-07T12:04:59Z" fail="26" name="try" pass="11" skipped="5" statusUnknown="0" totalRun="37">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:20Z" fail="26" name="try" pass="11" skipped="5" statusUnknown="0" totalRun="37">
<testResult status="pass" testName="try-001"/>
<testResult status="fail" testName="try-002">
<outResult/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
index 364d5f6a4..6199a7820 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/insn/_xsl-document-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:38Z" fail="13" name="xsl-document" pass="12" skipped="0" statusUnknown="0" totalRun="25">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:51Z" fail="13" name="xsl-document" pass="12" skipped="0" statusUnknown="0" totalRun="25">
<testResult status="pass" testName="xsl-document-0101"/>
<testResult status="fail" testName="xsl-document-0102">
<outResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
index 7fbf4eae9..f9595d56d 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/misc/_regex-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:07:37Z" fail="12" name="regex" pass="32" skipped="1" statusUnknown="0" totalRun="44">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:31:50Z" fail="12" name="regex" pass="32" skipped="1" statusUnknown="0" totalRun="44">
<testResult status="pass" testName="regex-001"/>
<testResult status="fail" testName="regex-002"/>
<testResult status="pass" testName="regex-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
index 79148c331..0b4317d4a 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_boolean-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:45Z" fail="24" name="boolean" pass="88" skipped="0" statusUnknown="0" totalRun="112">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:29:59Z" fail="25" name="boolean" pass="87" skipped="0" statusUnknown="0" totalRun="112">
<testResult status="pass" testName="boolean-001"/>
<testResult status="pass" testName="boolean-002"/>
<testResult status="pass" testName="boolean-003"/>
@@ -108,7 +108,7 @@
<outResult><?xml version="1.0" encoding="UTF-8"?><out>true</out></outResult>
</testResult>
<testResult status="fail" testName="boolean-099"/>
- <testResult status="pass" testName="boolean-100"/>
+ <testResult status="fail" testName="boolean-100"/>
<testResult status="pass" testName="boolean-101"/>
<testResult status="pass" testName="boolean-102"/>
<testResult status="pass" testName="boolean-103"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
index e53a507d3..12dacaa0f 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_date-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:51Z" fail="47" name="date" pass="37" skipped="0" statusUnknown="1" totalRun="85">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:30:04Z" fail="47" name="date" pass="37" skipped="0" statusUnknown="1" totalRun="85">
<testResult status="pass" testName="date-001"/>
<testResult status="pass" testName="date-002"/>
<testResult status="pass" testName="date-003"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
index 548e8160b..400c7ca07 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_node-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:47Z" fail="17" name="node" pass="15" skipped="0" statusUnknown="0" totalRun="32">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:30:01Z" 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/type/_string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
index 60da2ef06..2b2405aa4 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/type/_string-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-07T12:05:48Z" fail="8" name="string" pass="128" skipped="0" statusUnknown="0" totalRun="136">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2025-08-08T16:30:02Z" fail="8" name="string" pass="128" skipped="0" statusUnknown="0" 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/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 a61cbde11..581396792 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-08-07T12:07:52Z" desc="W3C XSLT 3.0 test suite results" fail="797" pass="1458" skipped="43" success="64.14%" totalRun="2273" xslt_processor="Xalan-J XSLT 3.0 development code">
+<testResult dateTime="2025-08-08T16:32:07Z" desc="W3C XSLT 3.0 test suite results" fail="786" pass="1470" skipped="43" success="64.64%" totalRun="2274" xslt_processor="Xalan-J XSLT 3.0 development code">
<attr>
<as fail="51" pass="53" skipped="4" success="50.48%" totalRun="105"/>
<avt fail="14" pass="21" skipped="0" success="60.0%" totalRun="35"/>
@@ -15,12 +15,12 @@
<variable fail="3" pass="16" skipped="0" success="80.0%" totalRun="20"/>
</decl>
<expr>
- <axes fail="20" pass="181" skipped="0" success="90.05%" totalRun="201"/>
+ <axes fail="18" pass="183" skipped="0" success="91.04%" totalRun="201"/>
<castable fail="5" pass="4" skipped="0" success="44.44%" totalRun="9"/>
<expression fail="0" pass="9" skipped="0" success="90.0%" totalRun="10"/>
<for fail="2" pass="1" skipped="0" success="25.0%" totalRun="4"/>
<higher-order-functions fail="6" pass="18" skipped="0" success="72.0%" totalRun="25"/>
- <math fail="37" pass="110" skipped="0" success="74.32%" totalRun="148"/>
+ <math fail="31" pass="117" skipped="0" success="78.52%" totalRun="149"/>
<nodetest fail="36" pass="2" skipped="0" success="5.26%" totalRun="38"/>
<path fail="3" pass="7" skipped="0" success="70.0%" totalRun="10"/>
<predicate fail="7" pass="50" skipped="0" success="87.72%" totalRun="57"/>
@@ -34,14 +34,14 @@
</fn>
<insn>
<analyze-string fail="16" pass="37" skipped="5" success="69.81%" totalRun="53"/>
- <apply-templates fail="25" pass="21" skipped="4" success="45.65%" totalRun="46"/>
+ <apply-templates fail="24" pass="22" skipped="4" success="47.83%" totalRun="46"/>
<attribute fail="21" pass="8" skipped="0" success="26.67%" totalRun="30"/>
<call-template fail="14" pass="27" skipped="1" success="65.85%" totalRun="41"/>
<choose fail="6" pass="17" skipped="0" success="70.83%" totalRun="24"/>
- <copy fail="43" pass="16" skipped="0" success="26.67%" totalRun="60"/>
+ <copy fail="42" pass="17" skipped="0" success="28.33%" totalRun="60"/>
<element fail="18" pass="11" skipped="0" success="37.93%" totalRun="29"/>
<for-each-group fail="26" pass="47" skipped="4" success="63.51%" totalRun="74"/>
- <iterate fail="28" pass="16" skipped="0" success="36.36%" totalRun="44"/>
+ <iterate fail="26" pass="18" skipped="0" success="40.91%" totalRun="44"/>
<sequence fail="18" pass="7" skipped="1" success="26.92%" totalRun="26"/>
<sort fail="44" pass="36" skipped="0" success="45.0%" totalRun="80"/>
<try fail="26" pass="11" skipped="5" success="29.73%" totalRun="37"/>
@@ -51,7 +51,7 @@
<regex fail="12" pass="32" skipped="1" success="72.73%" totalRun="44"/>
</misc>
<type>
- <boolean fail="24" pass="88" skipped="0" success="78.57%" totalRun="112"/>
+ <boolean fail="25" pass="87" skipped="0" success="77.68%" totalRun="112"/>
<date fail="47" pass="37" skipped="0" success="43.53%" totalRun="85"/>
<node fail="17" pass="15" skipped="0" success="46.88%" totalRun="32"/>
<string fail="8" pass="128" skipped="0" success="94.12%" totalRun="136"/>
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 81e5f573f..9b7af5515 100644
--- a/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java
+++ b/src/test/java/org/apache/xalan/tests/xpath3/XPathSequenceConstructorMiscTests.java
@@ -97,5 +97,45 @@ public class XPathSequenceConstructorMiscTests extends XslTransformTestsUtil {
runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
}
+
+ @Test
+ public void xslSequenceConstructorMiscTest6() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test6.xsl";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test6.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test6.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
+
+ @Test
+ public void xslSequenceConstructorMiscTest7() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test7.xsl";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test7.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test7.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
+
+ @Test
+ public void xslSequenceConstructorMiscTest8() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test8.xsl";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test8.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test8.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
+
+ @Test
+ public void xslSequenceConstructorMiscTest9() {
+ String xmlFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test9.xsl";
+ String xslFilePath = XSL_TRANSFORM_INPUT_DIRPATH + "test9.xsl";
+
+ String goldFilePath = XSL_TRANSFORM_GOLD_DIRPATH + "test9.out";
+
+ runXslTransformAndAssertOutput(xmlFilePath, xslFilePath, goldFilePath, null);
+ }
}
diff --git a/src/test/resources/xpath_sequence_constructor/misc/gold/test6.out b/src/test/resources/xpath_sequence_constructor/misc/gold/test6.out
new file mode 100644
index 000000000..710088779
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/gold/test6.out
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+ <one>
+ <a>A B</a>
+ <b>C D</b>
+ <c>E F</c>
+ </one>
+ <two>
+ <a>G I</a>
+ <b>J L</b>
+ <c>M O</c>
+ </two>
+</result>
diff --git a/src/test/resources/xpath_sequence_constructor/misc/gold/test7.out b/src/test/resources/xpath_sequence_constructor/misc/gold/test7.out
new file mode 100644
index 000000000..5980f5a51
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/gold/test7.out
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?><result>
+ <one>hello nice</one>
+ <two>nice there</two>
+</result>
diff --git a/src/test/resources/xpath_sequence_constructor/misc/gold/test8.out b/src/test/resources/xpath_sequence_constructor/misc/gold/test8.out
new file mode 100644
index 000000000..fda36b234
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/gold/test8.out
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><result>hello nice</result>
diff --git a/src/test/resources/xpath_sequence_constructor/misc/gold/test9.out b/src/test/resources/xpath_sequence_constructor/misc/gold/test9.out
new file mode 100644
index 000000000..6a77942f8
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/gold/test9.out
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><result>hello there A B C D</result>
diff --git a/src/test/resources/xpath_sequence_constructor/misc/test6.xsl b/src/test/resources/xpath_sequence_constructor/misc/test6.xsl
new file mode 100644
index 000000000..7466af144
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/test6.xsl
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- XSL stylesheet test case, to test concatenation of two or more
+ XPath 'if' expressions. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <result>
+ <xsl:variable name="v1" select="1"/>
+ <xsl:variable name="v2" select="2"/>
+ <xsl:variable name="v3" select="3"/>
+ <one>
+ <a>
+ <xsl:value-of select="if ($v2 = ($v1 + 1)) then 'A' else (),
+ if ($v3 = ($v2 + 1)) then 'B' else ()"/>
+ </a>
+ <b>
+ <xsl:value-of select="(if ($v2 = ($v1 + 1)) then 'C' else (),
+ if ($v3 = ($v2 + 1)) then 'D' else ())"/>
+ </b>
+ <c>
+ <xsl:value-of select="((if ($v2 = ($v1 + 1)) then 'E' else ()),
+ (if ($v3 = ($v2 + 1)) then 'F' else ()))"/>
+ </c>
+ </one>
+ <two>
+ <a>
+ <xsl:value-of select="if ($v2 = ($v1 + 1)) then 'G' else (),
+ if ($v3 != ($v2 + 1)) then 'H' else 'I'"/>
+ </a>
+ <b>
+ <xsl:value-of select="(if ($v2 = ($v1 + 1)) then 'J' else (),
+ if ($v3 != ($v2 + 1)) then 'K' else 'L')"/>
+ </b>
+ <c>
+ <xsl:value-of select="((if ($v2 = ($v1 + 1)) then 'M' else ()),
+ (if ($v3 != ($v2 + 1)) then 'N' else 'O'))"/>
+ </c>
+ </two>
+ </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/xpath_sequence_constructor/misc/test7.xsl b/src/test/resources/xpath_sequence_constructor/misc/test7.xsl
new file mode 100644
index 000000000..867d76a9f
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/test7.xsl
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- XSL stylesheet test case, to test concatenation of two or more
+ XPath 'if' expressions. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <result>
+ <xsl:variable name="v1" select="1"/>
+ <xsl:variable name="v2" select="2"/>
+ <xsl:variable name="v3" select="3"/>
+ <one>
+ <xsl:value-of select="if ($v2 > $v1 and $v3 > $v2) then 'hello' else (),
+ if ($v2 > $v1 and $v3 < $v2) then 'there' else 'nice'"/>
+ </one>
+ <two>
+ <xsl:value-of select="if ($v2 > $v1 and $v3 > $v2 and 1 != 1) then 'hello' else 'nice',
+ if ($v2 > $v1 and $v3 > $v2 and 1 = 1) then 'there' else 'nice'"/>
+ </two>
+ </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/xpath_sequence_constructor/misc/test8.xsl b/src/test/resources/xpath_sequence_constructor/misc/test8.xsl
new file mode 100644
index 000000000..e6a9a3db2
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/test8.xsl
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- XSL stylesheet test case, to test concatenation of two or more
+ XPath 'if' expressions. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <result>
+ <xsl:variable name="v1" select="1"/>
+ <xsl:variable name="v2" select="2"/>
+ <xsl:variable name="v3" select="3"/>
+ <xsl:value-of select="if ($v2 > $v1 or $v2 > $v3) then 'hello' else (),
+ if ($v2 > $v1 and $v3 < $v2) then 'there' else 'nice'"/>
+
+ </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/xpath_sequence_constructor/misc/test9.xsl b/src/test/resources/xpath_sequence_constructor/misc/test9.xsl
new file mode 100644
index 000000000..d8c622dd7
--- /dev/null
+++ b/src/test/resources/xpath_sequence_constructor/misc/test9.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
+
+ <!-- Author: mukulg@apache.org -->
+
+ <!-- XSL stylesheet test case, to test concatenation of two or more
+ XPath 'if' expressions. -->
+
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <result>
+ <xsl:variable name="v1" select="1"/>
+ <xsl:variable name="v2" select="2"/>
+ <xsl:variable name="v3" select="3"/>
+ <xsl:value-of select="if ($v2 > $v1 or $v2 > $v3) then 'hello' else (),
+ if ($v2 > $v1 and $v3 < ($v2 + 2)) then 'there' else 'nice',
+ if ($v2 = ($v1 + 1)) then 'A' else (),
+ if ($v3 = ($v2 + 1)) then 'B' else (),
+ if ($v2 = ($v1 + 1)) then 'C' else (),
+ if ($v3 = ($v2 + 1)) then 'D' else ()"/>
+
+ </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