Minor tidying up of some tests and metadata
authorMichael Kay <mike@saxonica.com>
Thu, 11 Jan 2018 17:29:56 +0000
changeset 1806 ecfdc9581012
parent 1805 c82b6e3631ed
child 1807 e1e987e3f369
Minor tidying up of some tests and metadata
tests/attr/match/_match-test-set.xml
tests/attr/strip-type-annotations/_strip-type-annotations-test-set.xml
tests/attr/use-when/_use-when-test-set.xml
tests/decl/function/_function-test-set.xml
tests/decl/function/function-1201.xsl
--- a/tests/attr/match/_match-test-set.xml	Thu Jan 11 17:28:30 2018 +0000
+++ b/tests/attr/match/_match-test-set.xml	Thu Jan 11 17:29:56 2018 +0000
@@ -138,7 +138,7 @@
       </source>
    </environment>
    <environment name="match3001">
-      <source role="." file="schemamatch001.xml"/>
+      <source role="." file="schemamatch001.xml" validation="strict"/>
       <schema role="source-reference" file="match-builtin.xsd" xsd-version="1.0"/>
    </environment>
    <environment name="match3002">
--- a/tests/attr/strip-type-annotations/_strip-type-annotations-test-set.xml	Thu Jan 11 17:28:30 2018 +0000
+++ b/tests/attr/strip-type-annotations/_strip-type-annotations-test-set.xml	Thu Jan 11 17:29:56 2018 +0000
@@ -71,6 +71,7 @@
          @input-type-annotations="preserve". The primary stylesheet has @input-type-annotations="unspecified".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -79,7 +80,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-003.xsl"/>
-         <stylesheet file="import_preserve.xsl"/>
+         <stylesheet file="import_preserve.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='truefalse'</assert>
@@ -92,6 +93,7 @@
          has @input-type-annotations="preserve". The primary stylesheet has @input-type-annotations="unspecified".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -100,7 +102,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-004.xsl"/>
-         <stylesheet file="import_preserve.xsl"/>
+         <stylesheet file="import_preserve.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='truefalse'</assert>
@@ -113,6 +115,7 @@
          has @input-type-annotations="strip". The primary stylesheet has @input-type-annotations= "unspecified".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -121,7 +124,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-005.xsl"/>
-         <stylesheet file="import_strip.xsl"/>
+         <stylesheet file="import_strip.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
@@ -134,6 +137,7 @@
          has @input-type-annotations="strip". The primary stylesheet has @input-type-annotations="unspecified".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -142,7 +146,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-006.xsl"/>
-         <stylesheet file="import_strip.xsl"/>
+         <stylesheet file="import_strip.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
@@ -155,6 +159,7 @@
          @input-type-annotations="unspecified". The primary stylesheet has @input-type-annotations="preserve".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -163,7 +168,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-007.xsl"/>
-         <stylesheet file="import_unspecified.xsl"/>
+         <stylesheet file="import_unspecified.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='truefalse'</assert>
@@ -176,6 +181,7 @@
          has @input-type-annotations="unspecified". The primary stylesheet has @input-type-annotations="preserve".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -184,7 +190,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-008.xsl"/>
-         <stylesheet file="import_unspecified.xsl"/>
+         <stylesheet file="import_unspecified.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='truefalse'</assert>
@@ -197,6 +203,7 @@
          has @input-type-annotations="unspecified". The primary stylesheet has @input-type-annotations="strip".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -205,7 +212,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-009.xsl"/>
-         <stylesheet file="import_unspecified.xsl"/>
+         <stylesheet file="import_unspecified.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
@@ -218,6 +225,7 @@
          has @input-type-annotations="unspecified". The primary stylesheet has @input-type-annotations="strip".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -226,7 +234,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-010.xsl"/>
-         <stylesheet file="import_unspecified.xsl"/>
+         <stylesheet file="import_unspecified.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
@@ -239,6 +247,7 @@
          an included and the primary stylesheet have @input-type-annotations="strip".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -247,8 +256,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-011.xsl"/>
