Merge pull request #650 from TEIC/sydb_646

ignore `@version` of `<application>` when comparing in tests
TEIC · Jan 26, 2024 · ef14844 · ef14844
2 parents 6f17be9 + ecee7bf
commit ef14844
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 17 deletions.
diff --git a/Test/cleanup.pl b/Test/cleanup.pl
@@ -6,5 +6,6 @@
   s/SAXON HE 9.*//;
   s/XSLT stylesheets version [1-9].*//;
   s/on 20[0-9][0-9].[0-9][0-9].[0-9][0-9]T.*Z\.?//;
+  s/(<application.*version\s*=\s*)['"][0-9.a-z]+['"]/$1"9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22"/;
   print;
 }
diff --git a/Test/expected-results/hyperlinktest.xml b/Test/expected-results/hyperlinktest.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test-indexes.xml b/Test/expected-results/test-indexes.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test-rtf2tei.xml b/Test/expected-results/test-rtf2tei.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test11.xml b/Test/expected-results/test11.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test11a.xml b/Test/expected-results/test11a.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test18.xml b/Test/expected-results/test18.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test19.xml b/Test/expected-results/test19.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test29.xml b/Test/expected-results/test29.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test37.xml b/Test/expected-results/test37.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test39.xml b/Test/expected-results/test39.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test/expected-results/test40.xml b/Test/expected-results/test40.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

diff --git a/Test2/cleanForDiff.xsl b/Test2/cleanForDiff.xsl
@@ -30,6 +30,10 @@
 
                 4. Remove any timestamps that are generated during processing, since
                    these will be different each time a test is run.
+
+                5. Replace the value of the @version attribute of any &lt;application>
+                   elements that have “tei” (case insensitive) in either their @xml:id
+                   or @ident attribute with a dummy value (per issue #646).
             </xd:p>
         </xd:desc>
     </xd:doc>
@@ -64,12 +68,24 @@
             <xsl:copy-of select="@*"/>
         </xsl:copy>
     </xsl:template>
-
+
+<!--  And versions from <application>s we (probably) inserted. -->
+    <xsl:template match="tei:application[ matches( string-join( ( @xml:id, '␝', @ident ) ), 'tei', 'i') ]">
+        <!-- Note that any character legal in an XML attribute could
+             be used to separate the @xml:id from the @ident, above,
+             EXCEPT one of ‘t’, ‘T’, ‘e’, ‘E’, ‘i’, or ‘I’. -->
+        <xsl:copy>
+            <xsl:copy-of select="@* except @version"/>
+            <xsl:attribute name="version" select="'9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22'"/>
+            <xsl:apply-templates select="node()"/>
+        </xsl:copy>
+    </xsl:template>
+
 <!--  Default identity transform.  -->
     <xsl:template match="@* | node()" priority="-1" mode="#all">
         <xsl:copy>
             <xsl:apply-templates mode="#current" select="@*|node()"/>
         </xsl:copy>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/Test2/expected-results/testDocxIndexes1.xml b/Test2/expected-results/testDocxIndexes1.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>

diff --git a/Test2/expected-results/testDocxListsTables1.xml b/Test2/expected-results/testDocxListsTables1.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>

diff --git a/Test2/expected-results/testNotes2.xml b/Test2/expected-results/testNotes2.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>

diff --git a/Test2/expected-results/testShelfmarkMs.xml b/Test2/expected-results/testShelfmarkMs.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>