Merge pull request #240 from Juris-M/test-fixes

Fix broken tests
Juris-M · Mar 9, 2024 · 59fbf78 · 59fbf78
2 parents 9512c4f + 1bb2f0d
commit 59fbf78
Show file tree

Hide file tree

Showing 37 changed files with 40 additions and 41 deletions.
diff --git a/fixtures/local/bugreports_AffiliationSpoofingBrokenInstitutionalName.txt b/fixtures/local/bugreports_AffiliationSpoofingBrokenInstitutionalName.txt
@@ -124,7 +124,7 @@ bibliography
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />

diff --git a/fixtures/local/bugreports_BrokenInstitutionalName.txt b/fixtures/local/bugreports_BrokenInstitutionalName.txt
@@ -117,7 +117,7 @@ bibliography
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
       <institution delimiter-precedes-last="always"/>
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />

diff --git a/fixtures/local/bugreports_TwoFullStops.txt b/fixtures/local/bugreports_TwoFullStops.txt
@@ -123,7 +123,7 @@ bibliography
   <macro name="contributors">
     <names variable="author">
       <name and="text" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="first" sort-separator=", " />
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />

diff --git a/fixtures/local/citeprocjs_AuthorListing.txt b/fixtures/local/citeprocjs_AuthorListing.txt
@@ -1593,7 +1593,7 @@ Not the cleanest of tests.
                        et-al-use-first="1" 
                        et-al-min="1"/>
          <et-al term="and others"/>
-      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" />
+      <label form="short" prefix=", " suffix="." text-case="lowercase" />
       <substitute>
         <text macro="editor" />
         <text macro="translator" />

diff --git a/fixtures/local/condition_Locale.txt b/fixtures/local/condition_Locale.txt
@@ -42,9 +42,9 @@ citation
 
 
 >>===== RESULT =====>>
-Author Bob; Container Bob (編); Secondary Bob (翻訳者)
+Author Bob; Container Bob (編); Secondary Bob (訳)
 Bob Author; Bob Container (ed.); Bob Secondary (tran.)
-Author Bob; Container Bob (編); Secondary Bob (翻訳者)
+Author Bob; Container Bob (編); Secondary Bob (訳)
 <<===== RESULT =====<<
 
 >>===== CSL =====>>

diff --git a/fixtures/local/language_BaseLocale.txt b/fixtures/local/language_BaseLocale.txt
@@ -12,8 +12,8 @@ June 1, 1965+October (US English)
 1. Juni 1965+Oktober (Austria)
 1965年6月1日+10月 (Mainland China)
 1965年6月1日+10月 (Taiwan)
-1 de Junho de 1965+Outubro (Portugal)
-1 de Junho de 1965+Outubro (Portugal)
+1 de junho de 1965+Outubro (Portugal)
+1 de junho de 1965+Outubro (Portugal)
 <<===== RESULT =====<<
 
 

diff --git a/fixtures/local/language_Condition.txt b/fixtures/local/language_Condition.txt
@@ -5,8 +5,8 @@ citation
 
 
 >>===== RESULT =====>>
-..[0] Hans Schrijver en Jan Pen, “A Dutch Title,” in <i>Nederlands werk</i>, red. Kees Redacteur (Amsterdam: Klopke, 2002), 132–230.
-..[1] Hans Schreiber und Marc Bleistift, „A German Title,“ in <i>Deutsches werk</i>, Hrsg. Hubert Herausgeber (Berlin: Plopke, 2002), 132–230; Pim Writer and Judith Scriber, “An English Title,” in <i>English Work</i>, ed. Kees Editor (Londen: Slopke, 2002), 132–230; Schrijver en Pen, “A Dutch Title,” 132–230.
+..[0] Hans Schrijver en Jan Pen, ‘A Dutch Title,’ in <i>Nederlands werk</i>, red. Kees Redacteur (Amsterdam: Klopke, 2002), 132–230.
+..[1] Hans Schreiber und Marc Bleistift, „A German Title,“ in <i>Deutsches werk</i>, Hrsg. Hubert Herausgeber (Berlin: Plopke, 2002), 132–230; Pim Writer and Judith Scriber, “An English Title,” in <i>English Work</i>, ed. Kees Editor (Londen: Slopke, 2002), 132–230; Schrijver en Pen, ‘A Dutch Title,’ 132–230.
 ..[2] Schreiber und Bleistift, „A German Title,“ 132–230.
 >>[3] Ibid.
 <<===== RESULT =====<<

diff --git a/fixtures/local/number_DocketNumberHyphenOK.txt b/fixtures/local/number_DocketNumberHyphenOK.txt
@@ -31,7 +31,6 @@ Other type: 2:19-cv–00222
             <text value="Other type:"/>
           </else>
         </choose>
-        <label variable="number"/>
         <number variable="number"/>
       </group>
     </layout>

