Bug 28394, strip-space error in 2.0 should be an optional outcome, plus XSLT 3.0 version of test (static error)
authorabraaksm
Fri, 03 Apr 2015 02:20:45 +0200
changeset 911 8e396169cc0f
parent 910 435c939b6bc2
child 912 147d206adb46
Bug 28394, strip-space error in 2.0 should be an optional outcome, plus XSLT 3.0 version of test (static error)
tests/attr/streamable/_streamable-test-set.xml
tests/misc/whitespace/_whitespace-test-set.xml
--- a/tests/attr/streamable/_streamable-test-set.xml	Fri Apr 03 01:44:45 2015 +0200
+++ b/tests/attr/streamable/_streamable-test-set.xml	Fri Apr 03 02:20:45 2015 +0200
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <test-set xmlns="http://www.w3.org/2012/10/xslt-test-catalog"
    xmlns:xs="http://www.w3.org/2001/XMLSchema" name="streamable">
-
+   
    <description>Tests streamable apply-templates and modes</description>
    <keywords>classifying-pattern xsl:apply-templates xsl:mode streamable streamable-mode</keywords>
 
+   <dependencies>
+      <spec value="XSLT30+"/>
+      <feature value="streaming"/>
+   </dependencies>
+
+
    <environment name="ot">
       <source file="ot.xml" uri="ot.xml" streaming="true">
          <description>The Old Testament according to Jon Bosak</description>
@@ -80,11 +86,6 @@
       <source role="." file="citygml.xml" streaming="true"/>
    </environment>
 
-   <dependencies>
-      <spec value="XSLT30+"/>
-      <feature value="streaming"/>
-   </dependencies>
-
    <test-case name="streamable-001">
       <description>streaming templates used to delete selected elements</description>
       <keywords>leading-lone-slash xsl:copy striding motionless-pattern xsl:strip-space</keywords>
--- a/tests/misc/whitespace/_whitespace-test-set.xml	Fri Apr 03 01:44:45 2015 +0200
+++ b/tests/misc/whitespace/_whitespace-test-set.xml	Fri Apr 03 02:20:45 2015 +0200
@@ -825,11 +825,11 @@
    </test-case>
 
    <test-case name="whitespace-1501">
-      <description>test two conflicting xsl:strip-space declarations (recoverable
+      <description>test two conflicting xsl:strip-space/preserve-space declarations (recoverable
          error)</description>
       <created by="Michael Kay" on="2012-11-07"/>
-      <modified by="Abel Braaksma" on="2014-02-11"
-         change="XTSE0270 - is not a recoverable error in XSLT30"/>
+      <modified by="Abel Braaksma" on="2014-02-11" change="XTSE0270 - is not a recoverable error in XSLT30, remove dependency on 3.0."/>
+      <modified by="Abel Braaksma" on="2015-04-02" change="Allow XTRE0270 to be thrown, add 3.0 variant of test"/>
       <environment>
          <source role=".">
             <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
@@ -842,7 +842,29 @@
          <stylesheet file="whitespace-1501.xsl"/>
       </test>
       <result>
-         <assert-xml><![CDATA[<doc><a/><b> </b><c/></doc>]]></assert-xml>
+         <any-of>
+            <error code="XTRE0270" />
+            <assert-xml><![CDATA[<doc><a/><b> </b><c/></doc>]]></assert-xml>
+         </any-of>         
+      </result>
+   </test-case>
+
+   <test-case name="whitespace-1501a">
+      <description>Two conflicting xsl:strip-space/preserve-space declarations (static error in XSLT 3.0)</description>
+      <created by="Abel Braaksma" on="2015-04-02"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT30+" />
+      </dependencies>
+      <test>
+         <stylesheet file="whitespace-1501.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0270" />
       </result>
    </test-case>