summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRichard Lawrence <rwl@recursewithless.net>2026-05-17 12:54:24 +0200
committerEli Zaretskii <eliz@gnu.org>2026-05-23 13:25:19 +0300
commit70b79b3ed8d04aa852837177636061dfc43e9b0b (patch)
tree3dbf5b75529069c9b80e8a1dcad0419c38611a20 /test
parent3d2bb233f27c00dac2bec0c70a569a6232f37c54 (diff)
Rename `icalendar-recur' type and related functions
More context in Bug#80786 and: https://lists.gnu.org/archive/html/emacs-orgmode/2026-03/msg00286.html `icalendar-recur' as a type name for RRULE values was confusing and made the accessors for this type difficult to discover, because `icalendar-recur-' is also used as a prefix in icalendar-recur.el. This change renames the `icalendar-recur' type to `icalendar-rrule-value' and renames the accessor functions for these values appropriately. * lisp/calendar/icalendar-parser.el: Rename symbols as follows: (icalendar-recur): `icalendar-rrule-value' (icalendar-read-recur-rule-part): `icalendar-read-rrule-part' (icalendar-print-recur-rule-part): `icalendar-print-rrule-part' (icalendar-recur-rule-part): `icalendar-rrule-part' (icalendar-read-recur): `icalendar-read-rrule-value' (icalendar-print-recur): `icalendar-print-rrule-value' (icalendar--recur-value-types): `icalendar--rrule-value-types' (icalendar-recur-value-p): `icalendar-rrule-value-p' (icalendar-recur-freq): `icalendar-rrule-freq' (icalendar-recur-interval-size): `icalendar-rrule-interval-size' (icalendar-recur-until): `icalendar-rrule-until' (icalendar-recur-count): `icalendar-rrule-count' (icalendar-recur-weekstart): `icalendar-rrule-weekstart' (icalendar-recur-by*): `icalendar-rrule-by*'. (icalendar-rrule): (icalendar-index-insert): (icalendar-index-get): Update references. * lisp/calendar/icalendar-recur.el (icalendar-recur-find-interval): (icalendar-recur-nth-interval): (icalendar-recur-next-interval): (icalendar-recur-previous-interval): (icalendar-recur-refine-from-clauses): (icalendar-recur-recurrences-in-interval): (icalendar-recur-recurrences-in-window): (icalendar-recur-recurrences-to-count): (icalendar-recur-tz-observance-on): Update references. * lisp/calendar/diary-icalendar.el: Update references. * lisp/calendar/icalendar-shortdoc.el (icalendar): Update shortdoc examples. * lisp/gnus/gnus-icalendar.el: Update references. * test/lisp/calendar/diary-icalendar-tests.el: * test/lisp/calendar/icalendar-parser-tests.el: * test/lisp/calendar/icalendar-recur-tests.el: Update references in tests.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/calendar/diary-icalendar-tests.el46
-rw-r--r--test/lisp/calendar/icalendar-parser-tests.el6
-rw-r--r--test/lisp/calendar/icalendar-recur-tests.el8
3 files changed, 30 insertions, 30 deletions
diff --git a/test/lisp/calendar/diary-icalendar-tests.el b/test/lisp/calendar/diary-icalendar-tests.el
index 22faeb7aa23..06272a39cf4 100644
--- a/test/lisp/calendar/diary-icalendar-tests.el
+++ b/test/lisp/calendar/diary-icalendar-tests.el
@@ -817,8 +817,8 @@ SOURCE, if given, should be a symbol; it is used to name the test."
(should (equal (ical:date-time-to-date dtstart)
(calendar-nth-named-day 1 4 1 di:recurring-start-year)))
(should (= 16 (decoded-time-hour dtstart)))
- (should (eq (ical:recur-freq rrule) 'WEEKLY))
- (should (equal (ical:recur-by* 'BYDAY rrule) (list 4)))))
+ (should (eq (ical:rrule-freq rrule) 'WEEKLY))
+ (should (equal (ical:rrule-by* 'BYDAY rrule) (list 4)))))
(dit:parse-test
;; Multiline entry, parsed as one event:
@@ -961,10 +961,10 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart '(5 28 1995)))
- (should (eq (ical:recur-freq recur-value) 'YEARLY))
+ (should (eq (ical:rrule-freq rrule) 'YEARLY))
(should (equal summary "H's birthday"))))
(dit:parse-test
@@ -977,11 +977,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart '(6 24 2012)))
- (should (equal (ical:recur-freq recur-value) 'DAILY))
- (should (equal (ical:recur-until recur-value) '(7 10 2012)))
+ (should (equal (ical:rrule-freq rrule) 'DAILY))
+ (should (equal (ical:rrule-until rrule) '(7 10 2012)))
(should (equal summary "Vacation"))))
(dit:parse-test
@@ -994,11 +994,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart '(3 1 2012)))
- (should (eq (ical:recur-freq recur-value) 'DAILY))
- (should (eq (ical:recur-interval-size recur-value) 50))
+ (should (eq (ical:rrule-freq rrule) 'DAILY))
+ (should (eq (ical:rrule-interval-size rrule) 50))
(should (equal summary "Renew medication"))))
(dit:parse-test
@@ -1011,13 +1011,13 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart
(calendar-nth-named-day 4 4 11 di:recurring-start-year)))
- (should (eq (ical:recur-freq recur-value) 'MONTHLY))
- (should (equal (ical:recur-by* 'BYMONTH recur-value) (list 11)))
- (should (equal (ical:recur-by* 'BYDAY recur-value) (list '(4 . 4))))
+ (should (eq (ical:rrule-freq rrule) 'MONTHLY))
+ (should (equal (ical:rrule-by* 'BYMONTH rrule) (list 11)))
+ (should (equal (ical:rrule-by* 'BYDAY rrule) (list '(4 . 4))))
(should (equal summary "American Thanksgiving"))))
(dit:parse-test
@@ -1030,13 +1030,13 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart
(calendar-nth-named-day 4 5 1 di:recurring-start-year)))
- (should (eq (ical:recur-freq recur-value) 'MONTHLY))
+ (should (eq (ical:rrule-freq rrule) 'MONTHLY))
;; day 3 is Wednesday, so offset of 2 means Friday (=5):
- (should (equal (ical:recur-by* 'BYDAY recur-value) (list '(5 . 4))))
+ (should (equal (ical:rrule-by* 'BYDAY rrule) (list '(5 . 4))))
(should (equal summary "Monthly committee meeting"))))
(dit:parse-test
@@ -1052,11 +1052,11 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:exdate :values exdates)
(ical:summary :value summary))
(should (equal dtstart '(11 11 2024)))
- (should (eq (ical:recur-freq recur-value) 'WEEKLY))
+ (should (eq (ical:rrule-freq rrule) 'WEEKLY))
(should (equal exdates '((12 23 2024) (12 30 2024))))
(should (equal summary "Reading group"))))
@@ -1070,12 +1070,12 @@ SOURCE, if given, should be a symbol; it is used to name the test."
:tests
(ical:with-component (car parsed)
((ical:dtstart :value dtstart)
- (ical:rrule :value recur-value)
+ (ical:rrule :value rrule)
(ical:summary :value summary))
(should (equal dtstart (list 10 22 di:recurring-start-year)))
- (should (eq (ical:recur-freq recur-value) 'YEARLY))
- (should (equal (ical:recur-by* 'BYMONTH recur-value) (list 10 11 12)))
- (should (equal (ical:recur-by* 'BYMONTHDAY recur-value) (list 22)))
+ (should (eq (ical:rrule-freq rrule) 'YEARLY))
+ (should (equal (ical:rrule-by* 'BYMONTH rrule) (list 10 11 12)))
+ (should (equal (ical:rrule-by* 'BYMONTHDAY rrule) (list 22)))
(should (equal summary "Rake leaves"))))
(dit:parse-test
diff --git a/test/lisp/calendar/icalendar-parser-tests.el b/test/lisp/calendar/icalendar-parser-tests.el
index f3c5de35c87..8215f977e26 100644
--- a/test/lisp/calendar/icalendar-parser-tests.el
+++ b/test/lisp/calendar/icalendar-parser-tests.el
@@ -388,21 +388,21 @@ test."
(ipt:parse/print-test
"FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"
-:type icalendar-recur
+:type icalendar-rrule-value
:parser icalendar-parse-value-node
:printer icalendar-print-value-node
:source rfc5545-sec3.3.10/1)
(ipt:parse/print-test
"FREQ=YEARLY;INTERVAL=2;BYMONTH=1;BYDAY=SU;BYHOUR=8,9;BYMINUTE=30"
-:type icalendar-recur
+:type icalendar-rrule-value
:parser icalendar-parse-value-node
:printer icalendar-print-value-node
:source rfc5545-sec3.3.10/2)
(ipt:parse/print-test
"FREQ=DAILY;COUNT=10;INTERVAL=2"
-:type icalendar-recur
+:type icalendar-rrule-value
:parser icalendar-parse-value-node
:printer icalendar-print-value-node
:source rfc5545-sec3.3.10/3)
diff --git a/test/lisp/calendar/icalendar-recur-tests.el b/test/lisp/calendar/icalendar-recur-tests.el
index c1f7bb90974..199d6c4aa25 100644
--- a/test/lisp/calendar/icalendar-recur-tests.el
+++ b/test/lisp/calendar/icalendar-recur-tests.el
@@ -1383,7 +1383,7 @@ END:VTIMEZONE
(ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
(should (eq 'ical:daylight (ical:ast-node-type obs)))
(should (equal dt onset))
- (should (equal end (ical:recur-until
+ (should (equal end (ical:rrule-until
(ical:with-property-of obs 'ical:rrule nil value))))
(should (equal obs/onset ts-obs/onset)))
@@ -1534,10 +1534,10 @@ SOURCE should be a symbol; it is used to name the test."
,(format "Parse and evaluate recur-value example from `%s':\n%s"
source doc)
:tags ,tags
- (let* ((parsed (ical:parse-from-string 'ical:recur ,recur-string))
+ (let* ((parsed (ical:parse-from-string 'ical:rrule-value ,recur-string))
(recvalue (ical:ast-node-value parsed))
- (until (ical:recur-until recvalue))
- (count (ical:recur-count recvalue))
+ (until (ical:rrule-until recvalue))
+ (count (ical:rrule-count recvalue))
(dtstart ,dtstart)
(tzid
(when (cl-typep dtstart 'ical:date-time)