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 2026/04/18 01:17:13 UTC

(xalan-java) branch xalan-j_xslt3.0_mvn updated: committing fixes to erroneous xalan-j w3c xslt3.0 test suite driver implementation with current test results as well

This is an automated email from the ASF dual-hosted git repository.

mukulgandhi 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 91c4e9298 committing fixes to erroneous xalan-j w3c xslt3.0 test suite driver implementation with current test results as well
91c4e9298 is described below

commit 91c4e9298596103093deea0b1626e3f085c04378
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Sat Apr 18 06:46:48 2026 +0530

    committing fixes to erroneous xalan-j w3c xslt3.0 test suite driver implementation with current test results as well
---
 .../xalan/tests/util/XslTransformTestsUtil.java    |   4 +-
 .../tests/w3c/xslt3/W3CXslTransformTestsUtil.java  | 164 +++++++++------------
 .../w3c/xslt3/result/attr/_as-test-set_result.xml  |   4 +-
 .../xslt3/result/attr/_tunnel-test-set_result.xml  |   4 +-
 .../result/decl/_function-test-set_result.xml      |  16 +-
 .../insn/_analyze-string-test-set_result.xml       |   4 +-
 .../result/insn/_call-template-test-set_result.xml |   8 +-
 .../result/w3c_xslt3_testsuite_xalan-j_result.xml  |  12 +-
 .../xslt3/result/xalan/fn/_abs-test-set_result.xml |   3 -
 .../_adjust_date_to_timezone-test-set_result.xml   |   3 -
 ...adjust_datetime_to_timezone-test-set_result.xml |   3 -
 .../_adjust_time_to_timezone-test-set_result.xml   |   3 -
 .../xalan/fn/_analyze-string-test-set_result.xml   |   7 -
 .../result/xalan/fn/_apply-test-set_result.xml     |   7 -
 .../xalan/fn/_json_to_xml-test-set_result.xml      |  12 --
 .../result/xalan/insn/_iterate-test-set_result.xml |  10 --
 .../xalan/insn/_perform-sort-test-set_result.xml   |  12 --
 ...c_xslt3_testsuite_xalan_contribution_result.xml |  25 ----
 .../xpath_array/_xpath_array-test-set_result.xml   |  36 -----
 .../xalan/xpath_map/_xpath_map-test-set_result.xml |  36 -----
 .../xpath_op/_node-comparison-test-set_result.xml  |   5 -
 21 files changed, 93 insertions(+), 285 deletions(-)

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 3588b04e9..d482b6db6 100644
--- a/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
+++ b/src/test/java/org/apache/xalan/tests/util/XslTransformTestsUtil.java
@@ -871,7 +871,7 @@ public class XslTransformTestsUtil extends FileComparisonUtil {
      * @param filePathStr1					   The supplied file path string
      * @return                                 The new file path string
      */
-    /*protected String getXslTransformGoldFilePath(String filePathStr1) {
+    protected String getXslTransformGoldFilePath(String filePathStr1) {
     	
     	String result = null;
 
@@ -892,7 +892,7 @@ public class XslTransformTestsUtil extends FileComparisonUtil {
     	}
 
     	return result;
-    }*/
+    }
     
     /**
      * This method is used by, Xalan-J XSL 3 java extension function calls
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 c8a807590..d5641600d 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
@@ -154,10 +154,6 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     protected static String m_testResultFileName = null;
     
     protected static List<String> m_skipped_tests_list = new ArrayList<String>();
-    
-    protected static Document m_testResultDoc = null;
-    
-    protected static Element m_elemTestResult = null;
 	
 	/**
 	 * Method definition, to run all XSL transformation tests from 
@@ -168,7 +164,8 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     	Document xslTestSetDoc = null;
     	
     	FileOutputStream testResultFos = null;
-    	  	
+    	
+    	Document testResultDoc = null;    	
     	Element elemTestRun = null;
     	
     	try {
@@ -178,12 +175,12 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     	   Element xslTestSetDocumentElem = xslTestSetDoc.getDocumentElement();
     	   
 		   String testSetName = xslTestSetDocumentElem.getAttribute(NAME_ATTR);
-		   m_testResultDoc = m_xmlDocumentBuilder.newDocument();
-    	   elemTestRun = m_testResultDoc.createElement("testrun");
+		   testResultDoc = m_xmlDocumentBuilder.newDocument();
+    	   elemTestRun = testResultDoc.createElement("testrun");
     	   String testRunDateStrValue = getDateISOString(new Date());
     	   elemTestRun.setAttribute(NAME_ATTR, testSetName);
     	   elemTestRun.setAttribute("dateTime", testRunDateStrValue);
-    	   m_testResultDoc.appendChild(elemTestRun);    	   
+    	   testResultDoc.appendChild(elemTestRun);    	   
     	   
     	   NodeList nodeList = xslTestSetDoc.getElementsByTagNameNS(W3C_XSLT3_TEST_CATALOG_NS, ELEM_NODE_NAME_TEST_CASE);
     	   int length1 = nodeList.getLength();
@@ -192,7 +189,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		   String testCaseName = ((Element)xslTestCaseNode).getAttribute(NAME_ATTR);     		   
     		   if (isXslt1And2OnlyTestCase(xslTestCaseNode)) {
     			  // We skip running XSLT 2.0/1.0 only test cases
-    			  Element elemTestResult = m_testResultDoc.createElement("testResult");
+    			  Element elemTestResult = testResultDoc.createElement("testResult");
     			  elemTestResult.setAttribute("testName", testCaseName);
     			  elemTestResult.setAttribute(STATUS, "skipped");
     			  elemTestResult.setAttribute("xsltVersion", "XSLT 2.0/1.0 only test case");
@@ -202,7 +199,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		   }
     		   else if (isBackwardCompatibilityTestCase(xslTestCaseNode)) {
      			  // We skip running XSLT backward compatibility test cases
-     			  Element elemTestResult = m_testResultDoc.createElement("testResult");
+     			  Element elemTestResult = testResultDoc.createElement("testResult");
      			  elemTestResult.setAttribute("testName", testCaseName);
   			      elemTestResult.setAttribute(STATUS, "skipped");
   			      elemTestResult.setAttribute("feature", "backwards_compatibility");
@@ -212,7 +209,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
      		   }
     		   else if (isXslSchemaAwareFeatureTestCase(xslTestCaseNode)) {
     			   // We skip running XSLT 3.0 schema aware feature test cases
-    			   Element elemTestResult = m_testResultDoc.createElement("testResult");
+    			   Element elemTestResult = testResultDoc.createElement("testResult");
     			   elemTestResult.setAttribute("testName", testCaseName);
     			   elemTestResult.setAttribute(STATUS, "skipped");
     			   elemTestResult.setAttribute("feature", "schema_aware");
@@ -222,7 +219,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
       		   }
     		   else if (isXslStreamingFeatureTestCase(xslTestCaseNode)) {
      			  // We skip running XSLT 3.0 streaming feature test cases
-       			  Element elemTestResult = m_testResultDoc.createElement("testResult");
+       			  Element elemTestResult = testResultDoc.createElement("testResult");
        			  elemTestResult.setAttribute("testName", testCaseName);
        			  elemTestResult.setAttribute(STATUS, "skipped");
        			  elemTestResult.setAttribute("feature", "streaming");
@@ -236,7 +233,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     			    * test suite, that're configured to be skipped within this XSLT test
     			    * suite driver and permitted by respective W3C XSLT 3.0 test case. 
     			    */