-         <stylesheet file="import_strip.xsl"/>
-         <stylesheet file="strip-type-annotations-011.xsl"/>
+         <stylesheet file="import_strip.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
@@ -581,6 +589,7 @@
          The outermost element is xsl:package rather than xsl:transform.
       </description>
       <created by="Michael Kay" on="2017-02-04"/>
+      <modified by="Michael Kay" on="2018-01-11" change="label included stylesheet module as secondary"/>
       <environment ref="striptype001"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -589,7 +598,7 @@
       </dependencies>
       <test>
          <stylesheet file="strip-type-annotations-027.xsl"/>
-         <stylesheet file="import_unspecified.xsl"/>
+         <stylesheet file="import_unspecified.xsl" role="secondary"/>
       </test>
       <result>
          <assert>every $e in /out/*/* satisfies $e='falsetrue'</assert>
--- a/tests/attr/use-when/_use-when-test-set.xml	Thu Jan 11 17:28:30 2018 +0000
+++ b/tests/attr/use-when/_use-when-test-set.xml	Thu Jan 11 17:29:56 2018 +0000
@@ -1108,6 +1108,7 @@
          Test case that uses use-when on xsl:stylesheet to verify it has no effect on this element but it takes 
          effect on all its children.</description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Michael Kay" on="2018-01-10" change="avoid ill-formed XML in assert-xml"/>
       <environment ref="use-when-02"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -1116,7 +1117,7 @@
          <stylesheet file="use-when-0222.xsl"/>
       </test>
       <result>
-         <assert-xml><![CDATA[a1a2b1b2]]></assert-xml>
+         <assert-string-value><![CDATA[a1a2b1b2]]></assert-string-value>
       </result>
    </test-case>
 
--- a/tests/decl/function/_function-test-set.xml	Thu Jan 11 17:28:30 2018 +0000
+++ b/tests/decl/function/_function-test-set.xml	Thu Jan 11 17:29:56 2018 +0000
@@ -1233,6 +1233,7 @@
    <test-case name="function-1201">
       <description>bug reported by Dimitre Novatchev against Saxon 8.2</description>
       <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Michael Kay" on="2018-01-10" change="move expected result inline, and make well-formed"/>
       <environment ref="function-12"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -1241,7 +1242,11 @@
          <stylesheet file="function-1201.xsl"/>
       </test>
       <result>
-         <assert-xml file="function-1201.out"/>
+         <assert-xml><![CDATA[<out><author value="Anthony Burgess"><title value="A Clockwork Orange"/><title value="Earthly Powers"/></author
+            ><author value="Frank Herbert"><title value="Children of Dune"/><title value="Dragon in the Sea"/><title value="Dune"/></author
+            ><author value="Isaak Asimov"><title value="The Caves of Steel"/><title value="The Foundation Trilogy"/></author
+            ><author value="Kate Wilhelm"><title value="Where Late the Sweet Bird Sang"/></author
+            ><author value="Roberto Quaglia"><title value="Bread, Butter and Paradoxine"/></author></out>]]></assert-xml>
       </result>
    </test-case>
 
--- a/tests/decl/function/function-1201.xsl	Thu Jan 11 17:28:30 2018 +0000
+++ b/tests/decl/function/function-1201.xsl	Thu Jan 11 17:29:56 2018 +0000
@@ -14,7 +14,7 @@
  <xsl:template match="/">
    <xsl:variable name="vSorted" as="node()+"
      select="f:sorted-nodelist(/*/book/@author)"/>
-
+   <out>
    <xsl:for-each select="f:value-setS(/*/book/@author)">
      <author value="{@value}">
        <xsl:for-each select="
@@ -29,6 +29,7 @@
        </xsl:for-each>
      </author>
    </xsl:for-each>
+   </out>
  </xsl:template>
 
  <xsl:function name="f:sorted-nodelist" as="node()*"