Add/change dependencies on optional features or spec version
authorMichael Kay <mike@saxonica.com>
Tue, 02 May 2017 09:38:25 +0100
changeset 1665 6215ab0b8ce0
parent 1664 21a89546cd96
child 1666 f697a5038e43
Add/change dependencies on optional features or spec version
tests/decl/accumulator/_accumulator-test-set.xml
tests/decl/function/_function-test-set.xml
tests/decl/include/include-0401a.xsl
tests/decl/include/include-0601a.xsl
tests/decl/output/_output-test-set.xml
tests/decl/param/import2.xsl
tests/fn/available-system-properties/_available-system-properties-test-set.xml
tests/fn/function-available/_function-available-test-set.xml
tests/fn/function-available/function-available-1018.xsl
tests/insn/for-each-group/_for-each-group-test-set.xml
tests/insn/result-document/_result-document-test-set.xml
tests/insn/sequence/_sequence-test-set.xml
tests/type/maps/_maps-test-set.xml
tests/type/type/_type-test-set.xml
--- a/tests/decl/accumulator/_accumulator-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/accumulator/_accumulator-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -1300,6 +1300,9 @@
       <description>Post-descent value of accumulator on parent node - not streamable</description>
       <created by="Michael Kay" on="2016-11-22"/>
       <environment ref="accumulator-002"/>
+      <dependencies>
+         <feature value="streaming"/>
+      </dependencies>
       <test>
          <stylesheet file="accumulator-060.xsl"/>
          <param name="streamable" static="yes" select="'1'"/>
--- a/tests/decl/function/_function-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/function/_function-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -1339,9 +1339,11 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <modified by="Abel Braaksma" on="2014-10-16" change="Changed the auto-generation of this test, it is now dependent on actual XHTML spec, and updated the set of functions it tests"/>
       <modified by="Michael Kay" on="2014-11-14" change="Changed test assertion to pass catalog-004"/>
+      <modified by="Michael Kay" on="2017-04-30" change="Add HOF dependency (if not available, function-available() returns false)"/>
       <environment ref="function-1901"/>
       <dependencies>
          <spec value="XSLT30+"/>
+         <feature value="higher_order_functions"/>
       </dependencies>
       <test>
          <stylesheet file="function-1901.xsl"/>
--- a/tests/decl/include/include-0401a.xsl	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/include/include-0401a.xsl	Tue May 02 09:38:25 2017 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<out xsl:version="1.0"
+<out xsl:version="2.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Test inclusion of a simplified stylesheet -->
--- a/tests/decl/include/include-0601a.xsl	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/include/include-0601a.xsl	Tue May 02 09:38:25 2017 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<html xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xsl:version="1.0">
+<html xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xsl:version="2.0">
   <head><title>Greeting</title></head>
   <body><p>Words of greeting:<br/>
     <b><i><u><xsl:apply-templates select="greeting"/></u></i></b>
--- a/tests/decl/output/_output-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/output/_output-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -4555,6 +4555,7 @@
       <created by="Michael Kay" on="2016-12-16"/>
       <dependencies>
          <spec value="XSLT30+"/>
+         <feature value="higher_order_functions"/>
       </dependencies>
       <test>
          <stylesheet file="output-0707.xsl"/>
--- a/tests/decl/param/import2.xsl	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/decl/param/import2.xsl	Tue May 02 09:38:25 2017 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?> 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
 
 	<xsl:template match="data">
 		<xsl:param name="Ppar1" select="'Poor default'" />		
--- a/tests/fn/available-system-properties/_available-system-properties-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/fn/available-system-properties/_available-system-properties-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -25,8 +25,10 @@
     <test-case name="available-system-properties-002">
         <description>Tests availability of fn:available-system-properties in the dynamic context</description>
         <created by="Abel Braaksma" on="2015-10-12" />
+       <modified by="Michael Kay" on="2017-04-30" change="add HOF dependency"/>
        <dependencies>
           <spec value="XSLT30+" />
+          <feature value="higher_order_functions"/>
        </dependencies>
         <test>            
             <stylesheet file="available-system-properties-001.xsl" />
--- a/tests/fn/function-available/_function-available-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/fn/function-available/_function-available-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -187,6 +187,7 @@
       <description>Test of function-available() on higher-order functions</description>
       <keywords>fn:function-available maps</keywords>
       <created by="Michael Kay" on="2016-03-21"/>
+      <modified by="Michael Kay" on="2017-04-30" change="correction: sort#3 depends on HOF feature, sort#2 does not"/>
       <environment ref="function-available-10"/>
       <dependencies>
          <spec value="XSLT20+"/>