-    			   Element elemTestResult = m_testResultDoc.createElement("testResult");
+    			   Element elemTestResult = testResultDoc.createElement("testResult");
     			   elemTestResult.setAttribute("testName", testCaseName);
     			   elemTestResult.setAttribute(STATUS, "skipped");
     			   elemTestResult.setAttribute("reason", "Xalan configured");
@@ -421,7 +418,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		   
     		   try {
     		      runW3CXSLTTestSuiteXslTransformAndEmitResult(testCaseName, xmlInpDomSource, xslStreamSrc, xslParamMap, 
-    		    		                                                                                  expectedResultElem, elemTestRun, m_testResultDoc);
+    		    		                                                                                  expectedResultElem, elemTestRun, testResultDoc);
     		   }
     		   catch (Exception ex) {
     			  // no op 
@@ -446,7 +443,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     							   expectedResultStr = elemNode.getTextContent();            		
     						   }
 
-    						   verifyTestCaseAgain(m_testResultDoc, testCaseName, xmlDocInpStr, xslStreamSrc, expectedResultStr);
+    						   verifyTestCaseAgain(testResultDoc, testCaseName, xmlDocInpStr, xslStreamSrc, expectedResultStr);
     					   }
     				   }
     				   catch (Exception ex) {
@@ -461,7 +458,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     	}
     	finally {    	   	
     	   try {
-    		   NodeList nodeList = m_testResultDoc.getElementsByTagName("testResult");
+    		   NodeList nodeList = testResultDoc.getElementsByTagName("testResult");
         	   
     		   int testsPassCount = 0;
         	   int testsfailCount = 0;
@@ -495,7 +492,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
         	   elemTestRun.setAttribute("run", String.valueOf(totalTestsRun));
         	   
     		   // Serialize W3C XSLT 3.0 test set results file to file system
-    		   String xslTestResultStr = serializeXmlDomElementNode(m_testResultDoc);
+    		   String xslTestResultStr = serializeXmlDomElementNode(testResultDoc);
         	   
         	   File xslAnalyzeStringTestResultFile = new File(new URI(W3C_XSLT3_TESTS_RESULT_DIR_HOME + m_resultSubFolderName + "/" + m_testResultFileName));
         	   testResultFos = new FileOutputStream(xslAnalyzeStringTestResultFile);
@@ -529,11 +526,11 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     	   
 		   String testSetName = docElem.getAttribute(NAME_ATTR);
 		   testResultDoc = m_xmlDocumentBuilder.newDocument();
-    	   elemTestRun = m_testResultDoc.createElement("testrun");
+    	   elemTestRun = testResultDoc.createElement("testrun");
     	   String testRunDateStrValue = getDateISOString(new Date());
     	   elemTestRun.setAttribute(NAME_ATTR, testSetName);
     	   elemTestRun.setAttribute("dateTime", testRunDateStrValue);
-    	   m_testResultDoc.appendChild(elemTestRun);    	   
+    	   testResultDoc.appendChild(elemTestRun);    	   
     	   
     	   NodeList nodeList = xslTestSetDoc.getElementsByTagNameNS(W3C_XSLT3_TEST_CATALOG_NS, ELEM_NODE_NAME_TEST_CASE);
     	   int length1 = nodeList.getLength();
@@ -542,7 +539,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		   String testCaseName = ((Element)node).getAttribute(NAME_ATTR);     		   
     		   if (isXslt1And2OnlyTestCase(node)) {
      			  // We skip running XSLT 2.0/1.0 only test cases
-     			  Element elemTestResult = m_testResultDoc.createElement("testResult");
+     			  Element elemTestResult = testResultDoc.createElement("testResult");
      			  elemTestResult.setAttribute("testName", testCaseName);
      			  elemTestResult.setAttribute(STATUS, "skipped");
      			  elemTestResult.setAttribute("xsltVersion", "XSLT 2.0/1.0 only test case");
@@ -552,7 +549,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
      		   }
      		   else if (isXslSchemaAwareFeatureTestCase(node)) {
      			   // We skip running XSLT 3.0 schema aware feature test cases
-     			   Element elemTestResult = m_testResultDoc.createElement("testResult");
+     			   Element elemTestResult = testResultDoc.createElement("testResult");
      			   elemTestResult.setAttribute("testName", testCaseName);
      			   elemTestResult.setAttribute(STATUS, "skipped");
      			   elemTestResult.setAttribute("feature", "schema_aware");
@@ -562,7 +559,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
        		   }
      		   else if (isXslStreamingFeatureTestCase(node)) {
      			   // We skip running XSLT 3.0 streaming feature test cases
-     			   Element elemTestResult = m_testResultDoc.createElement("testResult");
+     			   Element elemTestResult = testResultDoc.createElement("testResult");
      			   elemTestResult.setAttribute("testName", testCaseName);
      			   elemTestResult.setAttribute(STATUS, "skipped");
      			   elemTestResult.setAttribute("feature", "streaming");
@@ -576,7 +573,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
      			    * test suite, that're configured to be skipped within this XSLT test
      			    * suite driver and permitted by respective W3C XSLT 3.0 test case. 
      			    */
-     			   Element elemTestResult = m_testResultDoc.createElement("testResult");
+     			   Element elemTestResult = testResultDoc.createElement("testResult");
      			   elemTestResult.setAttribute("testName", testCaseName);
      			   elemTestResult.setAttribute(STATUS, "skipped");
      			   elemTestResult.setAttribute("reason", "Xalan configured");
@@ -701,7 +698,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     	}
     	finally {    	   	
     	   try {
-    		   NodeList nodeList = m_testResultDoc.getElementsByTagName("testResult");
+    		   NodeList nodeList = testResultDoc.getElementsByTagName("testResult");
         	   
     		   int testsPassCount = 0;
         	   int testsfailCount = 0;
@@ -757,7 +754,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		                                                  StreamSource xslStreamSrc, Map<String, XObject> xslParamMap, 
     		                                                  Element expectedResultElem, Element elemTestRun, Document testResultDoc) throws Exception {    	    	
 
-    	//Element elemTestResult = m_testResultDoc.createElement("testResult");
+    	Element elemTestResult = testResultDoc.createElement("testResult");
     	
     	XslTestsErrorHandler xslTransformErrHandler = new XslTestsErrorHandler();
 		List<String> trfErrorList = xslTransformErrHandler.getTrfErrorList();
@@ -766,7 +763,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 		
 		String expErrCodeName = null;
 		
-		m_elemTestResult.setAttribute("testName", testCaseName);
+		elemTestResult.setAttribute("testName", testCaseName);
     	
     	try {
     		m_xslTransformerFactory.setErrorListener(xslTransformErrHandler);
@@ -840,16 +837,17 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     		    setXslTransformProperties(transformer);
     		}
     		else if (EXPECTED_NODE_KIND_ERROR.equals(expectedNodeKindName)) {
-    			handleExpectedXslTransformationError(testResultDoc, m_elemTestResult, trfErrorList, trfFatalErrorList, expErrCodeName, resultStrWriter);
+    			handleExpectedXslTransformationError(testResultDoc, elemTestResult, trfErrorList, 
+    					                                                                    trfFatalErrorList, expErrCodeName, resultStrWriter);
 
     			return;
     		}
     		else if (!SERIALIZATION_MATCHES.equals(expectedNodeKindName)) {
-    			m_elemTestResult.setAttribute(STATUS, FAIL);
+    			elemTestResult.setAttribute(STATUS, FAIL);
 
-    			Element resultOutElem = m_testResultDoc.createElement("outResult");
+    			Element resultOutElem = testResultDoc.createElement("outResult");
     			resultOutElem.setTextContent(resultStrWriter.toString());
-    			m_elemTestResult.appendChild(resultOutElem);
+    			elemTestResult.appendChild(resultOutElem);
 
     			return;
     		}
@@ -898,14 +896,14 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 
     			if (alsoCorrectResultStr != null) {
     				if (alsoCorrectResultStr.equals(resultStrWriter.toString())) {
-    					m_elemTestResult.setAttribute(STATUS, PASS);
+    					elemTestResult.setAttribute(STATUS, PASS);
     				}
     				else {
-    					m_elemTestResult.setAttribute(STATUS, FAIL);
+    					elemTestResult.setAttribute(STATUS, FAIL);
     				}
     			}
     			else {
-    				testCaseOneSerializationMatchCheck(m_elemTestResult, nodeExpected, resultStrWriter, xslTransformMethod);
+    				testCaseOneSerializationMatchCheck(elemTestResult, nodeExpected, resultStrWriter, xslTransformMethod);
     			}
     		}
     		else if (ASSERT_SERIALIZATION.equals(expectedNodeKindName)) {
@@ -946,10 +944,10 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     			}
 
     			if (xslTransformResultStr.equals(expectedResultStr)) {
-    				m_elemTestResult.setAttribute(STATUS, PASS);
+    				elemTestResult.setAttribute(STATUS, PASS);
     			}
     			else {
-    				m_elemTestResult.setAttribute(STATUS, FAIL);
+    				elemTestResult.setAttribute(STATUS, FAIL);
     			}    				
     		}
     		else if (EXPECTED_NODE_KIND_ASSERT_ALL_OF.equals(expectedNodeKindName)) {
@@ -987,10 +985,10 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     			    }
     				
     				if (testCasePass) {
-    					m_elemTestResult.setAttribute(STATUS, PASS);
+    	    		    elemTestResult.setAttribute(STATUS, PASS);
     	    		}
     	    		else {
-    	    			m_elemTestResult.setAttribute(STATUS, FAIL);
+    	    			elemTestResult.setAttribute(STATUS, FAIL);
     	    		}
     				
     				return;
@@ -1030,14 +1028,14 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
     					alsoCorrectResultStr = alsoCorrectResultStr.replaceAll("\\s", "");
     					String actualResultStr = resultStrWriter.toString();
     					if (alsoCorrectResultStr.equals(actualResultStr.replaceAll("\\s", ""))) {
-    						m_elemTestResult.setAttribute(STATUS, PASS);
+    						elemTestResult.setAttribute(STATUS, PASS);
     					}
     					else {
-    						m_elemTestResult.setAttribute(STATUS, FAIL);
+    						elemTestResult.setAttribute(STATUS, FAIL);
     					}
     				}
     				else {
-    					testCaseMultipleSerializationMatchChecks(m_elemTestResult, resultStrWriter, nodeList1, xslTransformMethod);
+    					testCaseMultipleSerializationMatchChecks(elemTestResult, resultStrWriter, nodeList1, xslTransformMethod);
     				}
     			}
     			else if (isXslMessageTest && (nodeListLength2 == 1) && (nodeListLength3 > 0)) {    				
@@ -1068,7 +1066,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
                 	
                 	if (isTestCasePass) {                		
                 		if (!isXslMessageTest) {
-                		   m_elemTestResult.setAttribute(STATUS, PASS);
+                		   elemTestResult.setAttribute(STATUS, PASS);
                 		}
                 		else if (xslMessageResultPrefixStr != null) {
                 		   String[] actualPrefixStrArr1 = xslMessageResultPrefixStr.split("\r?\n");
@@ -1132,22 +1130,22 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
                 		   }
                 		   
                 		   if (passStatus1) {
-                			   m_elemTestResult.setAttribute(STATUS, PASS); 
+                			  elemTestResult.setAttribute(STATUS, PASS); 
                 		   }
                 		   else {
-                			   m_elemTestResult.setAttribute(STATUS, FAIL); 
+                			  elemTestResult.setAttribute(STATUS, FAIL); 
                 		   }
                 		}
                 		else {
-                			m_elemTestResult.setAttribute(STATUS, PASS);
+                		   elemTestResult.setAttribute(STATUS, PASS);
                 		}
                 	}
                 	else {
-                		m_elemTestResult.setAttribute(STATUS, FAIL);
+                		elemTestResult.setAttribute(STATUS, FAIL);
                 	}
     			}
     			else {
-    				testCaseExpectedAssertXPathList(m_elemTestResult, nodeExpected, resultStrWriter, trfWarningList);
+    				testCaseExpectedAssertXPathList(elemTestResult, nodeExpected, resultStrWriter, trfWarningList);
     			}
     		}
     		else if (EXPECTED_NODE_KIND_ASSERT_ANY_OF.equals(expectedNodeKindName)) {
@@ -1159,10 +1157,10 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 				
 				if (alsoCorrectResultStr != null) {
 					if (alsoCorrectResultStr.equals(resultStrWriter.toString())) {
-						m_elemTestResult.setAttribute(STATUS, PASS);
+						elemTestResult.setAttribute(STATUS, PASS);
 					}
 					else {
-						m_elemTestResult.setAttribute(STATUS, FAIL);
+						elemTestResult.setAttribute(STATUS, FAIL);
 					}
 				}				
 				else {
@@ -1187,7 +1185,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 		                	String string2 = XslTransformEvaluationHelper.serializeXmlDomElementNode(document2);
 							
 							if (isTwoXmlHtmlStrEqual(string1, string2)) {																								
-								m_elemTestResult.setAttribute(STATUS, PASS);								
+								elemTestResult.setAttribute(STATUS, PASS);								
 								isTestCasePass = true;								
 								
 								break;
@@ -1195,9 +1193,9 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 						}						
 						else if ((childNode instanceof Element) && EXPECTED_NODE_KIND_ERROR.equals(((Element)childNode).getNodeName())) {
 							expErrCodeName = ((Element)childNode).getAttribute("code"); 
-							handleExpectedXslTransformationError(testResultDoc, m_elemTestResult, trfErrorList, 
+							handleExpectedXslTransformationError(testResultDoc, elemTestResult, trfErrorList, 
 																 trfFatalErrorList, expErrCodeName, resultStrWriter);							
-							String testResultStatus = m_elemTestResult.getAttribute(STATUS);
+							String testResultStatus = elemTestResult.getAttribute(STATUS);
 							if (PASS.equals(testResultStatus)) {
 							   break;	
 							}							
@@ -1206,8 +1204,8 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 						childNode = childNode.getNextSibling();
 					}
 
-					if (isAssertXml && !isTestCasePass && !PASS.equals(m_elemTestResult.getAttribute(STATUS))) {
-						m_elemTestResult.setAttribute(STATUS, FAIL);
+					if (isAssertXml && !isTestCasePass && !PASS.equals(elemTestResult.getAttribute(STATUS))) {
+						elemTestResult.setAttribute(STATUS, FAIL);
 					}
 				}
     		}
@@ -1224,28 +1222,6 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
             		expectedResultStr = elemNode.getTextContent();            		
             	}
             	
-            	if ((m_resultSubFolderName == null) && (m_testResultFileName == null)) {
-            		// This if for Xalan-J xslt 3.0 specific test cases, that're failing
-            		// the usual way.
-            		expectedResultStr = expectedResultStr.trim();
-            		String resultStrWriter2 = (resultStrWriter.toString()).trim();
-            		
-            		Document xmlInpDoc1 = m_xmlDocumentBuilder.parse(new ByteArrayInputStream(expectedResultStr.getBytes()));            		
-            		Document xmlInpDoc2 = m_xmlDocumentBuilder.parse(new ByteArrayInputStream(resultStrWriter2.getBytes()));
-            		
-            		String xmlDocStr1 = serializeXmlDomElementNode(xmlInpDoc1);
-            		String xmlDocStr2 = serializeXmlDomElementNode(xmlInpDoc2);
-            		
-            		if (xmlDocStr1.equals(xmlDocStr2)) {
-            			m_elemTestResult.setAttribute(STATUS, PASS);
-            		}
-            		else {
-            			m_elemTestResult.setAttribute(STATUS, FAIL);
-            		}
-            		
-            		return;
-            	}
-            	
             	String ignorePrefixesStr = elemNode.getAttribute("ignore-prefixes");
             	
             	String resultStr1 = resultStrWriter.toString();
@@ -1294,7 +1270,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
             		xmlHtmlStr2 = serializeXmlDomElementNode(xmlInpDoc2);
             	}
             	
