test(xquery): remove SAXON12_INITIAL_ISSUES_FIXED

https://saxonica.plan.io/issues/6082 https://saxonica.plan.io/issues/6116
AirQuick · Nov 30, 2023 · 29ae18d · 29ae18d
1 parent 2c06b6f
commit 29ae18d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 29 deletions.
diff --git a/test/run-bats.cmd b/test/run-bats.cmd
@@ -32,10 +32,6 @@ if "%SAXON_VERSION%"=="10.2" set SAXON_BUG_4696_FIXED=
 set XMLRESOLVERORG_XMLRESOLVER_BUG_117_FIXED=1
 if "%XMLRESOLVERORG_XMLRESOLVER_VERSION%"=="4.5.0" set XMLRESOLVERORG_XMLRESOLVER_BUG_117_FIXED=
 
-rem TODO: Resolve these issues!
-set SAXON12_INITIAL_ISSUES_FIXED=1
-if "%SAXON_VERSION:~0,3%"=="12." set SAXON12_INITIAL_ISSUES_FIXED=
-
 rem Unset Ant environment variables
 set ANT_ARGS=
 set ANT_OPTS=

diff --git a/test/run-bats.sh b/test/run-bats.sh
@@ -41,12 +41,6 @@ case "${XMLRESOLVERORG_XMLRESOLVER_VERSION}" in
         ;;
 esac
 
-# TODO: Resolve these issues!
-export SAXON12_INITIAL_ISSUES_FIXED=1
-if [ "${SAXON_VERSION:0:3}" == "12." ]; then
-    unset SAXON12_INITIAL_ISSUES_FIXED
-fi
-
 # Unset JVM environment variables which make output line numbers unpredictable
 unset _JAVA_OPTIONS
 unset JAVA_TOOL_OPTIONS

diff --git a/test/win-bats/collection.xml b/test/win-bats/collection.xml
@@ -1740,7 +1740,7 @@
     call :verify_line -1 x "*** Error running the test suite"
 	</case>
 
-	<case ifdef="SAXON12_INITIAL_ISSUES_FIXED" name="Non-boolean @test (multiple xs:boolean) with no comparison factors (XQuery)">
+	<case name="Non-boolean @test (multiple xs:boolean) with no comparison factors (XQuery)">
     call :run ..\bin\xspec.bat -q bad-assertion\non-boolean-test\multiple-boolean.xspec
     call :verify_retval 2
     call :verify_line  8 r "  FOER0000[: ] ERROR in x:expect ('Non-boolean @test (multiple xs:boolean) with no comparison$"
@@ -1790,7 +1790,7 @@
     call :verify_line -1 r "\[main\] ERROR "
 	</case>
 
-	<case ifdef="SAXON12_INITIAL_ISSUES_FIXED XMLCALABASH_CP" name="XQuery selecting nodes without context should be error (XProc) #423">
+	<case ifdef="XMLCALABASH_CP" name="XQuery selecting nodes without context should be error (XProc) #423">
     call :run java -cp "%XMLCALABASH_CP%;%SAXON_JAR%" com.xmlcalabash.drivers.Main ^
         -i source=issue-423/test.xspec ^
         -p xspec-home="file:///%PARENT_DIR_ABS:\=/%/" ^
@@ -1826,7 +1826,7 @@
     call :verify_line -1 x "*** Error collecting test coverage data"
 	</case>
 
-	<case ifdef="SAXON12_INITIAL_ISSUES_FIXED" name="XQuery selecting nodes without context should be error (CLI) #423">
+	<case name="XQuery selecting nodes without context should be error (CLI) #423">
     call :run ..\bin\xspec.bat -q issue-423\test.xspec
     call :verify_retval 2
     call :verify_line  * r "  XPDY0002[: ]"
@@ -2176,7 +2176,7 @@
     call :verify_line * r "  my-error-code[: ] Error signalled .*"
 	</case>
 
-	<case ifdef="SAXON12_INITIAL_ISSUES_FIXED" name="Error in SUT should not be caught by default (XQuery)">
+	<case name="Error in SUT should not be caught by default (XQuery)">
     call :run ..\bin\xspec.bat -q catch\no-by-default.xspec
     call :verify_retval 2
     call :verify_line * r "  my-error-code[: ] Error signalled .*"

diff --git a/test/xspec.bats b/test/xspec.bats
@@ -1875,10 +1875,6 @@ load bats-helper
 }
 
 @test "Non-boolean @test (multiple xs:boolean) with no comparison factors (XQuery)" {
-    if [ -z "${SAXON12_INITIAL_ISSUES_FIXED}" ]; then
-        skip "SAXON12_INITIAL_ISSUES_FIXED is not defined"
-    fi
-
     myrun ../bin/xspec.sh -q bad-assertion/non-boolean-test/multiple-boolean.xspec
     [ "$status" -eq 1 ]
     assert_regex "${lines[7]}" "^  FOER0000[: ] ERROR in x:expect \('Non-boolean @test \(multiple xs:boolean\) with no comparison$"
@@ -1933,9 +1929,6 @@ load bats-helper
 }
 
 @test "XQuery selecting nodes without context should be error (XProc) #423" {
-    if [ -z "${SAXON12_INITIAL_ISSUES_FIXED}" ]; then
-        skip "SAXON12_INITIAL_ISSUES_FIXED is not defined"
-    fi
     if [ -z "${XMLCALABASH_CP}" ]; then
         skip "XMLCALABASH_CP is not defined"
     fi
@@ -1980,10 +1973,6 @@ load bats-helper
 }
 
 @test "XQuery selecting nodes without context should be error (CLI) #423" {
-    if [ -z "${SAXON12_INITIAL_ISSUES_FIXED}" ]; then
-        skip "SAXON12_INITIAL_ISSUES_FIXED is not defined"
-    fi
-
     myrun ../bin/xspec.sh -q issue-423/test.xspec
     [ "$status" -eq 1 ]
     assert_regex "${output}" $'\n''  XPDY0002[: ]'
@@ -2329,10 +2318,6 @@ load bats-helper
 }
 
 @test "Error in SUT should not be caught by default (XQuery)" {
-    if [ -z "${SAXON12_INITIAL_ISSUES_FIXED}" ]; then
-        skip "SAXON12_INITIAL_ISSUES_FIXED is not defined"
-    fi
-
     myrun ../bin/xspec.sh -q catch/no-by-default.xspec
     [ "$status" -eq 1 ]
     assert_regex "${output}" $'\n''  my-error-code[: ] Error signalled '