Correct expected result of test using xsl:try with d-o-e
authorMichael Kay <mike@saxonica.com>
Wed, 04 Jul 2018 20:25:01 +0100
changeset 1868 3deaeb341727
parent 1866 314fbd0f5415
child 1869 2313e6c2b636
Correct expected result of test using xsl:try with d-o-e
tests/attr/disable-output-escaping/_disable-output-escaping-test-set.xml
tests/attr/validation/_validation-test-set.xml
tests/attr/validation/validation-1202.xsl
tests/strm/si-fork/_si-fork-test-set.xml
--- a/tests/attr/disable-output-escaping/_disable-output-escaping-test-set.xml	Wed Jun 27 13:14:32 2018 +0100
+++ b/tests/attr/disable-output-escaping/_disable-output-escaping-test-set.xml	Wed Jul 04 20:25:01 2018 +0100
@@ -340,6 +340,7 @@
    <test-case name="doe-0191">
       <description>d-o-e works within try/catch, writing element nodes</description>
       <created by="Michael Kay" on="2017-05-12"/>
+      <modified by="Michael Kay" on="2018-06-27" change="correct expected results"/>
       <environment ref="doe-01"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -350,7 +351,7 @@
          <output serialize="yes"/>
       </test>
       <result>
-         <assert-serialization><![CDATA[<out>&lt;10</out>]]></assert-serialization>
+         <assert-serialization><![CDATA[<out><z>&lt;</z>10</out>]]></assert-serialization>
       </result>
    </test-case>
   
@@ -570,7 +571,6 @@
    
    <test-case name="doe-0803">
       <description>Test for disabling-output-escaping within a streamed xsl:fork (where output is typically buffered)</description>
-      <!-- MHK 2017-05-12: Saxon can't handle this one at present. Buffering trees containing the d-o-e property on selected text nodes is challenging. -->
       <created by="Michael Kay" on="2017-05-12"/>
       <environment ref="doe-08"/>
       <dependencies>
--- a/tests/attr/validation/_validation-test-set.xml	Wed Jun 27 13:14:32 2018 +0100
+++ b/tests/attr/validation/_validation-test-set.xml	Wed Jul 04 20:25:01 2018 +0100
@@ -950,6 +950,7 @@
       <description>Effect of xsl:copy-of validation="xxx" on the nilled property</description>
       <created by="Michael Kay" on="2015-05-01"/>
       <modified by="Abel Braaksma" on="2015-05-31" change="Bug 28634: adding xsl:import-schema to allow validation"/>
+      <modified by="Michael Kay" on="2018/07/02" change="Ensure sorting into (cross-)document order doesn't spoil the results"/>
       <environment ref="validation-12"/>
       <dependencies>
          <spec value="XSLT20+"/>
--- a/tests/attr/validation/validation-1202.xsl	Wed Jun 27 13:14:32 2018 +0100
+++ b/tests/attr/validation/validation-1202.xsl	Wed Jul 04 20:25:01 2018 +0100
@@ -23,7 +23,7 @@
     <xsl:variable name="u" as="document-node()">
       <xsl:copy-of select="." validation="strip"/>
     </xsl:variable>
-    <xsl:apply-templates select="($s, $l, $t, $u)//t:test"/>
+    <xsl:apply-templates select="for $X in ($s, $l, $t, $u) return $X//t:test"/>  <!-- need to retain order... -->
   </z>
   </xsl:template>
   
--- a/tests/strm/si-fork/_si-fork-test-set.xml	Wed Jun 27 13:14:32 2018 +0100
+++ b/tests/strm/si-fork/_si-fork-test-set.xml	Wed Jul 04 20:25:01 2018 +0100
@@ -647,6 +647,31 @@
       </result>
    </test-case>
    
+   <test-case name="si-fork-808-ns">
+      <description>As -808 with streaming disabled, for comparison</description>
+     <created by="Michael Kay after Martin Honnen" on="2017-08-07"/>
+      <modified by="Michael Kay after Martin Honnen" on="2018-02-02" change="add expected results, based on non-streamed evaluation"/>
+      <environment>
+         <source role="." file="si-fork-808.xml" streaming="false"/>
+      </environment>
+      <test>
+         <stylesheet file="si-fork-808.xsl"/>
+         <param name="STREAMABLE" static="yes" select="false()"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<root><orderlist type="manual"><item num="(a)"><para>blah blah</para
+    ><orderlist type="manual"><item num="(i)"><para>blah blah</para
+    ><orderlist type="manual"/></item></orderlist></item><item num="(b)"><para>blah blah</para
+    ><orderlist type="manual"/></item><item num="(c)"><para>blah blah</para
+    ><orderlist type="manual"><item num="(i)"><para>blah blah</para
+    ><orderlist type="manual"><item num="(1)"><para>blah blah</para
+    ><orderlist type="manual"/></item><item num="(2)"><para>blah blah</para
+    ><orderlist type="manual"/></item></orderlist></item><item num="(ii)"><para>blah blah</para
+    ><orderlist type="manual"/></item><item num="(iii)"><para>blah blah</para><orderlist type="manual"/></item><item num="(iv)"><para>blah blah</para
+    ><orderlist type="manual"/></item></orderlist></item></orderlist></root>]]></assert-xml>
+      </result>
+   </test-case>
+   
    <test-case name="si-fork-809">
       <description>Streamable xsl:fork containing xsl:for-each-group (Saxon bug 3399)</description>
       <created by="Michael Kay after Martin Honnen" on="2017-08-31"/>