Merge branch 'master' into prettier-properties

package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "description": "This package is configured only for testing the XSpec repository",
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-angular": "^18.4.3",
+    "@commitlint/cli": "^18.4.4",
+    "@commitlint/config-angular": "^18.4.4",
     "bats": "^1.10.0",
     "prettier": "^3.1.1",
     "prettier-plugin-properties": "^0.3.0"

pom.xml

@@ -130,7 +130,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.12.1</version>
         <configuration>
           <source>8</source>
           <target>8</target>

src/compiler/xslt/compile/compile-scenario.xsl

@@ -356,18 +356,37 @@
       Local templates
    -->
 
-   <xsl:template name="local:set-up-context" as="element(xsl:variable)+">
-      <xsl:context-item use="absent" />
+   <xsl:template name="local:set-up-context" as="element()+">
+      <!-- Template output is sequence of xsl:variable+, xsl:if, xsl:variable -->
+      <!-- Context item is x:context or x:scenario -->
+      <xsl:context-item as="element()" use="required"/>
 
       <xsl:param name="context" as="element(x:context)" required="yes" tunnel="yes"/>
 
       <!-- Set up the variable of x:context -->
       <xsl:apply-templates select="$context" mode="x:declare-variable"/>
 
+      <!-- If x:context exists but evaluates to empty at runtime, the
+         test does not execute any code from the SUT. Assume it was
+         a user mistake and issue an error message. -->
+      <if test="empty(${x:variable-UQName($context)})">
+         <message terminate="yes">
+            <xsl:call-template name="x:prefix-diag-message">
+               <xsl:with-param name="message"
+                  select="'Context is an empty sequence.'"/>
+            </xsl:call-template>
+         </message>
+      </if>
+
       <!-- Set up its alias variable ($x:context) for publishing it along with $x:result -->
       <xsl:element name="xsl:variable" namespace="{$x:xsl-namespace}">
          <xsl:attribute name="name" select="x:known-UQName('x:context')"/>
+
+         <!-- Actually, @as is 'item()+'.
+            But it is loosened to 'item()*', otherwise the static type checking can ruin the runtime
+            empty sequence checking written above. -->
          <xsl:attribute name="as" select="'item()*'" />
+
          <xsl:attribute name="select" select="'$' || x:variable-UQName($context)"/>
       </xsl:element>
    </xsl:template>

src/schemas/xspec.rnc

@@ -348,20 +348,22 @@ expect-valid =
 expect-assert = 
     ## In a Schematron test, verify that an <assert> is thrown.
     ## 
-    ## The attributes id, role, and location can be used in combination to 
-    ## identify a specific <assert>. 
+    ## Text content and the attributes id, role, and location
+    ## can be used in combination to identify a specific <assert>. 
     element expect-assert {
         common-schematron-assert-report-expect-attributes,
-        schematron-expect-count-attribute
+        schematron-expect-count-attribute,
+        text
     }
 expect-report = 
     ## In a Schematron test, verify that a <report> is thrown.
     ## 
-    ## The attributes id, role, and location can be used in combination to 
-    ## identify a specific <report>. 
+    ## Text content and the attributes id, role, and location
+    ## can be used in combination to identify a specific <report>. 
     element expect-report {
         common-schematron-assert-report-expect-attributes,
-        schematron-expect-count-attribute
+        schematron-expect-count-attribute,
+        text
     }
 
 expect-not-assert = 

src/schematron/schut-to-xspec.xsl

@@ -121,6 +121,7 @@
                 <xsl:value-of select="if (@count) then 'count' else 'exists'" />
                 <xsl:text expand-text="yes">({x:known-UQName('svrl:schematron-output')}/{x:known-UQName('svrl:failed-assert')}</xsl:text>
                 <xsl:apply-templates select="@*" mode="make-predicate" />
+                <xsl:apply-templates select=".[normalize-space()]" mode="make-text-predicate" />
                 <xsl:text>)</xsl:text>
                 <xsl:value-of select="@count ! (' eq ' || .)" />
             </xsl:with-param>
@@ -143,6 +144,7 @@
                 <xsl:value-of select="if (@count) then 'count' else 'exists'" />
                 <xsl:text expand-text="yes">({x:known-UQName('svrl:schematron-output')}/{x:known-UQName('svrl:successful-report')}</xsl:text>
                 <xsl:apply-templates select="@*" mode="make-predicate" />
+                <xsl:apply-templates select=".[normalize-space()]" mode="make-text-predicate" />
                 <xsl:text>)</xsl:text>
                 <xsl:value-of select="@count ! (' eq ' || .)" />
             </xsl:with-param>
@@ -232,6 +234,21 @@
 
     <xsl:template match="@count | @label | @pending" as="empty-sequence()" mode="make-predicate" />
 
+    <xsl:template match="x:expect-assert | x:expect-report" as="text()" mode="make-text-predicate">
+        <xsl:variable name="x-expect-text-content-wrapped" as="xs:string"
+            select="normalize-space(.) => x:quote-with-apos()"/>
+        <!-- Note: Skeleton uses svrl:text for main message and no svrl:text for diagnostics.
+            SchXslt uses svrl:text for main message and inside svrl:diagnostic-reference.
+            If XSpec stops supporting skeleton implementation of Schematron, we can
+            potentially simplify the left side of the '=' expression to
+            (descendant::{x:known-UQName('svrl:text')}) ! normalize-space(.)
+        -->
+        <xsl:text expand-text="yes">[
+            ({x:known-UQName('svrl:text')}, {x:known-UQName('svrl:diagnostic-reference')}) ! normalize-space(.)
+            = {$x-expect-text-content-wrapped}
+            ]</xsl:text>
+    </xsl:template>
+
     <!--
         Named templates
     -->