-            	// This needs to have, an improved test case verification logic
+            	// This needs to have, an improved test case verification logic.
             	String alsoCorrectResultStr = null;
             	if (m_xslTransformTestSetFilePath.contains("attr/mode/") && "mode-0016".equals(testCaseName)) {
             	   alsoCorrectResultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><out>\r\n"
@@ -1318,17 +1294,17 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
             	
             	if (alsoCorrectResultStr != null) {            		            		
             		if (alsoCorrectResultStr.equals(xmlHtmlStr1.replaceAll("\\s", ""))) {
-            			m_elemTestResult.setAttribute(STATUS, PASS);
+            			elemTestResult.setAttribute(STATUS, PASS);
             		}
             		else {
-            			m_elemTestResult.setAttribute(STATUS, FAIL);
+            			elemTestResult.setAttribute(STATUS, FAIL);
             		}
             	}
             	else if (isTwoXmlHtmlStrEqual(xmlHtmlStr1, xmlHtmlStr2)) {            		
-            		m_elemTestResult.setAttribute(STATUS, PASS);
+            		elemTestResult.setAttribute(STATUS, PASS);
             	}
             	else {
-            		m_elemTestResult.setAttribute(STATUS, FAIL);
+            		elemTestResult.setAttribute(STATUS, FAIL);
             	}
     		}
             else if (EXPECTED_NODE_KIND_ASSERT.equals(expectedNodeKindName)) {
@@ -1383,13 +1359,11 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
             	String str1 = resultStrWriter.toString();
             	
             	if (TRUE.equals(str1)) {            		
-            		m_elemTestResult.setAttribute(STATUS, PASS);
+            		elemTestResult.setAttribute(STATUS, PASS);
             	}
             	else {
-            		m_elemTestResult.setAttribute(STATUS, FAIL);
+            		elemTestResult.setAttribute(STATUS, FAIL);
             	}
-            	
-            	return;
     		}
             else if (EXPECTED_NODE_KIND_ASSERT_STRING_VALUE.equals(expectedNodeKindName)) {
             	String strExpectedValue = (nodeExpected.getTextContent()).trim();
@@ -1407,37 +1381,39 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
             	   actualResultStr = actualResultStr.substring(actualResultStr.indexOf('>') + 1, actualResultStr.length());
             	   actualResultStr = actualResultStr.trim();
             	   if (strExpectedValue.equals(actualResultStr)) {
-            		   m_elemTestResult.setAttribute(STATUS, PASS);  
+            		  elemTestResult.setAttribute(STATUS, PASS);  
             	   }
             	   else {
-            		   m_elemTestResult.setAttribute(STATUS, FAIL); 
+            		  elemTestResult.setAttribute(STATUS, FAIL); 
             	   }
             	}
             }
             else if (EXPECTED_NODE_KIND_ERROR.equals(expectedNodeKindName)) {
-            	handleExpectedXslTransformationError(testResultDoc, m_elemTestResult, trfErrorList, 
+            	handleExpectedXslTransformationError(testResultDoc, elemTestResult, trfErrorList, 
                         							                trfFatalErrorList, expErrCodeName, resultStrWriter);
             }
     	}
     	catch (SAXException ex) {
-    		handleTestCaseFailException(testResultDoc, trfErrorList, trfFatalErrorList, m_elemTestResult, expErrCodeName);
+    		handleTestCaseFailException(testResultDoc, trfErrorList, trfFatalErrorList, 
+    				                                                                 elemTestResult, expErrCodeName);
     	}
     	catch (Exception ex) {
     		String errMesg = ex.getMessage();
     		if ((errMesg != null) && (expErrCodeName != null)) {
     			if (errMesg.contains(expErrCodeName)) {
-    				m_elemTestResult.setAttribute(STATUS, PASS);
+    			   elemTestResult.setAttribute(STATUS, PASS);
     			}
     			else {
-    				m_elemTestResult.setAttribute(STATUS, FAIL);
+    			   elemTestResult.setAttribute(STATUS, FAIL);
     			}
     		}
     		else {
-               handleTestCaseFailException(testResultDoc, trfErrorList, trfFatalErrorList, m_elemTestResult, expErrCodeName);
+               handleTestCaseFailException(testResultDoc, trfErrorList, trfFatalErrorList, 
+            		                                                                 elemTestResult, expErrCodeName);
     		}
     	}
     	finally {
-    		elemTestRun.appendChild(m_elemTestResult);    		
+    		elemTestRun.appendChild(elemTestResult);    		
     		trfErrorList.clear();
     		trfFatalErrorList.clear();
     		
@@ -2080,7 +2056,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 			// i.e, this test case has failed.
 			elemTestResult.setAttribute(STATUS, FAIL);
 			
-			Element resultOutElem = m_testResultDoc.createElement("outResult");
+			Element resultOutElem = testResultDoc.createElement("outResult");
 			resultOutElem.setTextContent(resultStrWriter.toString());
 			elemTestResult.appendChild(resultOutElem);
 		}
