From 71131316b3fedc085246fc9586b4b31e34a654a3 Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Sun, 6 Apr 2008 19:24:36 +0200 Subject: [PATCH] Re-enabled some tests --- TEST | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- test.lisp | 47 ++++++++++++++++++++++------------------------- 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/TEST b/TEST index 4d6e2b7..66221f5 100644 --- a/TEST +++ b/TEST @@ -3262,6 +3262,12 @@ PASS match_match12 [XSLT-Result-Tree] Expected output (1): Xalan_Conformance_Tests/match/match_match12.saxon Actual output: Xalan_Conformance_Tests/match/match_match12.xuriella +PASS match_match13 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/match/match13.noindent-xsl + Data: Xalan_Conformance_Tests/match/match13.xml + Expected output (1): Xalan_Conformance_Tests/match/match_match13.saxon + Actual output: Xalan_Conformance_Tests/match/match_match13.xuriella + PASS match_match14 [XSLT-Result-Tree]: raised an xslt-error as expected Stylesheet: Xalan_Conformance_Tests/match/match14.noindent-xsl Data: Xalan_Conformance_Tests/match/match14.xml @@ -5701,6 +5707,12 @@ PASS numbering_numbering02 [XSLT-Result-Tree] Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering02.saxon Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering02.xuriella +PASS numbering_numbering03 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering03.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering03.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering03.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering03.xuriella + PASS numbering_numbering04 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/numbering/numbering04.noindent-xsl Data: Xalan_Conformance_Tests/numbering/numbering04.xml @@ -5737,6 +5749,18 @@ PASS numbering_numbering09 [XSLT-Result-Tree] Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering09.saxon Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering09.xuriella +PASS numbering_numbering10 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering10.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering10.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering10.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering10.xuriella + +PASS numbering_numbering11 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering11.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering11.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering11.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering11.xuriella + PASS numbering_numbering12 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/numbering/numbering12.noindent-xsl Data: Xalan_Conformance_Tests/numbering/numbering12.xml @@ -6133,6 +6157,18 @@ PASS numbering_numbering79 [XSLT-Result-Tree] Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering79.saxon Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering79.xuriella +PASS numbering_numbering80 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering80.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering80.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering80.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering80.xuriella + +PASS numbering_numbering81 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering81.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering81.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering81.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering81.xuriella + PASS numbering_numbering82 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/numbering/numbering82.noindent-xsl Data: Xalan_Conformance_Tests/numbering/numbering82.xml @@ -6205,6 +6241,18 @@ PASS numbering_numbering93 [XSLT-Result-Tree] Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering93.saxon Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering93.xuriella +PASS numbering_numbering94 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering94.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering94.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering94.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering94.xuriella + +PASS numbering_numbering95 [XSLT-Result-Tree] + Stylesheet: Xalan_Conformance_Tests/numbering/numbering95.noindent-xsl + Data: Xalan_Conformance_Tests/numbering/numbering95.xml + Expected output (1): Xalan_Conformance_Tests/numbering/numbering_numbering95.saxon + Actual output: Xalan_Conformance_Tests/numbering/numbering_numbering95.xuriella + PASS output_output01 [XSLT-Result-Tree] Stylesheet: Xalan_Conformance_Tests/output/output01.noindent-xsl Data: Xalan_Conformance_Tests/output/output01.xml @@ -10575,6 +10623,12 @@ PASS AttributeSets__91037 [XSLT-Result-Tree] Expected output (1): MSFT_Conformance_Tests/AttributeSets/AttributeSets__91037.saxon Actual output: MSFT_Conformance_Tests/AttributeSets/AttributeSets__91037.xuriella +PASS AttributeSets__91038 [XSLT-Result-Tree] + Stylesheet: MSFT_Conformance_Tests/AttributeSets/91038.noindent-xsl + Data: MSFT_Conformance_Tests/AttributeSets/books.xml + Expected output (1): MSFT_Conformance_Tests/AttributeSets/AttributeSets__91038.saxon + Actual output: MSFT_Conformance_Tests/AttributeSets/AttributeSets__91038.xuriella + WARNING: There is no such encoding: "UTF-16". WARNING: There is no such encoding: "UTF-16". WARNING: There is no such encoding: "UTF-16". @@ -19270,4 +19324,4 @@ PASS XSLTFunctions_DocumentFuncWithEmptyArg [Mixed] Expected output (1): MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.saxon Actual output: MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.xuriella -Passed 2820/3073 tests. +Passed 2829/3082 tests. diff --git a/test.lisp b/test.lisp index 06780e1..01456dc 100644 --- a/test.lisp +++ b/test.lisp @@ -294,23 +294,24 @@ :directory directory)))))) (defparameter *bad-tests* - '( ;; INCONSISTENT TESTS: some tests wants us to recover from this - ;; error, yet this one doesn't: + '(;; Inconsistent tests: + ;; + ;; Some tests wants us to recover from this error, yet this one doesn't: "copy_copy61" "copy_copy62" - ;; I'M TOO LAZY TO FIX THIS: we signal a run-time error when and if it's - ;; actually used. The test wants a compilation-time error. - ;; So what? + ;; Should we fix this? + ;; + ;; We signal a run-time error when and if it's actually used. The test + ;; wants a compilation-time error... "AttributeSets_RefToUndefinedAttributeSet" - ;; WE WOULD PASS THIS: we perform recovery, but saxon doesn't. Recovery - ;; results in non-XML output, which we can't parse for comparison - ;; against the official test case. - "output_output75" + ;; We would pass this: ;; - ;; we pass this test, but saxon doesn't - "AttributeSets__91038" + ;; We perform recovery, but saxon doesn't. Recovery results in non-XML + ;; output, which we can't parse for comparison against the official + ;; test case. + "output_output75" ;; ;; we'd pass these tests, but the test authors forgot to declare the ;; entity they're writing, so we can't parse it for comparison. @@ -322,25 +323,20 @@ ;; here an entity declaration wouldn't have helped either: "Copying_ResultTreeFragmentWithEscapedText" - ;; BROKEN TEST: input document not ns-wf + ;; Broken test: + ;; + ;; Input document isn't ns-wf. "Attributes__78387" ;; FIXME: should re-enable these at some point: ;; ;; the following tests take a lot of time due to the problems of current matching algorithm: "impincl_impincl16" - "match_match13" - ;; stack exhaustion -- matching problem i think - "Keys_PerfRepro3" ;; probably the same problem (but I haven't checked): - "numbering_numbering03" - "numbering_numbering10" - "numbering_numbering11" - "numbering_numbering80" - "numbering_numbering81" - "numbering_numbering94" - "numbering_numbering95" - "Import__91164")) + "Import__91164" + + ;; stack exhaustion -- matching problem i think + "Keys_PerfRepro3")) ;; Tests where the output isn't a match because of extraneous whitespace. ;; For these tests, we force space normalization before comparing. @@ -353,7 +349,8 @@ ;; (defparameter *whitespace-issues* '("BVTs_bvt044" - "Namespace-alias__91782")) + "Namespace-alias__91782" + "AttributeSets__91038")) (defun run-tests (&key filter (directory *tests-directory*)) (when (typep filter '(or string cons)) @@ -873,7 +870,7 @@ (report nil ": saxon error not signalled and official output not a match"))))))))))) (defun run-xpath-tests () - (run-tests "XPath-Expression/|XSLT-Data-Model/")) + (run-tests :filter "XPath-Expression/|XSLT-Data-Model/")) ;;;; from cxml-stp-test -- 2.11.4.GIT