1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
open Colitur_kernel
let slug = Slug.of_string_exn
let cit part reference = { Citation.part; reference }
let entry s cs = (slug s, cs)
let ok_exn = function Ok x -> x | Error e -> Alcotest.fail e
(* Stdlib-only substring search -- Astring is not among the frozen deps. *)
let contains_substring ~needle haystack =
let hn = String.length needle and hh = String.length haystack in
let rec go i = i + hn <= hh && (String.sub haystack i hn = needle || go (i + 1)) in
hn = 0 || go 0
let test_find_present () =
let l =
ok_exn
(Lectionary.of_entries
[ entry "ef-advent-sunday-1"
[ cit Citation.First "Rom 13:11-14"; cit Citation.Gospel "Luke 21:25-33" ] ])
in
match Lectionary.find l (slug "ef-advent-sunday-1") with
| Some [ a; b ] ->
Alcotest.(check string) "epistle" "Rom 13:11-14" a.Citation.reference;
Alcotest.(check string) "gospel" "Luke 21:25-33" b.Citation.reference
| Some _ -> Alcotest.fail "expected exactly two citations"
| None -> Alcotest.fail "slug not found"
let test_find_absent () =
let l = ok_exn (Lectionary.of_entries []) in
Alcotest.(check bool) "absent" true
(Lectionary.find l (slug "ef-advent-sunday-1") = None)
let test_duplicate_slug_rejected () =
let e = entry "ef-advent-sunday-1" [ cit Citation.First "Rom 13:11-14" ] in
match Lectionary.of_entries [ e; e ] with
| Ok _ -> Alcotest.fail "duplicate slug must be rejected"
| Error msg ->
(* Strengthened beyond the brief's "non-empty and contains 'e'" check:
the interface doc promises the error names the slug, so assert the
offending slug string actually appears in the message. *)
Alcotest.(check bool) "names the slug" true
(contains_substring ~needle:"ef-advent-sunday-1" msg)
let test_sexp_round_trip () =
let l =
ok_exn
(Lectionary.of_entries
[ entry "ef-lent-1-monday"
[ cit Citation.First "Ezech 34:11-16"; cit Citation.Gospel "Matt 25:31-46" ] ])
in
let l' = Lectionary.t_of_sexp (Lectionary.sexp_of_t l) in
Alcotest.(check bool) "round trips" true (l = l')
let with_temp_file contents f =
let path = Filename.temp_file "lectionary_test" ".sexp" in
let oc = open_out path in
output_string oc contents;
close_out oc;
Fun.protect ~finally:(fun () -> Sys.remove path) (fun () -> f path)
let load_is_error contents what =
with_temp_file contents (fun path ->
match Lectionary.load path with
| Error _ -> ()
| Ok _ -> Alcotest.fail (what ^ ": expected Error, got Ok"))
let test_load_never_raises () =
load_is_error "((ef-advent-sunday-1 (" "unterminated list";
load_is_error "((ef-advent-sunday-1 ((part First) (reference \"x" "unterminated string";
load_is_error "" "empty file";
load_is_error "() ()" "more than one sexp";
load_is_error "not-a-list" "wrong shape";
load_is_error "((\"NOT A SLUG\" ()))" "invalid slug";
match Lectionary.load "/nonexistent/path/lectionary.sexp" with
| Error _ -> ()
| Ok _ -> Alcotest.fail "missing file: expected Error, got Ok"
let test_ef_data_file_loads () =
match Lectionary.load "../data/ef/lectionary.sexp" with
| Error e -> Alcotest.fail e
| Ok l ->
(* 119 lectio ini sections, translated/widened/renamed into colitur's
own Temporal_ef vocabulary, PLUS hand-authored/derived entries
(tools/bootstrap_lectionary.ml's own [colitur_keys]/
[vigil_entries]/[holy_week_entries]/[passion_tuesday_entry]/
[nativity_octave_entries]/[derived_entries] comments have the full
account, task 8, branch ef-lectionary, fix rounds 1-2):
"ef-christmas-sunday-0" widens into itself PLUS "ef-holy-name-
sunday" (+1); the three Lent Ember sections rename 1:1 (no count
change); "ef-passiontide-0-tuesday" is EXCLUDED (fix round 2,
Important -- it is Holy Tuesday's data, not Passion Tuesday's,
-1); the other five Passiontide sections rename 1:1 (no count
change); one hand-authored entry sourced from lectio's SANCTORAL
calendar, not this lectionary ini ([ef-nativity-vigil], +1); SIX
hand-authored directly from the Missal, all of Holy Week (+6,
fix round 2 -- Wednesday and Friday added, the first pass's
Critical bug); ONE hand-authored directly from the Missal,
Passion Tuesday's own real citation (+1, fix round 2); three
hand-authored directly from the Missal, the fixed Nativity-Octave
days (+3); one entry derived from an already-translated one
rather than re-typed ([ef-holy-name], +1).
119 + 1 - 1 + 1 + 6 + 1 + 3 + 1 = 131. *)
Alcotest.(check int) "entry count" 131
(List.length (Lectionary.entries l));
(match Lectionary.find l (slug "ef-lent-1-monday") with
| Some [ a; b ] ->
Alcotest.(check string) "epistle" "Ezech 34:11-16" a.Citation.reference;
Alcotest.(check string) "gospel" "Matt 25:31-46" b.Citation.reference
| Some _ -> Alcotest.fail "expected exactly two citations"
| None -> Alcotest.fail "ef-lent-1-monday missing");
(* Task 8's own renamed/derived/hand-authored keys, spot-checked here
so a future regeneration that silently drops one of them fails
loudly and locally, not only via the much bigger differential
suite. *)
let check_entry name first gospel =
match Lectionary.find l (slug name) with
| Some [ a; b ] ->
Alcotest.(check string) (name ^ ": epistle") first a.Citation.reference;
Alcotest.(check string) (name ^ ": gospel") gospel b.Citation.reference
| Some _ -> Alcotest.fail (name ^ ": expected exactly two citations")
| None -> Alcotest.fail (name ^ ": missing")
in
check_entry "ef-holy-name-sunday" "Gal 4:1-7" "Luke 2:33-40";
check_entry "ef-christmas-sunday-0" "Gal 4:1-7" "Luke 2:33-40";
check_entry "ef-holy-name" "Gal 4:1-7" "Luke 2:33-40";
check_entry "ef-nativity-vigil" "Rom 1:1-6" "Matt 1:18-21";
check_entry "ef-pentecost-ember-wed" "Acts 5:12-16" "John 6:44-52.";
check_entry "ef-pentecost-ember-fri" "Joel 2:23-24; 26-27" "Luke 5:17-26";
check_entry "ef-pentecost-ember-sat" "Rom 5:1-5." "Luke 4:38-44.";
(* Critical 2 fix (coordinator review round 1): the Lenten Ember days,
previously dead keys under lectio's own "ef-lent-1-<weekday>"
naming -- now reachable under colitur's own slugs. Minor, fix
round 2 (coordinator review): all THREE are pinned, not just
Wednesday -- a mutation on Friday's or Saturday's own value used
to leave the whole suite green. *)
check_entry "ef-lent-ember-wed" "3 Kgs. 19:3-8" "Matt 12:38-50";
check_entry "ef-lent-ember-fri" "Ezech 18:20-28" "John 5:1-15";
check_entry "ef-lent-ember-sat" "1 Thess. 5:14-23" "Matt 17:1-9";
(* Passiontide widens into Passion week ONLY now (Critical 1 fix) --
"ef-passiontide-1-monday" keeps lectio's own citation;
"ef-passiontide-2-monday" (Holy Monday) is Missal-sourced,
DIFFERENT text, hand-authored in [holy_week_entries]. Fix round 2
(Important): "ef-passiontide-1-tuesday" no longer carries lectio's
own (wrong -- Holy Tuesday's) ini value; it is hand-authored from
the Missal's own real Passion Tuesday Mass, [passion_tuesday_entry]. *)
check_entry "ef-passiontide-1-monday" "Jonas 3:1-10" "John 7:32-39";
check_entry "ef-passiontide-1-tuesday" "Dan 14:27, 28-42" "John 7:1-13";
check_entry "ef-passiontide-2-monday" "Isa 50:5-10" "John 12:1-9";
(* Gospel punctuation ("15, 1-46") intentionally kept as lectio's own
ini already has it -- see bootstrap_lectionary.ml's own
[holy_week_entries] comment on this one entry. *)
check_entry "ef-passiontide-2-tuesday" "Jer 11:18-20" "Mark 14:32-72; 15, 1-46";
(* Critical fix, round 2: Wednesday and Good Friday were left entirely
absent by the first pass, which meant step 3 quietly resumed the
preceding Sunday's Mass there (Good Friday emitting PALM SUNDAY's
Epistle and Passion) -- the FIRST pass's own reasoning ("neither
day has a single Epistle") was right about the First slot alone;
the Gospel is always unambiguous and is now always authored, and
First uses the SAME "last lesson before the Gospel" convention
this file's own Lenten Ember Wednesday entry above already uses
for an identical two-lesson shape. *)
check_entry "ef-passiontide-2-wednesday" "Isa 53:1-12" "Luke 22:39-71; 23:1-53";
check_entry "ef-passiontide-2-thursday" "1 Cor 11:20-32" "John 13:1-15";
check_entry "ef-passiontide-2-friday" "Ex 12:1-11" "John 18:1-40; 19:1-42";
check_entry "ef-passiontide-2-saturday" "Col 3:1-4" "Matt 28:1-7";
(* Important 3(a) fix (coordinator review round 1): the fixed
Nativity-Octave days now carry their own direct Missal formulary
("Diebus infra octavam Nativitatis Domini"), not Holy Name
Sunday's (a first guess, measured wrong, reverted -- see
[nativity_octave_entries]'s own comment). *)
check_entry "ef-nativity-octave-day-5" "Titus 3:4-7" "Luke 2:15-20";
check_entry "ef-nativity-octave-day-6" "Titus 3:4-7" "Luke 2:15-20";
check_entry "ef-nativity-octave-day-7" "Titus 3:4-7" "Luke 2:15-20";
(* Lent's OWN "ef-lent-1-wednesday/friday/saturday" keys must not
reappear once renamed away (colitur never computes them as its
own slug at all) -- a regression net for that decision, not
merely documentation of it. *)
match Lectionary.find l (slug "ef-lent-1-wednesday") with
| None -> ()
| Some _ ->
Alcotest.fail "ef-lent-1-wednesday: must stay absent -- see bootstrap_lectionary.ml"
let suite =
[ ("find present", `Quick, test_find_present);
("find absent", `Quick, test_find_absent);
("duplicate slug rejected", `Quick, test_duplicate_slug_rejected);
("sexp round-trip", `Quick, test_sexp_round_trip);
("load never raises", `Quick, test_load_never_raises);
("ef data file loads", `Quick, test_ef_data_file_loads) ]
|