@@ -2216,7 +2192,7 @@ public class W3CXslTransformTestsUtil extends XslTransformTestsUtil {
 			                                                                              ParserConfigurationException, 
 			                                                                              TransformerConfigurationException, TransformerException {
 		
-		NodeList nodeList3 = m_testResultDoc.getElementsByTagName("testResult");		
+		NodeList nodeList3 = testResultDoc.getElementsByTagName("testResult");		
 		int length1 = nodeList3.getLength();
 		for (int idx2 = 0; idx2 < length1; idx2++) {
 			Element elem1 = (Element)(nodeList3.item(idx2));
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 678eee36a..520938efe 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="2026-03-12T11:38:07Z" fail="15" name="as" pass="90" run="105" skipped="99" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-04-18T01:04:05Z" fail="16" name="as" pass="89" run="105" skipped="99" statusUnknown="0">
    <testResult status="pass" testName="as-0101"/>
    <testResult status="pass" testName="as-0102"/>
    <testResult status="pass" testName="as-0103"/>
@@ -126,7 +126,7 @@
    <testResult reason="Xalan configured" status="skipped" testName="as-1304"/>
    <testResult status="fail" testName="as-1401"/>
    <testResult status="fail" testName="as-1402"/>
-   <testResult status="pass" testName="as-1403"/>
+   <testResult status="fail" testName="as-1403"/>
    <testResult status="fail" testName="as-1404"/>
    <testResult status="fail" testName="as-1405"/>
    <testResult status="fail" testName="as-1501"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_tunnel-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_tunnel-test-set_result.xml
index c5b8c75ad..9a79739d4 100644
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_tunnel-test-set_result.xml
+++ b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/attr/_tunnel-test-set_result.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-02-20T15:34:45Z" fail="40" name="tunnel" pass="18" run="58" skipped="0" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-04-18T01:04:44Z" fail="39" name="tunnel" pass="19" run="58" skipped="0" statusUnknown="0">
    <testResult status="pass" testName="tunnel-0101"/>
    <testResult status="pass" testName="tunnel-0102"/>
    <testResult status="fail" testName="tunnel-0103"/>
@@ -56,7 +56,7 @@
    <testResult status="fail" testName="tunnel-0223"/>
    <testResult status="fail" testName="tunnel-0224"/>
    <testResult status="fail" testName="tunnel-0225"/>
-   <testResult status="fail" testName="tunnel-0226"/>
+   <testResult status="pass" testName="tunnel-0226"/>
    <testResult status="fail" testName="tunnel-0227"/>
    <testResult status="pass" testName="tunnel-0301"/>
    <testResult status="pass" testName="tunnel-0302"/>
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 eba9feb4c..cbf77bf78 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="2026-02-20T15:33:31Z" fail="26" name="function" pass="61" run="87" skipped="23" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-04-18T01:04:17Z" fail="24" name="function" pass="63" run="87" skipped="23" statusUnknown="0">
    <testResult status="pass" testName="function-0001"/>
    <testResult status="pass" testName="function-0002"/>
    <testResult status="pass" testName="function-0003"/>
@@ -72,11 +72,7 @@
    <testResult status="fail" testName="function-1018">
       <outResult/>
    </testResult>
-   <testResult status="fail" testName="function-1019">
-      <outResult>
-         <errTrace>XPTY0004 : An XSL function call argument at position 1 for function {http://xxx.com/}test, doesn't match the declared parameter type xs:integer.</errTrace>
-      </outResult>
-   </testResult>
+   <testResult status="pass" testName="function-1019"/>
    <testResult status="pass" testName="function-1020"/>
    <testResult status="fail" testName="function-1021">
       <outResult>&lt;?xml version="1.0" encoding="UTF-8"?&gt;&lt;out xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:x="http://xxx.com/"/&gt;</outResult>
@@ -125,13 +121,7 @@
    <testResult status="fail" testName="function-1301"/>
    <testResult status="pass" testName="function-1401"/>
    <testResult status="pass" testName="function-1501"/>
-   <testResult status="fail" testName="function-1601">
-      <outResult>
-         <errTrace>Could not find function: {http://www.w3.org/2005/xpath-functions}environment-variable()</errTrace>
-         <errTrace>function token not found.</errTrace>
-         <errTrace>java.lang.NullPointerException</errTrace>
-      </outResult>
-   </testResult>
+   <testResult status="pass" testName="function-1601"/>
    <testResult status="pass" testName="function-1701"/>
    <testResult status="pass" testName="function-1901"/>
    <testResult status="skipped" testName="function-1902" xsltVersion="XSLT 2.0/1.0 only test case"/>
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 a09ceb902..80c8ca21a 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,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-02-20T15:34:19Z" fail="8" name="analyze-string" pass="45" run="53" skipped="5" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-04-18T01:04:30Z" fail="9" name="analyze-string" pass="44" run="53" skipped="5" statusUnknown="0">
    <testResult status="pass" testName="analyze-string-001"/>
-   <testResult status="pass" testName="analyze-string-002"/>
+   <testResult status="fail" testName="analyze-string-002"/>
    <testResult status="pass" testName="analyze-string-003"/>
    <testResult status="pass" testName="analyze-string-005"/>
    <testResult status="pass" testName="analyze-string-006"/>
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 dd1cd582c..5ab2851db 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="2026-02-28T09:14:49Z" fail="6" name="call-template" pass="34" run="40" skipped="2" statusUnknown="0">
+<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-04-18T01:04:25Z" fail="7" name="call-template" pass="33" run="40" skipped="2" statusUnknown="0">
    <testResult status="pass" testName="call-template-0001"/>
    <testResult status="pass" testName="call-template-0101"/>
    <testResult status="fail" testName="call-template-0102"/>
@@ -34,7 +34,11 @@
    <testResult status="pass" testName="call-template-0802"/>
    <testResult status="pass" testName="call-template-0901"/>
    <testResult status="pass" testName="call-template-1001"/>
-   <testResult status="pass" testName="call-template-1002"/>
+   <testResult status="fail" testName="call-template-1002">
+      <outResult>
+         <errTrace>java.lang.ArrayIndexOutOfBoundsException: -1</errTrace>
+      </outResult>
+   </testResult>
    <testResult reason="Xalan configured" status="skipped" testName="call-template-1003"/>
    <testResult status="pass" testName="call-template-1101"/>
    <testResult status="pass" testName="call-template-1102"/>
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 dc3c7b0c7..010507331 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,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2026-03-12T11:40:49Z" desc="W3C XSLT 3.0 test suite results" fail="1314" pass="3450" run="4770" skipped="609" success="72.33%" xslt_processor="Apache Xalan XSLT 3.0 development code">
+<testResult dateTime="2026-04-18T01:05:02Z" desc="W3C XSLT 3.0 test suite results" fail="1315" pass="3449" run="4770" skipped="609" success="72.31%" xslt_processor="Apache Xalan XSLT 3.0 development code">
   <attr>
-    <as fail="15" pass="90" run="105" skipped="99" success="85.71%"/>
+    <as fail="16" pass="89" run="105" skipped="99" success="84.76%"/>
     <avt fail="0" pass="34" run="34" skipped="1" success="100.0%"/>
     <disable-output-escaping fail="5" pass="22" run="27" skipped="5" success="81.48%"/>
     <expand-text fail="7" pass="52" run="59" skipped="3" success="88.14%"/>
     <match fail="81" pass="101" run="182" skipped="112" success="55.49%"/>
     <mode fail="69" pass="72" run="141" skipped="28" success="51.06%"/>
     <select fail="26" pass="105" run="132" skipped="26" success="79.55%"/>
-    <tunnel fail="40" pass="18" run="58" skipped="0" success="31.03%"/>
+    <tunnel fail="39" pass="19" run="58" skipped="0" success="32.76%"/>
     <xpath-default-namespace fail="10" pass="12" run="22" skipped="4" success="54.55%"/>
   </attr>
   <decl>
     <attribute-set fail="7" pass="42" run="49" skipped="1" success="85.71%"/>
     <character-map fail="13" pass="14" run="28" skipped="1" success="50.0%"/>
     <context-item fail="13" pass="18" run="31" skipped="0" success="58.06%"/>
-    <function fail="25" pass="62" run="87" skipped="23" success="71.26%"/>
+    <function fail="24" pass="63" run="87" skipped="23" success="72.41%"/>
     <global-context-item fail="4" pass="10" run="14" skipped="0" success="71.43%"/>
     <package fail="31" pass="23" run="54" skipped="18" success="42.59%"/>
     <param fail="17" pass="13" run="30" skipped="1" success="43.33%"/>
@@ -44,10 +44,10 @@
     <xml-to-json fail="35" pass="52" run="88" skipped="65" success="59.09%"/>
   </fn>
   <insn>
-    <analyze-string fail="8" pass="45" run="53" skipped="5" success="84.91%"/>
+    <analyze-string fail="9" pass="44" run="53" skipped="5" success="83.02%"/>
     <apply-templates fail="15" pass="22" run="37" skipped="13" success="59.46%"/>
     <attribute fail="11" pass="11" run="23" skipped="7" success="47.83%"/>
-    <call-template fail="6" pass="34" run="40" skipped="2" success="85.0%"/>
+    <call-template fail="7" pass="33" run="40" skipped="2" success="82.5%"/>
     <choose fail="6" pass="48" run="54" skipped="1" success="88.89%"/>
     <construct-node fail="12" pass="22" run="34" skipped="0" success="64.71%"/>
     <copy fail="47" pass="78" run="125" skipped="23" success="62.4%"/>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_abs-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_abs-test-set_result.xml
deleted file mode 100644
index e1cf026dd..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_abs-test-set_result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:26Z" fail="0" name="abs" pass="1" run="1" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="abs-001"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_date_to_timezone-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_date_to_timezone-test-set_result.xml
deleted file mode 100644
index bf33ae7af..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_date_to_timezone-test-set_result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="adjust-date-to-timezone" pass="1" run="1" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="adjust_date_to_timezone-001"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_datetime_to_timezone-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_datetime_to_timezone-test-set_result.xml
deleted file mode 100644
index f88a0fd71..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_datetime_to_timezone-test-set_result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="adjust-datetime-to-timezone" pass="1" run="1" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="adjust_datetime_to_timezone-001"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_time_to_timezone-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_time_to_timezone-test-set_result.xml
deleted file mode 100644
index ab56fe92a..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_adjust_time_to_timezone-test-set_result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="adjust-time-to-timezone" pass="1" run="1" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="adjust_time_to_timezone-001"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_analyze-string-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_analyze-string-test-set_result.xml
deleted file mode 100644
index e73139dfa..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_analyze-string-test-set_result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="analyze-string" pass="5" run="5" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="analyze_string-001"/>
-   <testResult status="pass" testName="analyze_string-002"/>
-   <testResult status="pass" testName="analyze_string-003"/>
-   <testResult status="pass" testName="analyze_string-004"/>
-   <testResult status="pass" testName="analyze_string-005"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_apply-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_apply-test-set_result.xml
deleted file mode 100644
index b3fd2ab95..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_apply-test-set_result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:28Z" fail="0" name="apply" pass="5" run="5" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="apply-001"/>
-   <testResult status="pass" testName="apply-002"/>
-   <testResult status="pass" testName="apply-003"/>
-   <testResult status="pass" testName="apply-004"/>
-   <testResult status="pass" testName="apply-005"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_json_to_xml-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_json_to_xml-test-set_result.xml
deleted file mode 100644
index 3f4ffe322..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/fn/_json_to_xml-test-set_result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:28Z" fail="0" name="json_to_xml" pass="10" run="10" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="json_to_xml-001"/>
-   <testResult status="pass" testName="json_to_xml-002"/>
-   <testResult status="pass" testName="json_to_xml-003"/>
-   <testResult status="pass" testName="json_to_xml-004"/>
-   <testResult status="pass" testName="json_to_xml-005"/>
-   <testResult status="pass" testName="json_to_xml-006"/>
-   <testResult status="pass" testName="json_to_xml-007"/>
-   <testResult status="pass" testName="json_to_xml-008"/>
-   <testResult status="pass" testName="json_to_xml-009"/>
-   <testResult status="pass" testName="json_to_xml-010"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_iterate-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_iterate-test-set_result.xml
deleted file mode 100644
index 1baacae62..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_iterate-test-set_result.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:29Z" fail="0" name="iterate" pass="8" run="8" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="iterate-001"/>
-   <testResult status="pass" testName="iterate-002"/>
-   <testResult status="pass" testName="iterate-003"/>
-   <testResult status="pass" testName="iterate-004"/>
-   <testResult status="pass" testName="iterate-005"/>
-   <testResult status="pass" testName="iterate-006"/>
-   <testResult status="pass" testName="iterate-007"/>
-   <testResult status="pass" testName="iterate-008"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_perform-sort-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_perform-sort-test-set_result.xml
deleted file mode 100644
index 100cdb143..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/insn/_perform-sort-test-set_result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="perform_sort" pass="10" run="10" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="perform-sort-001"/>
-   <testResult status="pass" testName="perform-sort-002"/>
-   <testResult status="pass" testName="perform-sort-003"/>
-   <testResult status="pass" testName="perform-sort-004"/>
-   <testResult status="pass" testName="perform-sort-005"/>
-   <testResult status="pass" testName="perform-sort-006"/>
-   <testResult status="pass" testName="perform-sort-007"/>
-   <testResult status="pass" testName="perform-sort-008"/>
-   <testResult status="pass" testName="perform-sort-009"/>
-   <testResult status="pass" testName="perform-sort-010"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/w3c_xslt3_testsuite_xalan_contribution_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/w3c_xslt3_testsuite_xalan_contribution_result.xml
deleted file mode 100644
index 192f20c63..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/w3c_xslt3_testsuite_xalan_contribution_result.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<testResult dateTime="2026-01-09T16:50:41Z" desc="W3C XSLT 3.0 test suite results" fail="0" pass="113" run="113" skipped="0" success="100.0%" xslt_processor="Apache Xalan XSLT 3.0 development code">
-  <fn>
-    <abs fail="0" pass="1" run="1" skipped="0" success="100.0%"/>
-    <adjust-datetime-to-timezone fail="0" pass="1" run="1" skipped="0" success="100.0%"/>
-    <adjust-date-to-timezone fail="0" pass="1" run="1" skipped="0" success="100.0%"/>
-    <adjust-time-to-timezone fail="0" pass="1" run="1" skipped="0" success="100.0%"/>
-    <analyze-string fail="0" pass="5" run="5" skipped="0" success="100.0%"/>
-    <apply fail="0" pass="5" run="5" skipped="0" success="100.0%"/>
-    <json_to_xml fail="0" pass="10" run="10" skipped="0" success="100.0%"/>
-  </fn>
-  <insn>
-    <iterate fail="0" pass="8" run="8" skipped="0" success="100.0%"/>
-    <perform_sort fail="0" pass="10" run="10" skipped="0" success="100.0%"/>
-  </insn>
-  <xpath_array>
-    <xpath_array fail="0" pass="34" run="34" skipped="0" success="100.0%"/>
-  </xpath_array>
-  <xpath_map>
-    <xpath_map fail="0" pass="34" run="34" skipped="0" success="100.0%"/>
-  </xpath_map>
-  <xpath_op>
-    <node-comparison fail="0" pass="3" run="3" skipped="0" success="100.0%"/>
-  </xpath_op>
-</testResult>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_array/_xpath_array-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_array/_xpath_array-test-set_result.xml
deleted file mode 100644
index e26f2e2cd..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_array/_xpath_array-test-set_result.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:30Z" fail="0" name="xpath_array" pass="34" run="34" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="array-001"/>
-   <testResult status="pass" testName="array-002"/>
-   <testResult status="pass" testName="array-003"/>
-   <testResult status="pass" testName="array-004"/>
-   <testResult status="pass" testName="array-005"/>
-   <testResult status="pass" testName="array-006"/>
-   <testResult status="pass" testName="array-007"/>
-   <testResult status="pass" testName="array-008"/>
-   <testResult status="pass" testName="array-009"/>
-   <testResult status="pass" testName="array-010"/>
-   <testResult status="pass" testName="array-011"/>
-   <testResult status="pass" testName="array-012"/>
-   <testResult status="pass" testName="array-013"/>
-   <testResult status="pass" testName="array-014"/>
-   <testResult status="pass" testName="array-015"/>
-   <testResult status="pass" testName="array-016"/>
-   <testResult status="pass" testName="array-017"/>
-   <testResult status="pass" testName="array-018"/>
-   <testResult status="pass" testName="array-019"/>
-   <testResult status="pass" testName="array-020"/>
-   <testResult status="pass" testName="array-021"/>
-   <testResult status="pass" testName="array-022"/>
-   <testResult status="pass" testName="array-023"/>
-   <testResult status="pass" testName="array-024"/>
-   <testResult status="pass" testName="array-025"/>
-   <testResult status="pass" testName="array-026"/>
-   <testResult status="pass" testName="array-027"/>
-   <testResult status="pass" testName="array-028"/>
-   <testResult status="pass" testName="array-029"/>
-   <testResult status="pass" testName="array-030"/>
-   <testResult status="pass" testName="array-031"/>
-   <testResult status="pass" testName="array-032"/>
-   <testResult status="pass" testName="array-033"/>
-   <testResult status="pass" testName="array-034"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_map/_xpath_map-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_map/_xpath_map-test-set_result.xml
deleted file mode 100644
index 1795da81d..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_map/_xpath_map-test-set_result.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:29Z" fail="0" name="xpath_map" pass="34" run="34" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="map-001"/>
-   <testResult status="pass" testName="map-002"/>
-   <testResult status="pass" testName="map-003"/>
-   <testResult status="pass" testName="map-004"/>
-   <testResult status="pass" testName="map-005"/>
-   <testResult status="pass" testName="map-006"/>
-   <testResult status="pass" testName="map-007"/>
-   <testResult status="pass" testName="map-008"/>
-   <testResult status="pass" testName="map-009"/>
-   <testResult status="pass" testName="map-010"/>
-   <testResult status="pass" testName="map-011"/>
-   <testResult status="pass" testName="map-012"/>
-   <testResult status="pass" testName="map-013"/>
-   <testResult status="pass" testName="map-014"/>
-   <testResult status="pass" testName="map-015"/>
-   <testResult status="pass" testName="map-016"/>
-   <testResult status="pass" testName="map-017"/>
-   <testResult status="pass" testName="map-018"/>
-   <testResult status="pass" testName="map-019"/>
-   <testResult status="pass" testName="map-020"/>
-   <testResult status="pass" testName="map-021"/>
-   <testResult status="pass" testName="map-022"/>
-   <testResult status="pass" testName="map-023"/>
-   <testResult status="pass" testName="map-024"/>
-   <testResult status="pass" testName="map-025"/>
-   <testResult status="pass" testName="map-026"/>
-   <testResult status="pass" testName="map-027"/>
-   <testResult status="pass" testName="map-028"/>
-   <testResult status="pass" testName="map-029"/>
-   <testResult status="pass" testName="map-030"/>
-   <testResult status="pass" testName="map-031"/>
-   <testResult status="pass" testName="map-032"/>
-   <testResult status="pass" testName="map-033"/>
-   <testResult status="pass" testName="map-034"/>
-</testrun>
diff --git a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_op/_node-comparison-test-set_result.xml b/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_op/_node-comparison-test-set_result.xml
deleted file mode 100644
index 11f16f490..000000000
--- a/src/test/java/org/apache/xalan/tests/w3c/xslt3/result/xalan/xpath_op/_node-comparison-test-set_result.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><testrun dateTime="2026-01-09T16:50:27Z" fail="0" name="node-comparison" pass="3" run="3" skipped="0" statusUnknown="0">
-   <testResult status="pass" testName="node-comparison-001"/>
-   <testResult status="pass" testName="node-comparison-002"/>
-   <testResult status="pass" testName="node-comparison-003"/>
-</testrun>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org