--- a/tests/fn/function-available/function-available-1018.xsl	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/fn/function-available/function-available-1018.xsl	Tue May 02 09:38:25 2017 +0100
@@ -20,7 +20,7 @@
       <f><xsl:value-of select="$hof eq function-available('fold-left', 3)"/></f> 
       <g><xsl:value-of select="$hof eq function-available('fold-right', 3)"/></g>
       <h><xsl:value-of select="$hof eq function-available('for-each-pair', 3)"/></h>
-      <i><xsl:value-of select="($hof and $xp31) eq function-available('sort', 2)"/></i>
+      <i><xsl:value-of select="($hof and $xp31) eq function-available('sort', 3)"/></i>
       <j><xsl:value-of select="($hof and $xp31) eq function-available('apply', 2)"/></j>
     </out>
   </xsl:template>
--- a/tests/insn/for-each-group/_for-each-group-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/insn/for-each-group/_for-each-group-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -1257,9 +1257,11 @@
    <test-case name="for-each-group-078a">
       <description>A dynamic call on current-group() is a dynamic error</description>
       <created by="Michael Kay" on="2015-02-07"/>
+      <modified by="Michael Kay" on="2017-04-30" change="add HOF dependency"/>
       <environment ref="group020"/>
       <dependencies>
          <spec value="XSLT30+"/>
+         <feature value="higher_order_functions"/>
       </dependencies>
       <test>
          <stylesheet file="for-each-group-078.xsl"/>
@@ -1275,7 +1277,7 @@
       <created by="Michael Kay" on="2015-02-07"/>
       <environment ref="group020"/>
       <dependencies>
-         <spec value="XSLT30+"/>
+         <spec value="XSLT30+"/>       
       </dependencies>
       <test>
          <stylesheet file="for-each-group-078.xsl"/>
@@ -1289,9 +1291,11 @@
    <test-case name="for-each-group-079a">
       <description>A dynamic call on current-grouping-key() is a dynamic error</description>
       <created by="Michael Kay" on="2015-02-07"/>
+      <modified by="Michael Kay" on="2017-04-30" change="add HOF dependency"/>
       <environment ref="group020"/>
       <dependencies>
          <spec value="XSLT30+"/>
+         <feature value="higher_order_functions"/>
       </dependencies>
       <test>
          <stylesheet file="for-each-group-079.xsl"/>
--- a/tests/insn/result-document/_result-document-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/insn/result-document/_result-document-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -2816,9 +2816,11 @@
       <description>Adaptive serialization: no errors</description>
       <created by="Michael Kay" on="2016-12-16"/>
       <modified by="Debbie Lockett" on="2017-02-23" change="add serialization dependency"/>
+      <modified by="Michael Kay" on="2017-04-30" change="add HOF dependency"/>
       <dependencies>
          <spec value="XSLT30+"/>
          <feature value="serialization" satisfied="true"/>
+         <feature value="higher_order_functions"/>
       </dependencies>
       <test>
          <stylesheet file="result-document-1407.xsl"/>
--- a/tests/insn/sequence/_sequence-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/insn/sequence/_sequence-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -411,9 +411,11 @@
    <test-case name="sequence-0119">
       <description>Test that in 1.0 mode xsl:value uses first-value semantics</description>
       <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Michael Kay" on="2017-04-30" change="add 1.0-mode dependency"/>
       <environment ref="sequence-01"/>
       <dependencies>
          <spec value="XSLT10+"/>
+         <feature value="backwards_compatibility"/>
       </dependencies>
       <test>
          <stylesheet file="sequence-0119.xsl"/>
--- a/tests/type/maps/_maps-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/type/maps/_maps-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -126,6 +126,10 @@
    <test-case name="maps-010">
       <description>Mix values with and without timezones</description>
       <created by="Michael Kay" on="2015-06-10"/>
+      <modified by="Michael Kay" on="2017-04-30" change="add HOF dependendency"/>
+      <dependencies>
+         <feature value="higher_order_functions"/>
+      </dependencies>
       <test>
          <stylesheet file="maps-010.xsl"/>
          <initial-template name="main"/>
--- a/tests/type/type/_type-test-set.xml	Sun Apr 30 09:52:50 2017 +0100
+++ b/tests/type/type/_type-test-set.xml	Tue May 02 09:38:25 2017 +0100
@@ -882,9 +882,10 @@
    <test-case name="type-0159">
       <description>Type error: applying templates to a variable of type string</description>
       <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Michael Kay" on="2017-04-30" change="not an error under XSLT 3.0"/>
       <environment ref="type-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="type-0159.xsl"/>