Corrections error-1310e30 & result-document-0219.
authorJohn Lumley <john@saxonica.com>
Fri, 05 Sep 2014 13:07:24 +0100
changeset 660 bdb62b916dd4
parent 659 62e52cbdd425
child 661 528d77df6e2c
child 662 b89d194c446b
Corrections error-1310e30 & result-document-0219.
Modified schema to accomodate output within environment
admin/catalog-schema.xsd
tests/insn/result-document/_result-document-test-set.xml
tests/misc/error/_error-test-set.xml
--- a/admin/catalog-schema.xsd	Thu Sep 04 21:23:03 2014 +0100
+++ b/admin/catalog-schema.xsd	Fri Sep 05 13:07:24 2014 +0100
@@ -120,6 +120,7 @@
                 <xs:element ref="collection"/>
                 <xs:element ref="collation"/>
                 <xs:element ref="stylesheet"/>
+                <xs:element ref="output"/>
             </xs:choice>
         </xs:sequence>
     </xs:group>
--- a/tests/insn/result-document/_result-document-test-set.xml	Thu Sep 04 21:23:03 2014 +0100
+++ b/tests/insn/result-document/_result-document-test-set.xml	Fri Sep 05 13:07:24 2014 +0100
@@ -431,8 +431,8 @@
    <test-case name="result-document-0219">
       <description>Test with xsl:result-document and @doctype-system, @method is xml.</description>
       <created by="Michael Kay" on="2012-10-30"/>
-      <environment ref="result-document-02"/>
       <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment ref="result-document-02"/>      
       <dependencies>
          <spec value="XSLT20+"/>
       </dependencies>
--- a/tests/misc/error/_error-test-set.xml	Thu Sep 04 21:23:03 2014 +0100
+++ b/tests/misc/error/_error-test-set.xml	Fri Sep 05 13:07:24 2014 +0100
@@ -7209,12 +7209,14 @@
    <test-case name="error-1310e-30">
       <description>Generate error FODF1310 (3.0). Was error-code-357.</description>
       <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="error001"/>
-      <dependencies>
-         <spec value="XSLT30+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="error-code-357.xsl"/>
+      <modified by="John Lumley" on="2014-09-05" change="Corrected stsylesheet reference"/>
+      <environment ref="error001"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <!--<stylesheet file="error-code-357.xsl"/>-->
+         <stylesheet file="error-1310e.xsl"/>
          <initial-template name="main"/>
       </test>
       <result>