diff --git a/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefLongordinal.txt b/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] chapter tenth r. 1–6
+>>[0] chapter tenth rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefOrdinal.txt b/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] chapter 10th r. 1–6
+>>[0] chapter 10th rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefPlain.txt b/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefPlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] chapter 10 r. 1–6
+>>[0] chapter 10 rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefRoman.txt b/fixtures/local/number_RevLocatorChapteroverrideEmbeddedundefRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] chapter x r. 1–6
+>>[0] chapter x rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorNolabelEmbeddedundefLongordinal.txt b/fixtures/local/number_RevLocatorNolabelEmbeddedundefLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] tenth r. 1–6
+>>[0] tenth rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorNolabelEmbeddedundefOrdinal.txt b/fixtures/local/number_RevLocatorNolabelEmbeddedundefOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10th r. 1–6
+>>[0] 10th rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorNolabelEmbeddedundefPlain.txt b/fixtures/local/number_RevLocatorNolabelEmbeddedundefPlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10 r. 1–6
+>>[0] 10 rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorNolabelEmbeddedundefRoman.txt b/fixtures/local/number_RevLocatorNolabelEmbeddedundefRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] x r. 1–6
+>>[0] x rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorPagelabelEmbeddedundefLongordinal.txt b/fixtures/local/number_RevLocatorPagelabelEmbeddedundefLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] page tenth r. 1–6
+>>[0] page tenth rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorPagelabelEmbeddedundefOrdinal.txt b/fixtures/local/number_RevLocatorPagelabelEmbeddedundefOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] page 10th r. 1–6
+>>[0] page 10th rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorPagelabelEmbeddedundefPlain.txt b/fixtures/local/number_RevLocatorPagelabelEmbeddedundefPlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] page 10 r. 1–6
+>>[0] page 10 rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevLocatorPagelabelEmbeddedundefRoman.txt b/fixtures/local/number_RevLocatorPagelabelEmbeddedundefRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] page x r. 1–6
+>>[0] page x rr. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralLongordinal.txt b/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] tenth paras. 1–6
+>>[0] number tenth paras. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralOrdinal.txt b/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10th paras. 1–6
+>>[0] number 10th paras. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralPlain.txt b/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralPlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10 paras. 1–6
+>>[0] number 10 paras. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralRoman.txt b/fixtures/local/number_RevNumberNumberlabelundefEmbeddedpluralRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] x paras. 1–6
+>>[0] number x paras. 1–6
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefMultipleLongordinal.txt b/fixtures/local/number_RevNumberNumberlabelundefMultipleLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] first–third, fifth &#38; eighth
+>>[0] numbers first–third, fifth &#38; eighth
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefMultipleOrdinal.txt b/fixtures/local/number_RevNumberNumberlabelundefMultipleOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 101st–105th, 108th &#38; 110th
+>>[0] numbers 101st–105th, 108th &#38; 110th
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefMultiplePlain.txt b/fixtures/local/number_RevNumberNumberlabelundefMultiplePlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 101–105, 108 &#38; 110
+>>[0] numbers 101–105, 108 &#38; 110
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefMultipleRoman.txt b/fixtures/local/number_RevNumberNumberlabelundefMultipleRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] ci–cv, cviii &#38; cx
+>>[0] numbers ci–cv, cviii &#38; cx
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefRangeLongordinal.txt b/fixtures/local/number_RevNumberNumberlabelundefRangeLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] first–eighth
+>>[0] numbers first–eighth
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefRangeOrdinal.txt b/fixtures/local/number_RevNumberNumberlabelundefRangeOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 101st–105th
+>>[0] numbers 101st–105th
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefRangePlain.txt b/fixtures/local/number_RevNumberNumberlabelundefRangePlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 101–105
+>>[0] numbers 101–105
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefRangeRoman.txt b/fixtures/local/number_RevNumberNumberlabelundefRangeRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] ci–cv
+>>[0] numbers ci–cv
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefSingleLongordinal.txt b/fixtures/local/number_RevNumberNumberlabelundefSingleLongordinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] tenth
+>>[0] number tenth
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefSingleOrdinal.txt b/fixtures/local/number_RevNumberNumberlabelundefSingleOrdinal.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10th
+>>[0] number 10th
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefSinglePlain.txt b/fixtures/local/number_RevNumberNumberlabelundefSinglePlain.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] 10
+>>[0] number 10
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/number_RevNumberNumberlabelundefSingleRoman.txt b/fixtures/local/number_RevNumberNumberlabelundefSingleRoman.txt
@@ -4,7 +4,7 @@ citation
 
 
 >>===== RESULT =====>>
->>[0] x
+>>[0] number x
 <<===== RESULT =====<<
 
 >>===== CITATIONS =====>>

diff --git a/fixtures/local/parallel_MultiTough.txt b/fixtures/local/parallel_MultiTough.txt
@@ -28,12 +28,12 @@ here because of limitations in the test suite (and lack of time and
 incentive to fix it). The test did run as described before the
 reversion though, like this:
 
-林秀弥, 競争法における関連市場の画定基準, 126 <span style="font-variant:small-caps;">民商法雑誌</span> <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 1, at 23, 126 <span style="font-variant:small-caps;">民商法雑誌</span>, no. 2, 2002, at 56.
+林秀弥, 競争法における関連市場の画定基準, 126 <span style="font-variant:small-caps;">民商法雑誌</span> <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 1, にて 23, 126 <span style="font-variant:small-caps;">民商法雑誌</span>, no. 2, 2002, にて 56.
 
 
 
 >>== RESULT ==>>
-林秀弥, 競争法における関連市場の画定基準, 126 <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 1, at 23, 126 <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 2, 2002, at 56.
+林秀弥, 競争法における関連市場の画定基準, 126 <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 1, にて 23, 126 <span style="font-variant:small-caps;">Minsho ho zasshi</span>, no. 2, 2002, にて 56.
 <<== RESULT ==<<
 
 >>===== CSL =====>>