@@ -249,7 +266,8 @@
                     @role,
                     @location,
                     @context,
-                    (@count ! ('count:', .))
+                    (@count ! ('count:', .)),
+                    (normalize-space()[.] ! ('text:', .))
                 )
                 => string-join(' ')" />
         <xsl:param name="test" as="xs:string" required="yes" />

test/as_stylesheet.xspec

@@ -55,19 +55,25 @@
 
 	<x:param as="local-xs:double" name="global-param" select="xs:integer(0)" xmlns:local-xs="http://www.w3.org/2001/XMLSchema" />
 	<x:scenario label="In global-param (i.e. /x:description/x:param), when @as uses a prefix defined in x:param,">
-		<x:context />
+		<x:context>
+			<foo />
+		</x:context>
 		<x:expect label="@as takes effect" test="$global-param instance of xs:double" />
 	</x:scenario>
 
 	<x:variable as="local-xs:double" name="myv:global-var" select="xs:integer(0)" xmlns:local-xs="http://www.w3.org/2001/XMLSchema" />
 	<x:scenario label="In global variable (i.e. /x:description/x:variable), when @as uses a prefix defined in x:variable,">
-		<x:context />
+		<x:context>
+			<foo />
+		</x:context>
 		<x:expect label="@as takes effect" test="$myv:global-var instance of xs:double" />
 	</x:scenario>
 
 	<x:scenario label="In scenario-level variable (i.e. //x:scenario/x:variable), when @as uses a prefix defined in x:variable,">
 		<x:variable as="local-xs:double" name="myv:local-var" select="xs:integer(0)" xmlns:local-xs="http://www.w3.org/2001/XMLSchema" />
-		<x:context />
+		<x:context>
+			<foo />
+		</x:context>
 		<x:expect label="@as takes effect" test="$myv:local-var instance of xs:double" />
 	</x:scenario>
 

test/bad-context/apply-templates/child-constant-select.xspec

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/* exists, but hard-coded @select finds nothing">
+		<x:context select="/nonexistent">
+			<foo/>
+		</x:context>
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/child-variable-select.xspec

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/* exists, but @select computation finds nothing">
+		<x:variable name="qualifier" select="'nonexistent'" as="xs:string" />
+		<x:context select="/*[@id=$qualifier]">
+			<foo/>
+		</x:context>
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/external_child-constant-select.xspec

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description run-as="external"
+	stylesheet="../../mirror.xsl"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:import href="child-constant-select.xspec" />
+</x:description>

test/bad-context/apply-templates/href-broken.xspec

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file does not exist">
+		<x:context href="nonexistent.xml" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/href-constant-select-inherited-augmented.xspec

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file exists, but hard-coded @select finds nothing">
+		<x:context href="node-selection.xml" />
+		<x:scenario label="at child level">
+			<x:context select="/nonexistent" />
+			<x:expect label="should be error" test="true()" />
+		</x:scenario>
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/href-constant-select-inherited.xspec

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file exists, but hard-coded @select finds nothing,">
+		<x:context href="node-selection.xml" select="/nonexistent" />
+		<x:scenario label="inherited without more context,">
+			<x:expect label="should be error" test="true()" />
+		</x:scenario>
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/href-constant-select.xspec

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file exists, but hard-coded @select finds nothing">
+		<x:context href="node-selection.xml" select="/nonexistent" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/href-variable-select.xspec

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file exists, but @select computation finds nothing">
+		<x:variable name="qualifier" select="'nonexistent'" as="xs:string" />
+		<x:context href="node-selection.xml" select="/*[@id=$qualifier]" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/no-attr.xspec

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context has no attributes and no children">
+		<x:context />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/apply-templates/select-only.xspec

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context has no information other than @select">
+		<x:context select="/missing-context" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/call-template/child-constant-select.xspec

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/* exists, but hard-coded @select finds nothing">
+		<x:context select="/nonexistent">
+			<foo/>
+		</x:context>
+		<x:call template="mirror:context-mirror" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/call-template/child-variable-select.xspec

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/* exists, but @select computation finds nothing">
+		<x:variable name="qualifier" select="'nonexistent'" as="xs:string" />
+		<x:context select="/*[@id=$qualifier]">
+			<foo/>
+		</x:context>
+		<x:call template="mirror:context-mirror" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/call-template/external_child-constant-select.xspec

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description run-as="external" 
+	stylesheet="../../mirror.xsl"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:import href="child-constant-select.xspec" />
+
+</x:description>

test/bad-context/call-template/href-broken.xspec

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file does not exist">
+		<x:context href="nonexistent.xml" />
+		<x:call template="mirror:context-mirror" />
+		<x:expect label="should be error" test="true()" />
+	</x:scenario>
+
+</x:description>

test/bad-context/call-template/href-constant-select-inherited-augmented.xspec

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description stylesheet="mirror.xsl"
+	xml:base="../../"
+	xmlns:mirror="x-urn:test:mirror"
+	xmlns:x="http://www.jenitennison.com/xslt/xspec"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+	<x:scenario label="x:context/@href file exists, but hard-coded @select finds nothing">
+		<x:context href="node-selection.xml" />
+		<x:call template="mirror:context-mirror" />
+		<x:scenario label="at child level">
+			<x:context select="/nonexistent" />
+			<x:expect label="should be error" test="true()" />
+		</x:scenario>
+	</x:scenario>
+
+</x:description>