Bug 28378, removing XSLT30, should be XSLT30+
authorabraaksm
Mon, 30 Mar 2015 21:00:15 +0200
changeset 899 334bf50b39d3
parent 898 d24fc7befec7
child 900 7b41de2d5862
Bug 28378, removing XSLT30, should be XSLT30+
admin/catalog-schema.xsd
tests/attr/use-when/_use-when-test-set.xml
tests/decl/include/_include-test-set.xml
tests/insn/apply-templates/_apply-templates-test-set.xml
tests/misc/catalog/_catalog-test-set.xml
--- a/admin/catalog-schema.xsd	Mon Mar 30 20:35:06 2015 +0200
+++ b/admin/catalog-schema.xsd	Mon Mar 30 21:00:15 2015 +0200
@@ -730,7 +730,6 @@
                                 <xs:enumeration value="XSLT20"/>
                                 <xs:enumeration value="XSLT20+"/>
                                 <xs:enumeration value="XSLT10 XSLT20"/>
-                                <xs:enumeration value="XSLT30"/>
                                 <xs:enumeration value="XSLT30+"/>
                             </xs:restriction>
                         </xs:simpleType>
--- a/tests/attr/use-when/_use-when-test-set.xml	Mon Mar 30 20:35:06 2015 +0200
+++ b/tests/attr/use-when/_use-when-test-set.xml	Mon Mar 30 21:00:15 2015 +0200
@@ -589,7 +589,7 @@
       <created by="O'Neil Delpratt" on="2012-11-07"/>
       <environment ref="use-when-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="use-when-0129.xsl"/>
@@ -604,7 +604,7 @@
       <created by="O'Neil Delpratt" on="2012-11-07"/>
       <environment ref="use-when-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="use-when-0130.xsl"/>
@@ -1327,9 +1327,9 @@
 
    <test-case name="use-when-0407">
       <description>
-         Tests using function-available for generate-id,
-         system-property, key, current, unparsed-entity-uri, and unparsed-entity-public-id
-         in a use-when instruction.
+         XSLT20 only test
+         Tests using function-available for generate-id, system-property, key, current, 
+         unparsed-entity-uri, and unparsed-entity-public-id in a use-when instruction.
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Abel Braaksma" on="2015-03-23" change="Fixed test-part on generate-id (which reported generate-id, but tested fn:current)"/>
@@ -1359,6 +1359,38 @@
       </result>
    </test-case>
    
+   <test-case name="use-when-0407a">
+      <description>
+         XSLT30+ version of previous test
+         Tests using function-available for generate-id, system-property, key, current,
+         unparsed-entity-uri, and unparsed-entity-public-id in a use-when instruction.
+      </description>
+      <created by="Abel Braaksma" on="2015-03-23"/>
+      <environment ref="use-when-04"/>
+      <dependencies>
+         <spec value="XSLT20"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0407a.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <assert>/out/fa[@f="current"]="true"</assert>
+            <assert>/out/fa[@f="generate-id"]="true"</assert>
+            <assert>/out/fa[@f="key"]="true"</assert>
+            <assert>/out/fa[@f="unparsed-entity-uri"]="true"</assert>
+            <assert>/out/fa[@f="unparsed-entity-public-id"]="true"</assert>
+            <assert>/out/fa[@f="system-property"]="true"</assert>
+            <assert>not(/out/in[@f="current"])</assert>
+            <assert>not(/out/in[@f="generate-id"])</assert>
+            <assert>not(/out/in[@f="key"])</assert>
+            <assert>not(/out/in[@f="unparsed-entity-uri"])</assert>
+            <assert>not(/out/in[@f="unparsed-entity-public-id"])</assert>
+            <assert>/out/in[@f="system-property"]="use-when evaluates to true!!!"</assert>
+         </all-of>
+      </result>
+   </test-case>
+   
    <test-case name="use-when-0408">
       <description>Test case using a variable with static="no" attribute, that uses use-when with an EBV of true on an xsl:choose instruction.</description>
       <created by="Debbie Lockett" on="2014-08-06"/>
--- a/tests/decl/include/_include-test-set.xml	Mon Mar 30 20:35:06 2015 +0200
+++ b/tests/decl/include/_include-test-set.xml	Mon Mar 30 21:00:15 2015 +0200
@@ -299,7 +299,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="include-07"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="include-0701.xsl"/>
--- a/tests/insn/apply-templates/_apply-templates-test-set.xml	Mon Mar 30 20:35:06 2015 +0200
+++ b/tests/insn/apply-templates/_apply-templates-test-set.xml	Mon Mar 30 21:00:15 2015 +0200
@@ -154,7 +154,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-0102.xsl"/>
@@ -201,7 +201,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-0104.xsl"/>
@@ -297,7 +297,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-0108.xsl"/>
@@ -356,7 +356,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-01"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-0110.xsl"/>
@@ -450,7 +450,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-04"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-0401.xsl"/>
@@ -744,7 +744,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="conflict-resolution-12"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="conflict-resolution-1202.xsl"/>
--- a/tests/misc/catalog/_catalog-test-set.xml	Mon Mar 30 20:35:06 2015 +0200
+++ b/tests/misc/catalog/_catalog-test-set.xml	Mon Mar 30 21:00:15 2015 +0200
@@ -28,7 +28,7 @@
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="catalog001"/>
       <dependencies>
-         <spec value="XSLT30"/>
+         <spec value="XSLT30+"/>
       </dependencies>
       <test>
          <stylesheet file="catalog-001.xsl"/>