Add tests for new constraint, and

sydb · sydb · commit bd1570a027c3 · 2024-05-02T08:55:07.000-04:00
fix error they found.
diff --git a/P5/Source/Specs/elementRef.xml b/P5/Source/Specs/elementRef.xml
@@ -13,7 +13,7 @@
   <constraintSpec ident="only_sensible_attrs" scheme="schematron">
     <constraint>
       <sch:pattern>
-        <sch:rule context="tei:elementRef[ parent::schemaSpec | parent::specGrp ]">
+        <sch:rule context="tei:elementRef[ parent::tei:schemaSpec | parent::tei:specGrp ]">
           <sch:report test="@minOccurs | @maxOccurs" role="error">An element reference is not repeatable when part of a schema specification (and thus this &lt;elementRef> should not have @minOccurs or @maxOccurs).</sch:report>
         </sch:rule>
         <sch:rule context="tei:content//tei:elementRef">
diff --git a/P5/Test/detest.odd b/P5/Test/detest.odd
@@ -60,6 +60,12 @@
       <div>
         <head>A Test Schema</head>
         <p>Here is the introduction to your document</p>
+        <specGrp xml:id="limit_attrs_on_elementRef">
+          <elementRef key="p" minOccurs="2" maxOccurs="4">
+            <!-- Should be flagged as an error: @m[ia][nx]Occurs not allowed here -->
+          </elementRef>
+          <elementRef key="charName" source="tei:3.5.0"/>
+        </specGrp>
         <p>Here is the schema:</p>
         <schemaSpec ident="detest" start="TEI">
           <moduleRef key="header"/>
@@ -535,6 +541,23 @@
             </listRef>
           </elementSpec>
 
+          <specGrpRef target="#limit_attrs_on_elementRef"/>
+          <elementSpec ident="test_elementRef_attr_constraints" mode="add">
+            <desc xml:lang="en" versionDate="2024-05-02">yet another completely spurious element made up for testing purposes only</desc>
+            <classes>
+              <memberOf key="att.global"/>
+              <memberOf key="model.pPart.data"/>
+            </classes>
+            <content>
+              <alternate>
+                <elementRef key="idno" source="tei:3.5.0">
+                  <!-- Should be flagged as an error: @source not allowed here -->
+                </elementRef>
+                <elementRef key="num" minOccurs="2" maxOccurs="5"/>
+              </alternate>
+            </content>
+          </elementSpec>
+
         </schemaSpec>
       </div>
     </body>
diff --git a/P5/Test/expected-results/detest_odd_schematron.log b/P5/Test/expected-results/detest_odd_schematron.log
@@ -21,6 +21,8 @@ validateodd:
      [xslt] 
      [xslt]                   Error: both the versionDate and xml:lang attributes on "remarks" are required when it is a child of "elementSpec".
      [xslt]                  (@xml:lang and @versionDate)
+     [xslt] An element reference is not repeatable when part of a schema specification (and thus this &lt;elementRef&gt; should not have @minOccurs or @maxOccurs). (@minOccurs | @maxOccurs / error)
+     [xslt] An element reference within a content model must refer to a locally defined element specification (and thus this &lt;elementRef&gt; should not have @source). (@source / error)
      [xslt] In the context of tagset documentation, the listRef element must not self-nest. (tei:listRef)
      [xslt] In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value. (@target and not( matches( @target,'\s') ))
      [xslt] In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value. (@target and not( matches( @target,'\s') ))
