summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLukasz Kasprzak <lukas@labunix.xyz>2026-08-12 01:16:22 +0200
committerLukasz Kasprzak <lukas@labunix.xyz>2026-08-12 01:16:22 +0200
commit94fc488cc9c6b4a050d90c4250f6e166b40088e7 (patch)
tree18f68c393a704c225c0124f6c9a30bdd96e444ae /test
parent9725195fc4a1050ded151854f6653459dacc35b0 (diff)
downloadcolitur-94fc488cc9c6b4a050d90c4250f6e166b40088e7.tar.gz
colitur-94fc488cc9c6b4a050d90c4250f6e166b40088e7.zip
rite(ef): clamp the RG96 search at the domain ceiling
search_from could walk up to 400 days past origin before Calendar's own ~start ~stop clamp is ever consulted, and nothing stopped it probing occupant on a date past 31 December 9999 -- occupant chains through the real EF rite's temporal, which calls Computus.gregorian_easter, not total outside 1583..9999 (it Date.makes and failwiths on Error). Not reachable with the shipped sanctoral data alone, but reachable through the project's own primary extension path: an overlay adding an I-class feast on 25 December leaves nothing but Class2 Nativity-octave days for the rest of civil year 9999, so the unguarded search reached 1 January of year 10000 and crashed there with 'computus: year 10000 out of range 1583..9999'. 9999 is an in-range year and the kernel's contract is 'never raises on in-range input'. search_from now also stops, without probing occupant again, once it passes Date's own domain ceiling -- the same 'return a finite date, let Calendar's own out-of-range handling record it, never pretend to have found something admissible' contract the existing step-count guard already follows. Two new tests, both mutation-verified to actually reproduce the crash when the guard is removed (see the task report): a precedence_ef.ml unit test using the real Temporal_ef.temporal as occupant (a synthetic occupant can never discriminate this, since it never calls Computus itself), and a Calendar-level integration test reproducing the exact overlay-based scenario the review found.
Diffstat (limited to 'test')
-rw-r--r--test/dune2
-rw-r--r--test/test_colitur.ml2
-rw-r--r--test/test_precedence_ef.ml32
-rw-r--r--test/test_rite_ef.ml81
4 files changed, 114 insertions, 3 deletions
diff --git a/test/dune b/test/dune
index be24839..dc81213 100644
--- a/test/dune
+++ b/test/dune
@@ -1,7 +1,7 @@
(test
(name test_colitur)
(libraries colitur_kernel rite_ef alcotest qcheck qcheck-alcotest sexplib)
- (deps ../data/ef/sanctoral.sexp)
+ (deps ../data/ef/sanctoral.sexp ../data/ef/adjustments.sexp)
(preprocess
(pps ppx_sexp_conv)))
diff --git a/test/test_colitur.ml b/test/test_colitur.ml
index ba82fcd..9f74e34 100644
--- a/test/test_colitur.ml
+++ b/test/test_colitur.ml
@@ -3,4 +3,4 @@ let () =
Alcotest.run "colitur"
[ Test_date.suite; Test_computus.suite; Test_colour.suite; Test_slug.suite; Test_names.suite;
Test_overlay.suite; Test_temporal_ef.suite; Test_validate.suite; Test_precedence.suite;
- Test_calendar.suite; Test_precedence_ef.suite; Test_sanctoral_ef.suite ]
+ Test_calendar.suite; Test_precedence_ef.suite; Test_sanctoral_ef.suite; Test_rite_ef.suite ]
diff --git a/test/test_precedence_ef.ml b/test/test_precedence_ef.ml
index 084d708..0973a93 100644
--- a/test/test_precedence_ef.ml
+++ b/test/test_precedence_ef.ml
@@ -897,6 +897,34 @@ let test_transfer_target_terminates_under_pathological_occupant () =
true
(D.compare target (D.add_days origin 1000) <= 0)
+(* Coordinator review: [search_from] must not probe [occupant] past
+ {!Date}'s own domain ceiling (31 December 9999). A SYNTHETIC occupant
+ (like [occupant_always_blocking] above) can never actually discriminate
+ this: it never calls [Computus.gregorian_easter] itself, so it cannot
+ raise regardless of whether the domain guard exists -- a test built on
+ one would only prove [search_from]'s unrelated step bound, not this fix.
+ [occupant] here is instead the REAL [Temporal_ef.temporal] (no sanctoral
+ layer needed: 29-31 Dec are ALREADY II class via [named]'s own Nativity-
+ octave-day entries, so three real, unbroken blocking days already sit at
+ the very end of the domain) -- exactly the shape that raises without the
+ fix: 1 January of civil year 10000 is next, and [Computus.gregorian_easter
+ 10000] does [Date.make ~year:10000 ...] and [failwith]s (the .ml's own
+ [domain_max_date] comment; also how the reviewer reproduced the bug
+ through the project's own overlay mechanism -- see the task report for
+ that end-to-end reproduction). Mutation-verified: reverting the domain
+ guard makes this test error with exactly that uncaught [Failure], not
+ merely fail an assertion (see the task report). *)
+let test_transfer_target_does_not_raise_at_domain_ceiling () =
+ let origin = mk 9999 12 28 in
+ let occupant d = (T.temporal d).Colitur_kernel.Temporal.office in
+ let c = cand ~origin:P.Sanctoral ~layer:PE.universal_layer "ef-domain-ceiling-case" in
+ let target = PE.transfer_target c origin occupant in
+ Alcotest.(check bool) "past 31 December 9999 (the guard engaged; nothing admissible remained \
+ in-domain, so the search gave up at the ceiling rather than crashing)"
+ true
+ (D.compare target (mk 9999 12 31) > 0)
+
+
let suite =
( "Precedence_ef",
List.map
@@ -947,4 +975,6 @@ let suite =
"transfer_target: Annunciation exception searches onward if that Monday is blocked" `Quick
test_transfer_target_annunciation_searches_onward_if_blocked;
Alcotest.test_case "transfer_target: terminates and stays forward under a pathological occupant"
- `Quick test_transfer_target_terminates_under_pathological_occupant ] )
+ `Quick test_transfer_target_terminates_under_pathological_occupant;
+ Alcotest.test_case "transfer_target: does not raise probing past the domain ceiling" `Quick
+ test_transfer_target_does_not_raise_at_domain_ceiling ] )
diff --git a/test/test_rite_ef.ml b/test/test_rite_ef.ml
new file mode 100644
index 0000000..7b60718
--- /dev/null
+++ b/test/test_rite_ef.ml
@@ -0,0 +1,81 @@
+(* Coordinator review (Task 11 fix round): integration tests wiring
+ [Rite_ef.context] together with the REAL data/ef/sanctoral.sexp +
+ data/ef/adjustments.sexp through [Colitur_kernel.Calendar] -- the same
+ pipeline `colitur day` uses, proven here at the OCaml level. *)
+
+module Cal = Colitur_kernel.Calendar
+module Layer = Colitur_kernel.Layer
+module Overlay = Colitur_kernel.Overlay
+module LD = Colitur_kernel.Liturgical_day
+module Slug = Colitur_kernel.Slug
+module Date = Colitur_kernel.Date
+module Date_spec = Colitur_kernel.Date_spec
+module Cel = Colitur_kernel.Celebration
+module Colour = Colitur_kernel.Colour
+module V = Rite_ef.Vocab_ef
+
+(* Relative to this test's own build directory (_build/default/test/), same
+ convention test_sanctoral_ef.ml uses -- test/dune declares both as deps
+ of the (test ...) stanza. *)
+let sanctoral_path = "../data/ef/sanctoral.sexp"
+let adjustments_path = "../data/ef/adjustments.sexp"
+
+let real_layer () =
+ let layer =
+ match Layer.load V.rank_of_sexp sanctoral_path with
+ | Ok l -> l
+ | Error e -> Alcotest.failf "%s: failed to load: %s" sanctoral_path e
+ in
+ let overlay =
+ match Overlay.load V.rank_of_sexp adjustments_path with
+ | Ok o -> o
+ | Error e -> Alcotest.failf "%s: failed to load: %s" adjustments_path e
+ in
+ let layer, diagnostics = Overlay.apply layer overlay in
+ Alcotest.(check (list string)) "the committed overlay applies cleanly, no diagnostics" []
+ (List.map Overlay.diagnostic_to_string diagnostics);
+ layer
+
+let slug_of (c : V.rank Cel.t) = Slug.to_string c.Cel.slug
+
+(* Coordinator review, finding 2, reproduced through the project's OWN
+ extension path (an overlay), the same way the reviewer found it: adding
+ an I-class feast on 25 December (competing against, and losing to, the
+ real Nativity) forces an RG 96 search starting 26 December -- which, with
+ the real sanctoral data (Stephen/John/the Innocents, all II class) plus
+ the temporal cycle's own Nativity-octave-day entries (29-31 Dec, also II
+ class), is blocking every single day through 31 December 9999. Before the
+ domain-ceiling fix this raised (Computus: year 10000 out of range);
+ confirmed by mutation-testing at the precedence_ef.ml unit level (see the
+ task report) -- this is the same defect reproduced end to end, through
+ Calendar, with real data, exactly as the review found it. *)
+let test_transfer_search_does_not_raise_at_domain_ceiling () =
+ let layer = real_layer () in
+ let impeding_entry : V.rank Layer.entry =
+ { Layer.date = (match Date_spec.fixed ~month:12 ~day:25 with Ok d -> d | Error e -> failwith e);
+ cel =
+ Cel.make ~slug:(Slug.of_string_exn "test-domain-ceiling-impeder") ~rank:V.Class1
+ ~colour:Colour.White ~layer:Rite_ef.Precedence_ef.universal_layer () }
+ in
+ let overlay : V.rank Overlay.t =
+ { Overlay.id = "test-domain-ceiling"; directives = [ Overlay.Add impeding_entry ] }
+ in
+ let layer, _diagnostics = Overlay.apply layer overlay in
+ (* Must not raise -- the whole point of the fix. *)
+ let days = Cal.year Rite_ef.context layer 9999 in
+ Alcotest.(check bool) "year 9999 resolves without raising, even with an impeded Christmas Day"
+ true (Array.length days > 0);
+ let impeder_placed_or_recorded =
+ Array.to_list days
+ |> List.exists (fun d ->
+ slug_of d.LD.observed = "test-domain-ceiling-impeder"
+ || List.exists (fun (c, _) -> slug_of c = "test-domain-ceiling-impeder") d.LD.omitted)
+ in
+ Alcotest.(check bool) "the impeding candidate is accounted for (observed somewhere, or omitted \
+ with a recorded reason) -- never silently dropped"
+ true impeder_placed_or_recorded
+
+let suite =
+ ( "Rite_ef (real data: overlay-in-effect, domain-ceiling)",
+ [ Alcotest.test_case "RG96 search does not raise at the domain ceiling (real data)" `Quick
+ test_transfer_search_does_not_raise_at_domain_ceiling ] )