Merge branch 'master' into feature/igcfeature/igc

102 files changed, 7258 insertions, 232 deletions

diff --git a/test/lisp/align-tests.el b/test/lisp/align-tests.el
index 92605a7f4aa..43660f8de87 100644
--- a/test/lisp/align-tests.el
+++ b/test/lisp/align-tests.el
@@ -36,6 +36,53 @@
   (ert-test-erts-file (ert-resource-file "c-mode.erts")
                       (test-align-transform-fun #'c-mode)))
 
+(ert-deftest align-c-multi-section ()
+  "Test alignment of multiple sections in C code.
+Regression test for bug where positions become stale after earlier
+sections are aligned, causing incorrect alignment in later sections."
+  (let ((input "int main(void)
+{
+  long signed int foo = 5;
+  int bar = 7;
+  {
+    int a1 = 4;
+    int b1 = 2;
+    long signed int junk1 = 2;
+  }
+  {
+    int a2 = 4; /* comment */
+    int b2 = 2;
+    long signed int junk2 = 2; /* another comment */
+  }
+
+  return 0;
+}
+")
+        (expected "int main(void)
+{
+  long signed int foo = 5;
+  int             bar = 7;
+  {
+    int             a1    = 4;
+    int             b1    = 2;
+    long signed int junk1 = 2;
+  }
+  {
+    int             a2    = 4;  /* comment */
+    int             b2    = 2;
+    long signed int junk2 = 2;  /* another comment */
+  }
+
+  return 0;
+}
+"))
+    (with-temp-buffer
+      (c-mode)
+      (setq indent-tabs-mode nil)
+      (insert input)
+      (align (point-min) (point-max))
+      (should (equal (buffer-string) expected)))))
+
 (ert-deftest align-css ()
   (let ((indent-tabs-mode nil))
     (ert-test-erts-file (ert-resource-file "css-mode.erts")
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-american
new file mode 100644
index 00000000000..3f810d31f3b
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-american
@@ -0,0 +1,8 @@
+&5/15/2012 15:00-15:30 Query
+ Location: phone
+ Status: confirmed
+ Organizer: A. Luser <a.luser@foo.com>
+ Attendee: Luser, Other <other.luser@foo.com> (needs-action)
+ Access: public
+ UID: 040000008200E00074C5B7101A82E0080000000020FFAED0CFEFCC01000000000000000010000000575268034ECDB649A15349B1BF240F15
+ Description: Whassup?
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-european
new file mode 100644
index 00000000000..0555ea90364
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-european
@@ -0,0 +1,8 @@
+&15/5/2012 15:00-15:30 Query
+ Location: phone
+ Status: confirmed
+ Organizer: A. Luser <a.luser@foo.com>
+ Attendee: Luser, Other <other.luser@foo.com> (needs-action)
+ Access: public
+ UID: 040000008200E00074C5B7101A82E0080000000020FFAED0CFEFCC01000000000000000010000000575268034ECDB649A15349B1BF240F15
+ Description: Whassup?
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-iso
new file mode 100644
index 00000000000..0e3a3fb8715
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-11473.diary-iso
@@ -0,0 +1,8 @@
+&2012/5/15 15:00-15:30 Query
+ Location: phone
+ Status: confirmed
+ Organizer: A. Luser <a.luser@foo.com>
+ Attendee: Luser, Other <other.luser@foo.com> (needs-action)
+ Access: public
+ UID: 040000008200E00074C5B7101A82E0080000000020FFAED0CFEFCC01000000000000000010000000575268034ECDB649A15349B1BF240F15
+ Description: Whassup?
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-american
new file mode 100644
index 00000000000..d7866ddb899
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-american
@@ -0,0 +1,6 @@
+&12/8/2014 18:30-22:55 Norwegian til Tromsoe-Langnes -
+ Location: Stavanger-Sola
+ Category: Appointment
+ Access: public
+ UID: RFCALITEM1
+ Description: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-european
new file mode 100644
index 00000000000..ce9933aa5f8
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-european
@@ -0,0 +1,6 @@
+&8/12/2014 18:30-22:55 Norwegian til Tromsoe-Langnes -
+ Location: Stavanger-Sola
+ Category: Appointment
+ Access: public
+ UID: RFCALITEM1
+ Description: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-iso
new file mode 100644
index 00000000000..9c45f848e76
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-22092.diary-iso
@@ -0,0 +1,6 @@
+&2014/12/8 18:30-22:55 Norwegian til Tromsoe-Langnes -
+ Location: Stavanger-Sola
+ Category: Appointment
+ Access: public
+ UID: RFCALITEM1
+ Description: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-24199.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-bug-24199.diary-all
new file mode 100644
index 00000000000..cf3e5884710
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-24199.diary-all
@@ -0,0 +1,11 @@
+&%%(diary-rrule :rule '((FREQ MONTHLY) (BYDAY ((3 . 1))) (INTERVAL 1))
+             :exclude
+             '((0 46 11 6 1 2016 3 -1 0) (0 46 11 3 2 2016 3 -1 0)
+               (0 46 11 2 3 2016 3 -1 0) (0 46 10 4 5 2016 3 -1 0)
+               (0 46 10 1 6 2016 3 -1 0))
+             :start '(0 46 12 2 12 2015 3 -1 nil) :duration
+             '(0 14 3 0 nil nil nil -1 nil)) Summary
+ Location: Loc
+ Access: private
+ UID: 9188710a-08a7-4061-bae3-d4cf4972599a
+ Description: Desc
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-american
new file mode 100644
index 00000000000..c546fa9a97c
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-american
@@ -0,0 +1 @@
+&11/5/2018 21:00 event with same start/end time
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-european
new file mode 100644
index 00000000000..28e53960536
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-european
@@ -0,0 +1 @@
+&5/11/2018 21:00 event with same start/end time
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-iso
new file mode 100644
index 00000000000..faa7aeafeb5
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-33277.diary-iso
@@ -0,0 +1 @@
+&2018/11/5 21:00 event with same start/end time
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-bug-6766.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-bug-6766.diary-all
new file mode 100644
index 00000000000..4e1b69158c9
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-bug-6766.diary-all
@@ -0,0 +1,12 @@
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 1) (BYDAY (1 3 4 5)))
+             :start '(0 30 11 21 4 2010 3 -1 nil) :duration
+             '(0 30 0 0 nil nil nil -1 nil)) Scrum
+ Status: confirmed
+ Access: public
+ UID: 8814e3f9-7482-408f-996c-3bfe486a1262
+
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 1) (BYDAY (2 4))) :start
+             '(4 22 2010) :duration
+             '(nil nil nil 1 nil nil nil -1 nil)) Tues + Thurs thinking
+ Access: public
+ UID: 8814e3f9-7482-408f-996c-3bfe486a1263
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-duration-2.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-duration-2.diary-all
new file mode 100644
index 00000000000..5d018c1cb6e
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-duration-2.diary-all
@@ -0,0 +1,5 @@
+&%%(diary-rrule :rule
+             '((FREQ DAILY) (UNTIL (12 29 2001)) (INTERVAL 1) (WKST 0))
+             :start '(12 21 2001)) Urlaub
+ Access: public
+ UID: 20041127T183329Z-18215-1001-4536-49109@andromeda
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-american
new file mode 100644
index 00000000000..b44b4aed72c
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-american
@@ -0,0 +1 @@
+&%%(diary-block 2 17 2005 2 23 2005) duration
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-european
new file mode 100644
index 00000000000..caee11e0a38
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-european
@@ -0,0 +1 @@
+&%%(diary-block 17 2 2005 23 2 2005) duration
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-iso
new file mode 100644
index 00000000000..573121644d5
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-duration.diary-iso
@@ -0,0 +1 @@
+&%%(diary-block 2005 2 17 2005 2 23) duration
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-legacy-function.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-legacy-function.diary-all
new file mode 100644
index 00000000000..e0d27f4d1b0
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-legacy-function.diary-all
@@ -0,0 +1,10 @@
+ SUMMARY: Testing legacy `icalendar-import-format' function
+ DESCRIPTION: described
+ CLASS: private
+ LOCATION: somewhere
+ ORGANIZER: mailto:baz@example.com
+ STATUS: CONFIRMED
+ URL: http://example.com/foo/baz
+ UID: some-unique-id-here
+ DTSTART: 20250919T090000
+ DTEND: 20250919T113000
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-american
new file mode 100644
index 00000000000..42076a32138
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-american
@@ -0,0 +1,8 @@
+9/19/2025 09:00-11:30 Testing legacy `icalendar-import-format*' vars
+ CLASS=private
+ DESCRIPTION=described
+ LOCATION=somewhere
+ ORGANIZER=mailto:baz@example.com
+ STATUS=confirmed
+ URL=http://example.com/foo/baz
+ UID=some-unique-id-here
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-european
new file mode 100644
index 00000000000..699c627e2f9
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-european
@@ -0,0 +1,8 @@
+19/9/2025 09:00-11:30 Testing legacy `icalendar-import-format*' vars
+ CLASS=private
+ DESCRIPTION=described
+ LOCATION=somewhere
+ ORGANIZER=mailto:baz@example.com
+ STATUS=confirmed
+ URL=http://example.com/foo/baz
+ UID=some-unique-id-here
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-iso
new file mode 100644
index 00000000000..f6d69805c19
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-legacy-vars.diary-iso
@@ -0,0 +1,8 @@
+2025/9/19 09:00-11:30 Testing legacy `icalendar-import-format*' vars
+ CLASS=private
+ DESCRIPTION=described
+ LOCATION=somewhere
+ ORGANIZER=mailto:baz@example.com
+ STATUS=confirmed
+ URL=http://example.com/foo/baz
+ UID=some-unique-id-here
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-american
new file mode 100644
index 00000000000..ef28f1abfc1
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-american
@@ -0,0 +1,7 @@
+&7/23/2011 event-1
+
+&7/24/2011 event-2
+
+&7/25/2011 event-3a
+
+&7/25/2011 event-3b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-european
new file mode 100644
index 00000000000..db9625f390d
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-european
@@ -0,0 +1,7 @@
+&23/7/2011 event-1
+
+&24/7/2011 event-2
+
+&25/7/2011 event-3a
+
+&25/7/2011 event-3b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-iso
new file mode 100644
index 00000000000..bbe009c200e
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-multiple-vcalendars.diary-iso
@@ -0,0 +1,7 @@
+&2011/7/23 event-1
+
+&2011/7/24 event-2
+
+&2011/7/25 event-3a
+
+&2011/7/25 event-3b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-american
new file mode 100644
index 00000000000..780e3a8ce64
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-american
@@ -0,0 +1 @@
+&9/19/2003 09:00-11:30 non-recurring
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-european
new file mode 100644
index 00000000000..7e0cd21b784
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-european
@@ -0,0 +1 @@
+&19/9/2003 09:00-11:30 non-recurring
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-iso
new file mode 100644
index 00000000000..c7311286619
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-1.diary-iso
@@ -0,0 +1 @@
+&2003/9/19 09:00-11:30 non-recurring
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-american
new file mode 100644
index 00000000000..1d4bb6a337e
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-american
@@ -0,0 +1 @@
+&9/19/2003 non-recurring allday
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-european
new file mode 100644
index 00000000000..b56c7f4e17f
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-european
@@ -0,0 +1 @@
+&19/9/2003 non-recurring allday
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-iso
new file mode 100644
index 00000000000..f1c70ab34c3
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-all-day.diary-iso
@@ -0,0 +1 @@
+&2003/9/19 non-recurring allday
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-american
new file mode 100644
index 00000000000..847e7cf6cab
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-american
@@ -0,0 +1,4 @@
+&11/23/2004 14:45-15:45 another example
+ Status: tentative
+ Access: private
+ UID: 6161a312-3902-11d9-b512-f764153bb28b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-european
new file mode 100644
index 00000000000..5c70e58f4d0
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-european
@@ -0,0 +1,4 @@
+&23/11/2004 14:45-15:45 another example
+ Status: tentative
+ Access: private
+ UID: 6161a312-3902-11d9-b512-f764153bb28b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-iso
new file mode 100644
index 00000000000..d663965404b
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-another-example.diary-iso
@@ -0,0 +1,4 @@
+&2004/11/23 14:45-15:45 another example
+ Status: tentative
+ Access: private
+ UID: 6161a312-3902-11d9-b512-f764153bb28b
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-american
new file mode 100644
index 00000000000..c795ebf2abc
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-american
@@ -0,0 +1,4 @@
+&%%(diary-block 7 19 2004 8 27 2004) Sommerferien
+ Status: tentative
+ Access: private
+ UID: 748f2da0-0d9b-11d8-97af-b4ec8686ea61
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-european
new file mode 100644
index 00000000000..4d6b71600a8
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-european
@@ -0,0 +1,4 @@
+&%%(diary-block 19 7 2004 27 8 2004) Sommerferien
+ Status: tentative
+ Access: private
+ UID: 748f2da0-0d9b-11d8-97af-b4ec8686ea61
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-iso
new file mode 100644
index 00000000000..f6d23b049ed
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-block.diary-iso
@@ -0,0 +1,4 @@
+&%%(diary-block 2004 7 19 2004 8 27) Sommerferien
+ Status: tentative
+ Access: private
+ UID: 748f2da0-0d9b-11d8-97af-b4ec8686ea61
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-american
new file mode 100644
index 00000000000..a86f560fb08
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-american
@@ -0,0 +1,4 @@
+&11/23/2004 14:00-14:30 folded summary
+ Status: tentative
+ Access: private
+ UID: 04979712-3902-11d9-93dd-8f9f4afe08da
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-european
new file mode 100644
index 00000000000..0c5e640a615
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-european
@@ -0,0 +1,4 @@
+&23/11/2004 14:00-14:30 folded summary
+ Status: tentative
+ Access: private
+ UID: 04979712-3902-11d9-93dd-8f9f4afe08da
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-iso
new file mode 100644
index 00000000000..699358dc504
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-folded-summary.diary-iso
@@ -0,0 +1,4 @@
+&2004/11/23 14:00-14:30 folded summary
+ Status: tentative
+ Access: private
+ UID: 04979712-3902-11d9-93dd-8f9f4afe08da
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-american
new file mode 100644
index 00000000000..84cd464c568
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-american
@@ -0,0 +1 @@
+&9/19/2003 long summary
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-european
new file mode 100644
index 00000000000..5d6524202c3
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-european
@@ -0,0 +1 @@
+&19/9/2003 long summary
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-iso
new file mode 100644
index 00000000000..d2300522d9a
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-non-recurring-long-summary.diary-iso
@@ -0,0 +1 @@
+&2003/9/19 long summary
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-american
new file mode 100644
index 00000000000..53711dc68ed
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-american
@@ -0,0 +1,10 @@
+&5/9/2003 10:30-15:30 On-Site Interview
+ Location: Cccc
+ Status: confirmed
+ Organizer: Aaaaaa Aaaaa <aaaaaaa@aaaaaaa.com>
+ Attendees:
+   Xxxxxxxx Xxxxxxxxxxxx <xxxxxxxx@xxxxxxx.com> (needs-action)
+   Yyyyyyy Yyyyy <yyyyyyy@yyyyyyy.com> (needs-action)
+   Zzzz Zzzzzz <zzzzzz@zzzzzzz.com> (needs-action)
+ UID: 040000008200E00074C5B7101A82E0080000000080B6DE661216C301000000000000000010000000DB823520692542408ED02D7023F9DFF9
+ Description: 10:30am - Blah
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-european
new file mode 100644
index 00000000000..17efbd64c18
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-05-29.diary-european
@@ -0,0 +1,10 @@
+&9/5/2003 10:30-15:30 On-Site Interview
+ Location: Cccc
+ Status: confirmed
+ Organizer: Aaaaaa Aaaaa <aaaaaaa@aaaaaaa.com>
+ Attendees:
+   Xxxxxxxx Xxxxxxxxxxxx <xxxxxxxx@xxxxxxx.com> (needs-action)
+   Yyyyyyy Yyyyy <yyyyyyy@yyyyyyy.com> (needs-action)
+   Zzzz Zzzzzz <zzzzzz@zzzzzzz.com> (needs-action)
+ UID: 040000008200E00074C5B7101A82E0080000000080B6DE661216C301000000000000000010000000DB823520692542408ED02D7023F9DFF9
+ Description: 10:30am - Blah
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-american
new file mode 100644
index 00000000000..1b819404abf
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-american
@@ -0,0 +1,8 @@
+&6/23/2003 11:00-12:00 Dress Rehearsal for XXXX-XXXX
+ Location: 555 or TN 555-5555 ID 5555 & NochWas (see below)
+ Status: confirmed
+ Organizer: ABCD,TECHTRAINING(A-Americas,exgen1) <xxx@xxxxx.com>
+ Attendee:
+   AAAAA,AAAAA (A-AAAAAAA,ex1) <aaaaa_aaaaa@aaaaa.com> (needs-action)
+ UID: 040000008200E00074C5B7101A82E00800000000608AA7DA9835C3010000000000000000100000007C3A6D65EE726E40B7F3D69A23BD567E
+ Description: 753 Zeichen hier radiert
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-european
new file mode 100644
index 00000000000..379c612419f
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18a.diary-european
@@ -0,0 +1,8 @@
+&23/6/2003 11:00-12:00 Dress Rehearsal for XXXX-XXXX
+ Location: 555 or TN 555-5555 ID 5555 & NochWas (see below)
+ Status: confirmed
+ Organizer: ABCD,TECHTRAINING(A-Americas,exgen1) <xxx@xxxxx.com>
+ Attendee:
+   AAAAA,AAAAA (A-AAAAAAA,ex1) <aaaaa_aaaaa@aaaaa.com> (needs-action)
+ UID: 040000008200E00074C5B7101A82E00800000000608AA7DA9835C3010000000000000000100000007C3A6D65EE726E40B7F3D69A23BD567E
+ Description: 753 Zeichen hier radiert
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-american
new file mode 100644
index 00000000000..0e34b5d7fa9
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-american
@@ -0,0 +1,6 @@
+&6/23/2003 17:00-18:00 Updated: Dress Rehearsal for ABC01-15
+ Desc: Viele Zeichen standen hier früher
+ Location: 123 or TN 123-1234 ID abcd & SonstWo (see below)
+ Organizer: MAILTO:bbb@bbbbb.com
+ Status: CONFIRMED
+ UID: 040000008200E00074C5B7101A82E00800000000608AA7DA9835C3010000000000000000100000007C3A6D65EE726E40B7F3D69A23BD567E
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-european
new file mode 100644
index 00000000000..e6151c78dce
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2003-06-18b.diary-european
@@ -0,0 +1,5 @@
+&23/6/2003 09:00-10:00 Updated: Dress Rehearsal for ABC01-15
+ Location: 123 or TN 123-1234 ID abcd & SonstWo (see below)
+ Status: confirmed
+ UID: 040000008200E00074C5B7101A82E00800000000608AA7DA9835C3010000000000000000100000007C3A6D65EE726E40B7F3D69A23BD567E
+ Description: Viele Zeichen standen hier früher
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-american
new file mode 100644
index 00000000000..17dff899314
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-american
@@ -0,0 +1,28 @@
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 1) (BYDAY (1))) :start
+             '(11 1 2004) :duration
+             '(nil nil nil 1 nil nil nil -1 nil)) Wwww aa hhhh
+ Status: tentative
+ Access: private
+
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 2) (BYDAY (5))) :start
+             '(0 0 14 12 11 2004 5 -1 nil) :duration
+             '(0 30 4 0 nil nil nil -1 nil)) MMM Aaaaaaaaa
+ Status: tentative
+ Access: private
+
+&%%(diary-block 11 19 2004 11 19 2004) Rrrr/Cccccc ii Aaaaaaaa
+ Status: tentative
+ Access: private
+ Description: Vvvvv Rrrr aaa Cccccc
+
+&11/23/2004 11:00-12:00 Hhhhhhhh
+ Status: tentative
+ Access: private
+
+&11/23/2004 14:00-14:30 Jjjjj & Wwwww
+ Status: tentative
+ Access: private
+
+&11/23/2004 14:45-15:45 BB Aaaaaaaa Bbbbb
+ Status: tentative
+ Access: private
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-european
new file mode 100644
index 00000000000..cfd3a43d55c
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2004-11-19.diary-european
@@ -0,0 +1,28 @@
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 1) (BYDAY (1))) :start
+             '(11 1 2004) :duration
+             '(nil nil nil 1 nil nil nil -1 nil)) Wwww aa hhhh
+ Status: tentative
+ Access: private
+
+&%%(diary-rrule :rule '((FREQ WEEKLY) (INTERVAL 2) (BYDAY (5))) :start
+             '(0 0 14 12 11 2004 5 -1 nil) :duration
+             '(0 30 4 0 nil nil nil -1 nil)) MMM Aaaaaaaaa
+ Status: tentative
+ Access: private
+
+&%%(diary-block 19 11 2004 19 11 2004) Rrrr/Cccccc ii Aaaaaaaa
+ Status: tentative
+ Access: private
+ Description: Vvvvv Rrrr aaa Cccccc
+
+&23/11/2004 11:00-12:00 Hhhhhhhh
+ Status: tentative
+ Access: private
+
+&23/11/2004 14:00-14:30 Jjjjj & Wwwww
+ Status: tentative
+ Access: private
+
+&23/11/2004 14:45-15:45 BB Aaaaaaaa Bbbbb
+ Status: tentative
+ Access: private
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-american
new file mode 100644
index 00000000000..f7518918f30
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-american
@@ -0,0 +1,6 @@
+&%%(diary-block 2 6 2005 2 6 2005) Waitangi Day
+ Status: confirmed
+ Category: Public Holiday
+ Access: private
+ UID: b60d398e-1dd1-11b2-a159-cf8cb05139f4
+ Description: abcdef
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-european
new file mode 100644
index 00000000000..c65526a5551
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-02-07.diary-european
@@ -0,0 +1,6 @@
+&%%(diary-block 6 2 2005 6 2 2005) Waitangi Day
+ Status: confirmed
+ Category: Public Holiday
+ Access: private
+ UID: b60d398e-1dd1-11b2-a159-cf8cb05139f4
+ Description: abcdef
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-american
new file mode 100644
index 00000000000..9290254f1ce
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-american
@@ -0,0 +1,2 @@
+&%%(diary-block 2 17 2005 2 23 2005) Hhhhhh Aaaaa ii Aaaaaaaa
+ UID: 6AFA7558-6994-11D9-8A3A-000A95A0E830-RID
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-european
new file mode 100644
index 00000000000..61cbbc726d3
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-2005-03-01.diary-european
@@ -0,0 +1,2 @@
+&%%(diary-block 17 2 2005 23 2 2005) Hhhhhh Aaaaa ii Aaaaaaaa
+ UID: 6AFA7558-6994-11D9-8A3A-000A95A0E830-RID
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-american
new file mode 100644
index 00000000000..6c1d6667e63
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-american
@@ -0,0 +1,4 @@
+&11/16/2014 07:00-08:00 NoDST
+ Location: Everywhere
+ UID: 20141116T171439Z-678877132@marudot.com
+ Description: Test event from timezone without DST
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-european
new file mode 100644
index 00000000000..b710b4c61e5
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-real-world-no-dst.diary-european
@@ -0,0 +1,4 @@
+&16/11/2014 07:00-08:00 NoDST
+ Location: Everywhere
+ UID: 20141116T171439Z-678877132@marudot.com
+ Description: Test event from timezone without DST
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-anniversary.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-anniversary.diary-all
new file mode 100644
index 00000000000..ce87095c080
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-anniversary.diary-all
@@ -0,0 +1 @@
+&%%(diary-rrule :rule '((FREQ YEARLY)) :start '(8 15 2004)) Maria Himmelfahrt
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-bi-weekly.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-bi-weekly.diary-all
new file mode 100644
index 00000000000..9c5cb38ddb8
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-bi-weekly.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ WEEKLY) (COUNT 3) (INTERVAL 2)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count bi-weekly 3 times
\ No newline at end of file
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-long.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-long.diary-all
new file mode 100644
index 00000000000..3b7b4532506
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-long.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ DAILY) (COUNT 14) (INTERVAL 1)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count daily long
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-short.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-short.diary-all
new file mode 100644
index 00000000000..08051f0d015
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-daily-short.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ DAILY) (COUNT 1) (INTERVAL 1)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count daily short
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-month.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-month.diary-all
new file mode 100644
index 00000000000..e5063cfed3b
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-month.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ MONTHLY) (INTERVAL 2) (COUNT 5)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count every second month
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-year.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-year.diary-all
new file mode 100644
index 00000000000..74fbc93986c
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-every-second-year.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ YEARLY) (INTERVAL 2) (COUNT 5)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count every second year
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-monthly.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-monthly.diary-all
new file mode 100644
index 00000000000..af145bbdee9
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-monthly.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ MONTHLY) (INTERVAL 1) (COUNT 5)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count monthly
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-yearly.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-yearly.diary-all
new file mode 100644
index 00000000000..5b78f608f12
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-count-yearly.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ YEARLY) (INTERVAL 1) (COUNT 5)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule count yearly
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-two-day.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-two-day.diary-all
new file mode 100644
index 00000000000..9017c06900b
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-two-day.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ DAILY) (INTERVAL 2)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule daily
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-with-exceptions.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-with-exceptions.diary-all
new file mode 100644
index 00000000000..0407aa81b21
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily-with-exceptions.diary-all
@@ -0,0 +1,4 @@
+&%%(diary-rrule :rule '((FREQ DAILY) (INTERVAL 2)) :exclude
+             '((9 21 2003) (9 25 2003)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule daily with exceptions
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily.diary-all
new file mode 100644
index 00000000000..993d3b9bb5e
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-daily.diary-all
@@ -0,0 +1,2 @@
+&%%(diary-rrule :rule '((FREQ DAILY)) :start '(0 0 9 19 9 2003 5 -1 nil)
+             :duration '(0 30 2 0 nil nil nil -1 nil)) rrule daily
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-no-end.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-no-end.diary-all
new file mode 100644
index 00000000000..e69a6ec690c
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-no-end.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ MONTHLY)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule monthly no end
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-with-end.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-with-end.diary-all
new file mode 100644
index 00000000000..a699498be77
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-monthly-with-end.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ MONTHLY) (UNTIL (8 19 2005))) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule monthly with end
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-weekly.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-weekly.diary-all
new file mode 100644
index 00000000000..89ba3e96149
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-weekly.diary-all
@@ -0,0 +1,2 @@
+&%%(diary-rrule :rule '((FREQ WEEKLY)) :start '(0 0 9 19 9 2003 5 -1 nil)
+             :duration '(0 30 2 0 nil nil nil -1 nil)) rrule weekly
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-rrule-yearly.diary-all b/test/lisp/calendar/diary-icalendar-resources/import-rrule-yearly.diary-all
new file mode 100644
index 00000000000..81220aac0cd
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-rrule-yearly.diary-all
@@ -0,0 +1,3 @@
+&%%(diary-rrule :rule '((FREQ YEARLY) (INTERVAL 2)) :start
+             '(0 0 9 19 9 2003 5 -1 nil) :duration
+             '(0 30 2 0 nil nil nil -1 nil)) rrule yearly
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-time-format-12hr-blank.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-time-format-12hr-blank.diary-iso
new file mode 100644
index 00000000000..0945cfc0b60
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-time-format-12hr-blank.diary-iso
@@ -0,0 +1 @@
+&2003/9/19  9.00h-11.30h 12hr blank-padded
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-with-attachment.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-with-attachment.diary-iso
new file mode 100644
index 00000000000..b16022908d9
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-with-attachment.diary-iso
@@ -0,0 +1,3 @@
+&2003/9/19 09:00 Has an attachment
+ Attachment: R3Jl.plain
+ UID: f9fee9a0-1231-4984-9078-f1357db352db
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-with-timezone.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-with-timezone.diary-iso
new file mode 100644
index 00000000000..56f91066f73
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-with-timezone.diary-iso
@@ -0,0 +1,3 @@
+&2012/1/15 15:00-15:30 standardtime
+
+&2012/12/15 11:00-11:30 daylightsavingtime
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-american b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-american
new file mode 100644
index 00000000000..9b2f06afc26
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-american
@@ -0,0 +1,2 @@
+&9/19/2003 09:00-11:30 non-recurring
+ UID: 1234567890uid
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-european b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-european
new file mode 100644
index 00000000000..95db4d40151
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-european
@@ -0,0 +1,2 @@
+&19/9/2003 09:00-11:30 non-recurring
+ UID: 1234567890uid
diff --git a/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-iso b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-iso
new file mode 100644
index 00000000000..d372e5a3d1f
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-resources/import-with-uid.diary-iso
@@ -0,0 +1,2 @@
+&2003/9/19 09:00-11:30 non-recurring
+ UID: 1234567890uid
diff --git a/test/lisp/calendar/diary-icalendar-tests.el b/test/lisp/calendar/diary-icalendar-tests.el
new file mode 100644
index 00000000000..b502dc72059
--- /dev/null
+++ b/test/lisp/calendar/diary-icalendar-tests.el
@@ -0,0 +1,1278 @@
+;;; diary-icalendar-tests.el --- Tests for diary-icalendar -*- lexical-binding: t; -*-
+;; Copyright (C) 2025 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'icalendar-macs))
+(require 'diary-icalendar)
+(require 'icalendar-parser)
+(require 'icalendar-utils)
+(require 'icalendar)
+(require 'ert)
+(require 'ert-x)
+(require 'seq)
+
+
+;; Tests for diary import functions
+(defconst icalendar-resources-directory
+  (expand-file-name "test/lisp/calendar/icalendar-resources"
+                    source-directory))
+
+(defconst diary-icalendar-resources-directory
+  (expand-file-name "test/lisp/calendar/diary-icalendar-resources"
+                    source-directory))
+
+(defun dit:icalendar-resource-file (filename)
+  ;; Return a filename from the ./icalendar-resources directory:
+  (file-name-concat icalendar-resources-directory filename))
+
+(defun dit:resource-file (filename)
+  ;; Return a filename from the ./diary-icalendar-resources directory:
+  (file-name-concat diary-icalendar-resources-directory filename))
+
+(defun dit:file-contents (filename)
+  "Return literal contents of FILENAME."
+  (with-temp-buffer
+    (let ((coding-system-for-read 'raw-text)
+          (inhibit-eol-conversion t))
+      (insert-file-contents-literally filename)
+      (buffer-string))))
+
+(defmacro dit:with-tz (tz &rest body)
+  "Evaluate BODY with time zone TZ in effect."
+  `(let ((old-tz (getenv "TZ")))
+     (unwind-protect
+         (progn
+           (setenv "TZ" ,tz)
+           ,@body)
+       (setenv "TZ" old-tz))))
+
+(defun dit:import-file (ics-file)
+  "Test diary import of ICS-FILE.
+
+ICS-FILE names a .ics file in icalendar-resources directory.  The
+calendar in ICS-FILE is parsed and imported in ISO, European, and
+American date styles.  The output of each import is compared against the
+contents of any diary files with the same base name as ICS-FILE and
+extensions \".diary-all\", \".diary-american\", \".diary-european\", or
+\".diary-iso\"."
+  (let* ((basename (file-name-base ics-file))
+         (ics-file (dit:icalendar-resource-file ics-file))
+         (import-buffer (icalendar-unfolded-buffer-from-file ics-file))
+         (all-file (dit:resource-file (concat basename ".diary-all")))
+         (iso-file (dit:resource-file (concat basename ".diary-iso")))
+         (european-file (dit:resource-file (concat basename ".diary-european")))
+         (american-file (dit:resource-file (concat basename ".diary-american"))))
+    (with-current-buffer import-buffer
+      (when (file-exists-p all-file)
+        (calendar-set-date-style 'american) ; because it's the default
+        (dit:-do-test-import all-file))
+      (when (file-exists-p iso-file)
+        (calendar-set-date-style 'iso)
+        (dit:-do-test-import iso-file))
+      (when (file-exists-p european-file)
+        (calendar-set-date-style 'european)
+        (dit:-do-test-import european-file))
+      (when (file-exists-p american-file)
+        (calendar-set-date-style 'american)
+        (dit:-do-test-import american-file))
+      (set-buffer-modified-p nil)) ; so we can kill it without being asked
+    (kill-buffer import-buffer)))
+
+(defun dit:-do-test-import (diary-filename)
+  "Import iCalendar in current buffer and compare the result with DIARY-FILENAME."
+  (ert-with-temp-file temp-file
+    :suffix "icalendar-test-diary"
+    (dit:with-tz "Europe/Vienna"
+      ;; There's no way to make the test data independent of the system
+      ;; time zone unless diary gains time zone awareness/syntax, so we have
+      ;; to choose some time zone or other to standardize on for the import
+      ;; tests.  "Europe/Vienna" is an arbitrary choice; it's simply the one
+      ;; I originally generated the test data files in.
+      ;; N.B.  "Europe/Vienna" = "CET-1CEST,M3.5.0/02:00,M10.5.0/03:00"
+      (di:import-buffer temp-file t t))
+    (save-excursion
+      (find-file temp-file)
+      (let ((result (buffer-substring-no-properties (point-min) (point-max)))
+            (expected (dit:file-contents diary-filename)))
+        ;; Trim the result so that whitespace produced by the importer
+        ;; need not be committed in the test data files:
+        (should (equal (string-trim result)
+                       (string-trim expected)))
+        ;; This is useful for debugging differences when tests are failing:
+        ;; (unless (equal (string-trim result)
+        ;;                (string-trim expected))
+        ;;   (let ((result-buf (current-buffer))
+        ;;         (diary-buf (find-file diary-filename)))
+        ;;     (ediff-buffers result-buf ; actual output
+        ;;                    diary-buf)
+        ;;     (switch-to-buffer-other-frame "*Ediff Control Panel*")
+        ;;     (error "Unexpected result; see ediff")))
+          ))
+    (kill-buffer (find-buffer-visiting temp-file))))
+
+(ert-deftest dit:import-non-recurring ()
+  "Import tests for standard, non-recurring events."
+  (dit:import-file "import-non-recurring-1.ics")
+  (dit:import-file "import-non-recurring-all-day.ics")
+  (dit:import-file "import-non-recurring-long-summary.ics")
+  (dit:import-file "import-non-recurring-block.ics")
+  (dit:import-file "import-non-recurring-folded-summary.ics")
+  (dit:import-file "import-non-recurring-another-example.ics"))
+
+(ert-deftest dit:import-w/legacy-vars ()
+  "Import tests using legacy import variables"
+  (let ((icalendar-import-format "%s%c%d%l%o%t%u%U")
+        (icalendar-import-format-summary "%s")
+        (icalendar-import-format-class "\n CLASS=%s")
+        (icalendar-import-format-description "\n DESCRIPTION=%s")
+        (icalendar-import-format-location "\n LOCATION=%s")
+        (icalendar-import-format-organizer "\n ORGANIZER=%s")
+        (icalendar-import-format-status "\n STATUS=%s")
+        (icalendar-import-format-url "\n URL=%s")
+        (icalendar-import-format-uid "\n UID=%s"))
+    (dit:import-file "import-legacy-vars.ics")))
+
+(defun dit:legacy-import-function (vevent)
+  "Example function value for `icalendar-import-format'"
+  (let ((props (nth 2 (car vevent))))
+    (mapconcat
+     (lambda (prop)
+       (format " %s: %s\n"
+               (symbol-name (nth 0 prop))
+               (nth 2 prop)))
+     props)))
+
+(ert-deftest dit:import-w/legacy-function ()
+  "Import tests using legacy import variables"
+  (let ((icalendar-import-format 'dit:legacy-import-function))
+    (dit:import-file "import-legacy-function.ics")))
+
+(ert-deftest dit:import-w/time-format ()
+  "Import tests for customized `diary-icalendar-time-format'"
+  (let ((diary-icalendar-time-format "%l.%Mh"))
+    (dit:import-file "import-time-format-12hr-blank.ics")))
+
+(ert-deftest dit:import-rrule ()
+  "Import tests for recurring events."
+  (dit:import-file "import-rrule-daily.ics")
+  (dit:import-file "import-rrule-daily-two-day.ics")
+  (dit:import-file "import-rrule-daily-with-exceptions.ics")
+  (dit:import-file "import-rrule-weekly.ics")
+  (dit:import-file "import-rrule-monthly-no-end.ics")
+  (dit:import-file "import-rrule-monthly-with-end.ics")
+  (dit:import-file "import-rrule-anniversary.ics")
+  (dit:import-file "import-rrule-yearly.ics")
+  (dit:import-file "import-rrule-count-bi-weekly.ics")
+  (dit:import-file "import-rrule-count-daily-short.ics")
+  (dit:import-file "import-rrule-count-daily-long.ics")
+  (dit:import-file "import-rrule-count-monthly.ics")
+  (dit:import-file "import-rrule-count-every-second-month.ics")
+  (dit:import-file "import-rrule-count-yearly.ics")
+  (dit:import-file "import-rrule-count-every-second-year.ics"))
+
+(ert-deftest dit:import-duration ()
+  (dit:import-file "import-duration.ics")
+  ;; duration-2: this is actually an rrule test
+  (dit:import-file "import-duration-2.ics"))
+
+(ert-deftest dit:import-multiple-vcalendars ()
+  (dit:import-file "import-multiple-vcalendars.ics"))
+
+(ert-deftest dit:import-with-uid ()
+  "Perform import test with uid."
+  (dit:import-file "import-with-uid.ics"))
+
+(ert-deftest dit:import-with-attachment ()
+  "Test importing an attached file to `icalendar-attachment-directory'"
+  (ert-with-temp-directory temp-dir
+    (let ((di:attachment-directory temp-dir)
+          (uid-dir (file-name-concat temp-dir
+                                     ;; Event's UID:
+                                     "f9fee9a0-1231-4984-9078-f1357db352db")))
+      (dit:import-file "import-with-attachment.ics")
+      (should (file-directory-p uid-dir))
+      (let ((files (directory-files uid-dir t
+                                    ;; First 4 chars of base64-string:
+                                    "R3Jl")))
+        (should (length= files 1))
+        (with-temp-buffer
+          (insert-file-contents (car files))
+          (should (equal "Greetings! I am a base64-encoded file"
+                         (buffer-string))))))))
+
+(ert-deftest dit:import-with-timezone ()
+  (dit:import-file "import-with-timezone.ics"))
+
+(ert-deftest dit:import-real-world ()
+  "Import tests of other real world data"
+  ;; N.B.  Not all data from these files is expected to be imported
+  ;; without any pre-parsing cleanup, since they are in some cases
+  ;; malformed.  The test data matches what the importer should produce
+  ;; in its default configuration.
+  (dit:with-tz "Asia/Kolkata"
+     ;; Indian Standard Time, used in this file, does not adjust for
+     ;; daylight savings; so we use that time zone to keep this test
+     ;; from failing on systems in a time zone that does:
+     (dit:import-file "import-real-world-2003-05-29.ics"))
+  (dit:with-tz "Asia/Tehran"
+     ;; For the same reason, we use "Asia/Tehran" here:
+     (dit:import-file "import-real-world-no-dst.ics"))
+  (dit:import-file "import-real-world-2003-06-18a.ics")
+  ;; FIXME: this test seems to be failing due to an invisible unicode
+  ;; error of some sort.  The import result and the expected output are
+  ;; visually identical and ediff shows no differences in the buffers,
+  ;; but the strings are apparently not `equal', and comparing them
+  ;; character-by-character shows that they somehow differ at the "ü" in
+  ;; "früher".  But `describe-char' there shows no differences so far as
+  ;; I can see.
+  ;(dit:import-file "import-real-world-2003-06-18b.ics")
+  (dit:import-file "import-real-world-2004-11-19.ics")
+  (dit:import-file "import-real-world-2005-02-07.ics")
+  (dit:import-file "import-real-world-2005-03-01.ics"))
+
+(ert-deftest dit:import-bug-6766 ()
+  ;;bug#6766 -- multiple byday values in a weekly rrule
+  (dit:import-file "import-bug-6766.ics"))
+
+(ert-deftest dit:import-bug-11473 ()
+  ;; bug#11473 -- illegal tzid
+  (dit:import-file "import-bug-11473.ics"))
+
+(ert-deftest dit:import-bug-22092 ()
+  ;; bug#22092 -- mixed line endings
+  (let ((ical:pre-unfolding-hook '(ical:fix-line-endings)))
+    (dit:import-file "import-bug-22092.ics")))
+
+(ert-deftest dit:import-bug-24199 ()
+  ;;bug#24199 -- monthly rule with byday-clause
+  (dit:import-file "import-bug-24199.ics"))
+
+(ert-deftest dit:import-bug-33277 ()
+  ;;bug#33277 -- start time equals end time
+  (dit:import-file "import-bug-33277.ics"))
+
+
+
+
+;; Tests for diary export functions
+(cl-defmacro dit:parse-test (entry &key parser type number
+                                   bindings tests
+                                   source)
+  "Create a test which parses data from ENTRY.
+
+PARSER should be a zero-argument function which parses data of TYPE in a
+buffer containing ENTRY.  The defined test passes if PARSER returns a
+list of NUMBER objects which satisfy TYPE.  If NUMBER is nil, the return
+value of parser must be a single value satisfying TYPE.
+
+BINDINGS, if given, will be evaluated and made available in the lexical
+environment where PARSER is called; this can be used to temporarily set
+variables that affect parsing.
+
+TESTS, if given, is an additional test form that will be evaluated after
+the main tests.  The variable `parsed' will be bound to the return value
+of PARSER when TESTS are evaluated.
+
+SOURCE, if given, should be a symbol; it is used to name the test."
+  (let ((parser-form `(funcall (function ,parser))))
+    `(ert-deftest
+         ,(intern (concat "diary-icalendar-test-"
+                          (string-replace "diary-icalendar-" ""
+                                          (symbol-name parser))
+                          (if source (concat "/" (symbol-name source)) "")))
+         ()
+       ,(format "Does `%s' correctly parse `%s' in diary entries?" parser type)
+       (let* ((parse-buf (get-buffer-create "*iCalendar Parse Test*"))
+              (unparsed ,entry))
+         (set-buffer parse-buf)
+         (erase-buffer)
+         (insert unparsed)
+         (goto-char (point-min))
+         (let* (,@bindings
+               (parsed ,parser-form))
+           (when ,number
+               (should (length= parsed ,number))
+               (should (seq-every-p (lambda (val) (cl-typep val ,type))
+                                    parsed)))
+           (unless ,number
+             (should (cl-typep parsed ,type)))
+           ,tests)))))
+
+(dit:parse-test
+ "2025-04-01 A basic entry
+    Other data"
+:parser di:parse-entry-type
+:type 'symbol
+:source vevent
+:tests (should (eq parsed 'ical:vevent)))
+
+(dit:parse-test
+ "&2025-04-01 A nonmarking journal entry
+     Other data"
+:parser di:parse-entry-type
+:bindings ((di:export-nonmarking-as-vjournal t))
+:type 'symbol
+:source vjournal
+:tests (should (eq parsed 'ical:vjournal)))
+
+(dit:parse-test
+ "2025-04-01 Due: some task
+     Other data"
+:parser di:parse-entry-type
+:bindings ((di:todo-regexp "Due: "))
+:type 'symbol
+:source vtodo
+:tests (should (eq parsed 'ical:vtodo)))
+
+(defun dit:parse-vevent-transparency ()
+  "Call `di:parse-transparency' with \\='icalendar-vevent"
+  (di:parse-transparency 'ical:vevent))
+
+(dit:parse-test
+ "&%%(diary-anniversary 7 28 1985) A transparent anniversary"
+ :parser dit:parse-vevent-transparency
+ :type 'ical:transp
+ :number 1
+ :source nonmarking
+ :tests
+ (ical:with-property (car parsed) nil
+   (should (equal value "TRANSPARENT"))))
+
+(dit:parse-test
+ "2025-04-01 Team Meeting
+   Some data
+   Organizer: Mr. Foo <foo@example.com>
+   Attendees: Baz Bar <baz@example.com>
+              Alice Unternehmer <alice@example.com> (some other data)
+   Other data"
+:parser di:parse-attendees-and-organizer
+:number 3
+:type '(or ical:attendee ical:organizer)
+:tests
+(dolist (p parsed)
+  (ical:with-property p
+    ((ical:cnparam :value name))
+    (cond ((equal value "mailto:foo@example.com")
+           (should (equal name "Mr. Foo"))
+           (should (ical:organizer-property-p p)))
+          ((equal value "mailto:baz@example.com")
+           (should (equal name "Baz Bar"))
+           (should (ical:attendee-property-p p)))
+          ((equal value "mailto:alice@example.com")
+           (should (equal name "Alice Unternehmer"))
+           (should (ical:attendee-property-p p)))
+          (t (error "Incorrectly parsed attendee address: %s" value))))))
+
+(dit:parse-test
+ "2025-04-01 An event with a UID
+    Some data
+    UID: emacs174560213714413195191
+    Other data"
+:parser di:parse-uid
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:uid
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "emacs174560213714413195191" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with a different style of UID
+    Some data
+    UID: 197846d7-51be-4d8e-837f-7e132286e7cf
+    Other data"
+:parser di:parse-uid
+:source with-org-id-uuid
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:uid
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "197846d7-51be-4d8e-837f-7e132286e7cf" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with a status
+    Some data
+    Status: confirmed
+    Other data"
+:parser di:parse-status
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:status
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "CONFIRMED" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with an access classification
+    Some data
+    Class: private
+    Other data"
+:parser di:parse-class
+:source private
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:class
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "PRIVATE" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with an access classification
+    Some data
+    Access: public
+    Other data"
+:parser di:parse-class
+:source public
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:class
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "PUBLIC" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with a location
+    Some data
+    Location: Sesamstraße 13
+    Other data"
+:parser di:parse-location
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:location
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "Sesamstraße 13" value))))
+
+(dit:parse-test
+ "2025-04-01 An event with an URL
+    Some data
+    URL: http://example.com/foo/bar?q=baz
+    Other data"
+:parser di:parse-url
+:bindings ((diary-date-forms diary-iso-date-forms))
+:type 'ical:url
+:tests
+(ical:with-property (car parsed) nil
+  (should (equal "http://example.com/foo/bar?q=baz" value))))
+
+
+;; N.B.  There is no date at the start of the entry in the following two
+;; tests because di:parse-summary-and-description assumes that the date
+;; parsing functions have already moved the start of the restriction
+;; beyond it.
+(dit:parse-test
+ "Event summary
+    Some data
+    Other data"
+:parser di:parse-summary-and-description
+:number 2
+:type '(or ical:summary ical:description)
+:bindings ((diary-date-forms diary-iso-date-forms))
+:tests
+(ical:with-property (car parsed) nil (should (equal "Event summary" value))))
+
+(dit:parse-test
+ "Some data
+    Summary: Event summary
+    Other data"
+:parser di:parse-summary-and-description
+:number 2
+:bindings ((di:summary-regexp "^[[:space:]]+Summary: \\(.*\\)$"))
+:type '(or ical:summary ical:description)
+:bindings ((diary-date-forms diary-iso-date-forms))
+:source with-summary-regexp
+:tests
+(ical:with-property (car parsed) nil (should (equal "Event summary" value))))
+
+(dit:parse-test
+ "2025/04/01 Some entry"
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-iso-date-forms))
+ :source iso-date
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "2025-04-01 Some entry"
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-iso-date-forms))
+ :source iso-date-dashes
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "1/4/2025 Some entry"
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-european-date-forms))
+ :source european-date
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "4/1/2025 Some entry"
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source american-date
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "4/1 April Fool's"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source generic-year-american
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "1/5 Tag der Arbeit"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-european-date-forms))
+ :source generic-year-european
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 5 (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "1/*/2025 Rent due"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-european-date-forms))
+ :source generic-month
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (eq t (calendar-extract-month parsed)))
+   (should (= 1 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "*/2/2025 Every day in February: go running"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-european-date-forms))
+ :source generic-day
+ :tests
+ (progn
+   (should (= 2025 (calendar-extract-year parsed)))
+   (should (= 2 (calendar-extract-month parsed)))
+   (should (eq t (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "Friday
+    Lab meeting
+    Backup data"
+ :parser di:parse-weekday-name
+ :type 'integer
+ :tests
+ (should (= 5 parsed)))
+
+;;; Examples from the Emacs manual:
+(dit:parse-test
+ "12/22/2015  Twentieth wedding anniversary!"
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/1
+ :tests
+ (progn
+   (should (= 2015 (calendar-extract-year parsed)))
+   (should (= 12 (calendar-extract-month parsed)))
+   (should (= 22 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Generic date via unspecified year:
+ "10/22       Ruth's birthday."
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/2
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 10 (calendar-extract-month parsed)))
+   (should (= 22 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Generic date via unspecified year:
+ "4/30  Results for April are due"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.3/3
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 30 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Generic date with asterisks:
+ "* 21, *:    Payday"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/3
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (eq t (calendar-extract-month parsed)))
+   (should (= 21 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Generic date with asterisks:
+ "*/25  Monthly cycle finishes"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.3/4
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (eq t (calendar-extract-month parsed)))
+   (should (= 25 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Weekday name:
+ "Tuesday--weekly meeting with grad students at 10am
+           Supowit, Shen, Bitner, and Kapoor to attend."
+ :parser di:parse-weekday-name
+ :type 'integer
+ :source emacs-manual-sec33.10.1/4
+ :tests
+ (should (= 2 parsed)))
+
+(dit:parse-test
+ ;; Weekday name:
+ "Friday  Don't leave without backing up files"
+ :parser di:parse-weekday-name
+ :type 'integer
+ :source emacs-manual-sec33.10.3/5
+ :tests
+ (should (= 5 parsed)))
+
+(dit:parse-test
+ ;; Date with two-digit year:
+ "1/13/89     Friday the thirteenth!!"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/5
+ :tests
+ (progn
+   (should (= 1989 (calendar-extract-year parsed)))
+   (should (= 1 (calendar-extract-month parsed)))
+   (should (= 13 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Date with two-digit year:
+ "4/20/12  Switch-over to new tabulation system"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.3/1
+ :tests
+ (progn
+   (should (= 2012 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 20 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Abbreviated weekday name:
+ "thu 4pm     squash game with Lloyd."
+ :parser di:parse-weekday-name
+ :type 'integer
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/6
+ :tests
+ (should (= 4 parsed)))
+
+(dit:parse-test
+ ;; Abbreviated month name:
+ "mar 16      Dad's birthday"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/7
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 3 (calendar-extract-month parsed)))
+   (should (= 16 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Abbreviated month name with following period:
+ "apr. 25  Start tabulating annual results"
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.3/2
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 25 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Long form date:
+ "April 15, 2016 Income tax due."
+ :parser di:parse-date-form
+ :type 'ical:date
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/8
+ :tests
+ (progn
+   (should (= 2016 (calendar-extract-year parsed)))
+   (should (= 4 (calendar-extract-month parsed)))
+   (should (= 15 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ ;; Generic monthly date:
+ "* 15        time cards due."
+ :parser di:parse-date-form
+ :type 'list
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/9
+ :tests
+ (progn
+   (should (eq t (calendar-extract-year parsed)))
+   (should (eq t (calendar-extract-month parsed)))
+   (should (= 15 (calendar-extract-day parsed)))))
+
+(dit:parse-test
+ "%%(diary-anniversary 5 28 1995) A birthday"
+ :parser di:parse-sexp
+ :type 'list
+ :tests (should (eq 'diary-anniversary (car parsed))))
+
+(dit:parse-test
+ "%%(diary-time-block :start (0 0 13 2 4 2025 6 t 7200)
+                      :end (0 0 11 4 4 2025 6 t 7200))
+    A multiday event with different start and end times"
+ :parser di:parse-sexp
+ :type 'list
+ :source multiline-sexp
+ :tests (should (eq 'diary-time-block (car parsed))))
+
+(defun dit:entry-parser ()
+  "Call `di:parse-entry' on the full test buffer"
+  (let ((tz
+         (cond
+          ((eq 'local di:time-zone-export-strategy)
+           (di:current-tz-to-vtimezone))
+          ((listp di:time-zone-export-strategy)
+           (di:current-tz-to-vtimezone di:time-zone-export-strategy)))))
+
+    (di:parse-entry (point-min) (point-max) tz)))
+
+(dit:parse-test
+ ;; Weekly event, abbreviated weekday name:
+ "thu 4pm     squash game with Lloyd."
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source emacs-manual-sec33.10.1/6
+ :tests
+ (ical:with-component (car parsed)
+   ((ical:dtstart :value dtstart)
+    (ical:rrule :value rrule)
+    (ical:summary :value summary))
+   (should (equal summary "squash game with Lloyd."))
+   (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)))))
+
+(dit:parse-test
+ ;; Multiline entry, parsed as one event:
+ "2025-05-03
+    9AM Lab meeting
+      Gunther to present on new assay
+    12:30-1:30PM Lunch with Phil
+    16:00 Experiment A finishes; move to freezer"
+ :parser dit:entry-parser
+ :source multiline-single
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-iso-date-forms)))
+
+(dit:parse-test
+ ;; Multiline entry, parsed linewise as three events:
+ "2025-05-03
+    9AM Lab meeting
+      Gunther to present on new assay
+    12:30-1:30PM Lunch with Phil
+    16:00 Experiment A finishes; move to freezer"
+ :parser dit:entry-parser
+ :source multiline-linewise
+ :type 'ical:vevent
+ :number 3
+ :bindings ((diary-date-forms diary-iso-date-forms)
+            (diary-icalendar-export-linewise t))
+ :tests
+ (progn
+   (dolist (event parsed)
+     (ical:with-component event
+       ((ical:dtstart :value-type start-type :value dtstart)
+        (ical:dtend :value-type end-type :value dtend)
+        (ical:summary :value summary))
+       (should (eq start-type 'ical:date-time))
+       (should (= 2025 (decoded-time-year dtstart)))
+       (should (= 5 (decoded-time-month dtstart)))
+       (should (= 3 (decoded-time-day dtstart)))
+       (when dtend
+         (should (eq end-type 'ical:date-time))
+         (should (= 2025 (decoded-time-year dtend)))
+         (should (= 5 (decoded-time-month dtend)))
+         (should (= 3 (decoded-time-day dtend))))
+       (cond ((equal summary "Lab meeting")
+              (should (= 9 (decoded-time-hour dtstart))))
+             ((equal summary "Lunch with Phil")
+              (should (= 12 (decoded-time-hour dtstart)))
+              (should (= 30 (decoded-time-minute dtstart)))
+              (should (= 13 (decoded-time-hour dtend)))
+              (should (= 30 (decoded-time-minute dtend))))
+             ((equal summary "Experiment A finishes; move to freezer")
+              (should (= 16 (decoded-time-hour dtstart))))
+             (t (error "Unknown event: %s" summary)))))))
+
+(dit:parse-test
+ ;; Multiline entry from the manual, parsed linewise:
+ ;; TODO: I've left the times verbatim in the example
+ ;; and in the tests, even though "2:30", "5:30" and "8:00"
+ ;; would most naturally be understood as PM times.
+ ;; Should probably fix the manual, then revise here.
+ "02/11/2012
+           Bill B. visits Princeton today
+           2pm Cognitive Studies Committee meeting
+           2:30-5:30 Liz at Lawrenceville
+           4:00pm Dentist appt
+           7:30pm Dinner at George's
+           8:00-10:00pm concert"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 6
+ :bindings ((diary-date-forms diary-american-date-forms)
+            (diary-icalendar-export-linewise t))
+ :source emacs-manual-sec33.10.1/10
+ :tests
+ (progn
+   (dolist (event parsed)
+     (ical:with-component event
+       ((ical:dtstart :value-type start-type :value dtstart)
+        (ical:dtend :value-type end-type :value dtend)
+        (ical:summary :value summary))
+       (when (eq start-type 'ical:date)
+         (should (= 2012 (calendar-extract-year dtstart)))
+         (should (= 2 (calendar-extract-month dtstart)))
+         (should (= 11 (calendar-extract-day dtstart))))
+       (when (eq start-type 'ical:date-time)
+         (should (= 2012 (decoded-time-year dtstart)))
+         (should (= 2 (decoded-time-month dtstart)))
+         (should (= 11 (decoded-time-day dtstart))))
+       (when dtend
+         (should (eq end-type 'ical:date-time))
+         (should (= 2012 (decoded-time-year dtend)))
+         (should (= 2 (decoded-time-month dtend)))
+         (should (= 11 (decoded-time-day dtend))))
+       (cond ((equal summary "Bill B. visits Princeton today")
+              (should (eq start-type 'ical:date)))
+             ((equal summary "Cognitive Studies Committee meeting")
+              (should (= 14 (decoded-time-hour dtstart)))
+              (should (= 0 (decoded-time-minute dtstart))))
+             ((equal summary "Liz at Lawrenceville")
+              (should (= 2 (decoded-time-hour dtstart)))
+              (should (= 30 (decoded-time-minute dtstart)))
+              (should (= 5 (decoded-time-hour dtend)))
+              (should (= 30 (decoded-time-minute dtend))))
+             ((equal summary "Dentist appt")
+              (should (= 16 (decoded-time-hour dtstart)))
+              (should (= 0 (decoded-time-minute dtstart))))
+             ((equal summary "Dinner at George's")
+              (should (= 19 (decoded-time-hour dtstart)))
+              (should (= 30 (decoded-time-minute dtstart))))
+             ((equal summary "concert")
+              (should (= 8 (decoded-time-hour dtstart)))
+              (should (= 0 (decoded-time-minute dtstart)))
+              (should (= 22 (decoded-time-hour dtend)))
+              (should (= 0 (decoded-time-minute dtend))))
+             (t (error "Unknown event: %s" summary)))))))
+
+(dit:parse-test
+ ;; Same as the last, but with ignored data on the same line as the date
+ "02/11/2012 Ignored
+             2pm Cognitive Studies Committee meeting
+             2:30-5:30 Liz at Lawrenceville
+             4:00pm Dentist appt
+             7:30pm Dinner at George's
+             8:00-10:00pm concert"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 5
+ :bindings ((diary-date-forms diary-american-date-forms)
+            (diary-icalendar-export-linewise t))
+ :source emacs-manual-sec33.10.1/10-first-line)
+
+(dit:parse-test
+ "%%(diary-anniversary 5 28 1995) H's birthday"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms)
+            (calendar-date-style 'american))
+ :source diary-anniversary-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (ical:summary :value summary))
+   (should (equal dtstart '(5 28 1995)))
+   (should (eq (ical:recur-freq recur-value) 'YEARLY))
+   (should (equal summary "H's birthday"))))
+
+(dit:parse-test
+ "%%(diary-block 6 24 2012 7 10 2012) Vacation"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-block-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (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 summary "Vacation"))))
+
+(dit:parse-test
+ "%%(diary-cyclic 50 3 1 2012) Renew medication"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-cyclic-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (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 (equal summary "Renew medication"))))
+
+(dit:parse-test
+ "%%(diary-float 11 4 4) American Thanksgiving"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-float-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (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 (equal summary "American Thanksgiving"))))
+
+(dit:parse-test
+ "%%(diary-offset '(diary-float t 3 4) 2) Monthly committee meeting"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-offset-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (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))
+   ;; day 3 is Wednesday, so offset of 2 means Friday (=5):
+   (should (equal (ical:recur-by* 'BYDAY recur-value) (list '(5 . 4))))
+   (should (equal summary "Monthly committee meeting"))))
+
+(dit:parse-test
+ "%%(diary-rrule :start '(11 11 2024)
+                 :rule '((FREQ WEEKLY))
+                 :exclude '((12 23 2024) (12 30 2024))
+     ) Reading group"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-rrule-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (ical:exdate :values exdates)
+      (ical:summary :value summary))
+   (should (equal dtstart '(11 11 2024)))
+   (should (eq (ical:recur-freq recur-value) 'WEEKLY))
+   (should (equal exdates '((12 23 2024) (12 30 2024))))
+   (should (equal summary "Reading group"))))
+
+(dit:parse-test
+ "%%(diary-date '(10 11 12) 22 t) Rake leaves"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms))
+ :source diary-date-recurrence
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rrule :value recur-value)
+      (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 (equal summary "Rake leaves"))))
+
+(dit:parse-test
+ ;; From the manual: "Suppose you get paid on the 21st of the month if
+ ;; it is a weekday, and on the Friday before if the 21st is on a
+ ;; weekend..."
+ "%%(let ((dayname (calendar-day-of-week date))
+          (day (cadr date)))
+          (or (and (= day 21) (memq dayname '(1 2 3 4 5)))
+              (and (memq day '(19 20)) (= dayname 5)))
+              ) Pay check deposited"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-date-forms diary-american-date-forms)
+            (di:export-sexp-enumeration-days 366))
+ :source emacs-manual-sec33.13.10.7
+ :tests
+ (ical:with-component (car parsed)
+     ((ical:dtstart :value dtstart)
+      (ical:rdate :values rdates)
+      (ical:summary :value summary))
+   (should (equal summary "Pay check deposited"))
+   (mapc
+    (lambda (date)
+      (should (or (and (= 21 (calendar-extract-day date))
+                       (memq (calendar-day-of-week date) (list 1 2 3 4 5)))
+                  (and (memq (calendar-extract-day date) (list 19 20))
+                       (= 5 (calendar-day-of-week date))))))
+    (cons dtstart rdates))))
+
+(dit:parse-test
+ "02/11/2012 4:00pm Exported with 'local strategy"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((tz (getenv "TZ"))
+            ;; Refresh output from `calendar-current-time-zone':
+            (calendar-current-time-zone-cache nil)
+            ;; Assume Eastern European Time (UTC+2, UTC+3 daylight saving)
+            (_ (setenv "TZ" "EET-2EEST,M3.5.0/3,M10.5.0/4"))
+            ;; ...and use this TZ when exporting:
+            (diary-icalendar-time-zone-export-strategy 'local)
+            (diary-date-forms diary-european-date-forms))
+ :source tz-strategy-local
+ :tests
+ (unwind-protect
+     (let ((vtimezone (di:current-tz-to-vtimezone)))
+       (ical:with-component vtimezone
+         ((ical:standard :first std)
+          (ical:daylight :first dst))
+         (should (= (* 2 60 60) (ical:with-property-of std 'ical:tzoffsetto)))
+         (should (= (* 3 60 60) (ical:with-property-of dst 'ical:tzoffsetto))))
+       (ical:with-component (car parsed)
+         ((ical:dtstart :first start-node :value start))
+         (should (= (* 2 60 60) (decoded-time-zone start)))
+         (should (= 16 (decoded-time-hour start)))
+         (should (ical:with-param-of start-node 'ical:tzidparam))))
+   ;; restore time zone
+   (setenv "TZ" tz)))
+
+(dit:parse-test
+ "02/11/2012 4:00pm Exported with 'to-utc strategy"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((tz (getenv "TZ"))
+            ;; Assume Eastern European Time (UTC+2, UTC+3 daylight saving)
+            (_ (setenv "TZ" "EET-2EEST,M3.5.0/3,M10.5.0/4"))
+            ;; ...and convert times to UTC on export:
+            (diary-icalendar-time-zone-export-strategy 'to-utc)
+            (diary-date-forms diary-european-date-forms))
+ :source tz-strategy-to-utc
+ :tests
+ (unwind-protect
+     (ical:with-component (car parsed)
+       ((ical:dtstart :first start-node :value start))
+       (should (= 0 (decoded-time-zone start)))
+       (should (= (- 16 2) (decoded-time-hour start)))
+       (should-not (ical:with-param-of start-node 'ical:tzidparam)))
+   ;; restore time zone
+   (setenv "TZ" tz)))
+
+(dit:parse-test
+ "02/11/2012 4:00pm Exported with 'floating strategy"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((tz (getenv "TZ"))
+            ;; Assume Eastern European Time (UTC+2, UTC+3 daylight saving)
+            (_ (setenv "TZ" "EET-2EEST,M3.5.0/3,M10.5.0/4"))
+            ;; ...but use floating times:
+            (diary-icalendar-time-zone-export-strategy 'floating)
+            (diary-date-forms diary-european-date-forms))
+ :source tz-strategy-floating
+ :tests
+ (unwind-protect
+     (ical:with-component (car parsed)
+         ((ical:dtstart :first start-node :value start))
+       (should (null (decoded-time-zone start)))
+       (should (= 16 (decoded-time-hour start)))
+       (should-not (ical:with-param-of start-node 'ical:tzidparam)))
+
+     ;; restore time zone
+     (setenv "TZ" tz)))
+
+(dit:parse-test
+ "02/11/2012 4:00pm Exported with tz info list"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings (;; Encode Eastern European Time (UTC+2, UTC+3 daylight saving)
+            ;; directly in the variable:
+            (diary-icalendar-time-zone-export-strategy
+             '(120 60 "EET" "EEST"
+               (calendar-nth-named-day -1 0 3 year) ; last Sunday of March
+               (calendar-nth-named-day -1 0 10 year) ; last Sunday of October
+               240 180))
+            (diary-date-forms diary-european-date-forms))
+ :source tz-strategy-sexp
+ :tests
+ (let ((vtimezone (di:current-tz-to-vtimezone
+                   diary-icalendar-time-zone-export-strategy
+                   "EET")))
+   (ical:with-component vtimezone
+       ((ical:standard :first std)
+        (ical:daylight :first dst))
+     (should (= (* 2 60 60) (ical:with-property-of std 'ical:tzoffsetto)))
+     (should (= (* 3 60 60) (ical:with-property-of dst 'ical:tzoffsetto))))
+   (ical:with-component (car parsed)
+       ((ical:dtstart :first start-node :value start))
+     (should (= 7200 (decoded-time-zone start)))
+     (should (= 16 (decoded-time-hour start)))
+     (should (ical:with-param-of start-node 'ical:tzidparam)))))
+
+(defun dit:parse-@-location (type properties)
+  "Example user function for parsing additional properties.
+Parses anything following \"@\" to end of line as the entry's LOCATION."
+  (ignore type properties)
+  (goto-char (point-min))
+  (when (re-search-forward "@\\([^\n]+\\)" nil t)
+    (list (ical:make-property ical:location
+                              (string-trim (match-string 1))))))
+
+(dit:parse-test
+ "2025/08/02 BBQ @ John's"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-icalendar-other-properties-parser #'dit:parse-@-location)
+            (diary-date-forms diary-iso-date-forms))
+ :source other-properties-parser
+ :tests
+ (ical:with-component (car parsed)
+   ((ical:location :value location))
+   (should (equal location "John's"))))
+
+(dit:parse-test
+ "2025/05/15 11AM Department meeting
+  Attendee: <mydept@example.com>"
+ :parser dit:entry-parser
+ :type 'ical:vevent
+ :number 1
+ :bindings ((diary-icalendar-export-alarms
+             '((audio 10)
+               (display 20 "In %t minutes: %s")
+               (email 60 "In %t minutes: %s" ("myemail@example.com" from-entry))))
+            (diary-date-forms diary-iso-date-forms))
+ :source alarms-export
+ :tests
+ (ical:with-component (car parsed)
+   ((ical:valarm :all valarms))
+   (should (length= valarms 3))
+   (dolist (valarm valarms)
+     (ical:with-component valarm
+       ((ical:action :value action)
+        (ical:trigger :value trigger)
+        (ical:summary :value summary)
+        (ical:attendee :all attendee-nodes))
+       (cond ((equal action "AUDIO")
+              (should (eql -10 (decoded-time-minute trigger))))
+             ((equal action "DISPLAY")
+              (should (eql -20 (decoded-time-minute trigger)))
+              (should (equal summary "In 20 minutes: Department meeting")))
+             ((equal action "EMAIL")
+              (should (eql -60 (decoded-time-minute trigger)))
+              (should (equal summary "In 60 minutes: Department meeting"))
+              (should (length= attendee-nodes 2))
+              (let ((addrs (mapcar (lambda (n) (ical:with-node-value n))
+                                   attendee-nodes)))
+                (should (member "mailto:myemail@example.com" addrs))
+                (should (member "mailto:mydept@example.com" addrs))))
+             (t (error "Unknown alarm action %s" action)))))))
+
+
+
+;; Local Variables:
+;; read-symbol-shorthands: (("dit:" . "diary-icalendar-test-") ("di:" . "diary-icalendar-") ("ical:" . "icalendar-"))
+;; byte-compile-warnings: (not obsolete)
+;; End:
+;;; diary-icalendar-tests.el ends here
diff --git a/test/lisp/calendar/icalendar-ast-tests.el b/test/lisp/calendar/icalendar-ast-tests.el
new file mode 100644
index 00000000000..b4107b139a5
--- /dev/null
+++ b/test/lisp/calendar/icalendar-ast-tests.el
@@ -0,0 +1,112 @@
+;;; tests/icalendar-ast.el --- Tests for icalendar-ast  -*- lexical-binding: t; -*-
+;; Copyright (C) 2025 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+(require 'icalendar-ast)
+(require 'icalendar-parser)
+(require 'cl-lib)
+(eval-when-compile (require 'icalendar-macs))
+
+
+;; Tests for the high-level construction macros:
+(ert-deftest iat:make-param/nonlist ()
+  "Test that `icalendar-make-param' works as documented with a single value."
+  (let ((cnparam-node (ical:make-param ical:cnparam "John Doe")))
+    (should (ical:param-node-p cnparam-node))
+    (should (eq 'ical:cnparam (ical:ast-node-type cnparam-node)))
+    (ical:with-param cnparam-node
+       (should (cl-typep value 'ical:text))
+       (should (equal value "John Doe")))))
+
+(ert-deftest iat:make-param/list ()
+  "Test that `icalendar-make-param' works as documented with a list of values."
+  (let ((deltoparam-node (ical:make-param ical:deltoparam
+                                          (list "mailto:minionA@example.com"
+                                                "mailto:minionB@example.com"))))
+    (should (ical:param-node-p deltoparam-node))
+    (should (eq 'ical:deltoparam (ical:ast-node-type deltoparam-node)))
+    (ical:with-param deltoparam-node
+       (should (and (listp value-nodes) (length= value-nodes 2)))
+       (should (seq-every-p
+                (lambda (n) (eq 'ical:cal-address (ical:ast-node-type n)))
+                value-nodes))
+       (should (equal "mailto:minionA@example.com" (car values)))
+       (should (equal "mailto:minionB@example.com" (cadr values))))))
+
+(ert-deftest iat:make-property/nonlist ()
+  "Test that `icalendar-make-property' works as documented with a single value."
+  (let ((attendee-node
+         (ical:make-property ical:attendee "mailto:hermes@planetexpress.com"
+                             (ical:cnparam "H. Conrad"))))
+    (should (ical:property-node-p attendee-node))
+    (should (eq 'ical:attendee (ical:ast-node-type attendee-node)))
+    (ical:with-property attendee-node
+         ((ical:cnparam :first cnparam-node :value cn))
+       (should (eq value-type 'ical:cal-address))
+       (should (equal value "mailto:hermes@planetexpress.com"))
+       (should (eq 'ical:cnparam (ical:ast-node-type cnparam-node)))
+       (should (equal cn "H. Conrad")))))
+
+(ert-deftest iat:make-property/list ()
+  "Test that `icalendar-make-property' works as documented with a list of values."
+  (let ((rdate-node (icalendar-make-property icalendar-rdate
+                                             (list '(2 1 2025) '(3 1 2025)))))
+    (should (ical:property-node-p rdate-node))
+    (should (eq 'ical:rdate (ical:ast-node-type rdate-node)))
+    (ical:with-property rdate-node
+         ((ical:valuetypeparam :first valtype-node :value valtype))
+       (should (and (listp value-nodes) (length= value-nodes 2)))
+       (should (seq-every-p
+                (lambda (n) (eq 'ical:date (ical:ast-node-type n)))
+                value-nodes))
+       (should (equal '(2 1 2025) (car values)))
+       (should (equal '(3 1 2025) (cadr values)))
+       (should (ical:ast-node-p valtype-node))
+       (should (eq 'ical:valuetypeparam (ical:ast-node-type valtype-node)))
+       (should (eq 'ical:date valtype)))))
+
+(ert-deftest iat:make-component ()
+  "Test that `icalendar-make-component' works as documented."
+  (let* ((others (list (icalendar-make-property ical:dtstart '(9 6 3003))
+                       (icalendar-make-property ical:rrule '((FREQ DAILY)))))
+         (vevent-node (icalendar-make-component ical:vevent
+                                                (ical:summary "Party")
+                                                (ical:location "Robot House")
+                                                (@ others))))
+    (should (ical:component-node-p vevent-node))
+    (should (eq 'ical:vevent (ical:ast-node-type vevent-node)))
+    (ical:with-component vevent-node
+         ((ical:uid :first uid-node)
+          (ical:dtstamp :first dtstamp-node)
+          (ical:summary :value summary)
+          (ical:location :value location)
+          (ical:dtstart :first dtstart-node :value dtstart)
+          (ical:rrule :first rrule-node :value rrule))
+       (should (and (ical:ast-node-p uid-node)
+                    (ical:ast-node-p dtstamp-node)))
+       (should (equal summary "Party"))
+       (should (equal location "Robot House"))
+       (should (equal dtstart '(9 6 3003)))
+       (should (equal rrule '((FREQ DAILY)))))))
+
+;; TODO: properties, components too
+
+;; Local Variables:
+;; read-symbol-shorthands: (("iat:" . "icalendar-ast-test-") ("ical:" . "icalendar-"))
+;; End:
+;;; icalendar-ast-tests.el ends here
diff --git a/test/lisp/calendar/icalendar-parser-tests.el b/test/lisp/calendar/icalendar-parser-tests.el
new file mode 100644
index 00000000000..f3c5de35c87
--- /dev/null
+++ b/test/lisp/calendar/icalendar-parser-tests.el
@@ -0,0 +1,2032 @@
+;;; tests/icalendar-parser.el --- Tests for icalendar-parser  -*- lexical-binding: t; -*-
+;; Copyright (C) 2025 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'icalendar-macs))
+(require 'ert)
+(require 'ert-x)
+(require 'icalendar-parser)
+(require 'icalendar-utils)
+
+(cl-defmacro ipt:parse/print-test (string &key expected parser type printer source)
+  "Create a test which parses STRING, prints the resulting parse
+tree, and compares the printed version with STRING (or with
+EXPECTED, if given).  If they are the same, the test passes.
+PARSER and PRINTER should be the parser and printer functions
+appropriate to STRING.  TYPE, if given, should be the type of
+object PARSER is expected to parse; it will be passed as PARSER's
+first argument.  SOURCE should be a symbol; it is used to name the
+test."
+  (let ((parser-form
+         (if type
+             `(funcall (function ,parser) (quote ,type) (point-max))
+           `(funcall (function ,parser) (point-max)))))
+    `(ert-deftest ,(intern (concat "ipt:parse/print-" (symbol-name source))) ()
+       ,(format "Parse and reprint example from `%s'; pass if they match" source)
+       (let* ((parse-buf (get-buffer-create "*iCalendar Parse Test*"))
+              (print-buf (get-buffer-create "*iCalendar Print Test*"))
+              (unparsed ,string)
+              (expected (or ,expected unparsed))
+              (printed nil))
+         (set-buffer parse-buf)
+         (erase-buffer)
+         (insert unparsed)
+         (goto-char (point-min))
+         (let ((parsed ,parser-form))
+           (should (icalendar-ast-node-valid-p parsed))
+           (set-buffer print-buf)
+           (erase-buffer)
+           (insert (funcall (function ,printer) parsed))
+           ;; this may need adjusting if printers become coding-system aware:
+           (decode-coding-region (point-min) (point-max) 'utf-8-dos)
+           (setq printed (buffer-substring-no-properties (point-min) (point-max)))
+           (should (equal expected printed)))))))
+
+(ipt:parse/print-test
+"ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.1.1/1)
+
+(ipt:parse/print-test
+"RDATE;VALUE=DATE:19970304,19970504,19970704,19970904\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.1.1/2)
+
+(ipt:parse/print-test
+"ATTACH:http://example.com/public/quarterly-report.doc\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.1.3/1)
+
+(ipt:parse/print-test
+;; Corrected.  The original contains invalid base64 data; it was
+;; missing the final "=", as noted in errata ID 5602.
+;; The decoded string should read:
+;; The quick brown fox jumps over the lazy dog.
+"ATTACH;FMTTYPE=text/plain;ENCODING=BASE64;VALUE=BINARY:VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZy4=\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.1.3/2)
+
+(ipt:parse/print-test
+"DESCRIPTION;ALTREP=\"cid:part1.0001@example.org\":The Fall'98 Wild Wizards Conference - - Las Vegas\\, NV\\, USA\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2/1)
+
+(ipt:parse/print-test
+"DESCRIPTION;ALTREP=\"CID:part3.msg.970415T083000@example.com\": Project XYZ Review Meeting will include the following agenda items: (a) Market Overview\\, (b) Finances\\, (c) Project Management\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.1/1)
+
+(ipt:parse/print-test
+"ORGANIZER;CN=\"John Smith\":mailto:jsmith@example.com\n"
+;; CN param value does not require quotes, so they're missing when
+;; re-printed:
+:expected "ORGANIZER;CN=John Smith:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.2/1)
+
+(ipt:parse/print-test
+"ATTENDEE;CUTYPE=GROUP:mailto:ietf-calsch@example.org\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.3/1)
+
+(ipt:parse/print-test
+"ATTENDEE;DELEGATED-FROM=\"mailto:jsmith@example.com\":mailto:jdoe@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.4/1)
+
+(ipt:parse/print-test
+"ATTENDEE;DELEGATED-TO=\"mailto:jdoe@example.com\",\"mailto:jqpublic@example.com\":mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.5/1)
+
+(ipt:parse/print-test
+"ORGANIZER;DIR=\"ldap://example.com:6666/o=ABC%20Industries,c=US???(cn=Jim%20Dolittle)\":mailto:jimdo@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.6/1)
+
+(ipt:parse/print-test
+"ATTACH;FMTTYPE=text/plain;ENCODING=BASE64;VALUE=BINARY:TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVsaXQsIHNlZCBkbyBlaXVzbW9kIHRlbXBvciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBVdCBlbmltIGFkIG1pbmltIHZlbmlhbSwgcXVpcyBub3N0cnVkIGV4ZXJjaXRhdGlvbiB1bGxhbWNvIGxhYm9yaXMgbmlzaSB1dCBhbGlxdWlwIGV4IGVhIGNvbW1vZG8gY29uc2VxdWF0LiBEdWlzIGF1dGUgaXJ1cmUgZG9sb3IgaW4gcmVwcmVoZW5kZXJpdCBpbiB2b2x1cHRhdGUgdmVsaXQgZXNzZSBjaWxsdW0gZG9sb3JlIGV1IGZ1Z2lhdCBudWxsYSBwYXJpYXR1ci4gRXhjZXB0ZXVyIHNpbnQgb2NjYWVjYXQgY3VwaWRhdGF0IG5vbiBwcm9pZGVudCwgc3VudCBpbiBjdWxwYSBxdWkgb2ZmaWNpYSBkZXNlcnVudCBtb2xsaXQgYW5pbSBpZCBlc3QgbGFib3J1bS4=\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.7/1)
+
+(ipt:parse/print-test
+"ATTACH;FMTTYPE=application/msword:ftp://example.com/pub/docs/agenda.doc\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.8/1)
+
+(ipt:parse/print-test
+"FREEBUSY;FBTYPE=BUSY:19980415T133000Z/19980415T170000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.9/1)
+
+(ipt:parse/print-test
+"SUMMARY;LANGUAGE=en-US:Company Holiday Party\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.10/1)
+
+(ipt:parse/print-test
+"LOCATION;LANGUAGE=en:Germany\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.10/2)
+
+(ipt:parse/print-test
+"LOCATION;LANGUAGE=no:Tyskland\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.10/3)
+
+(ipt:parse/print-test
+"ATTENDEE;MEMBER=\"mailto:ietf-calsch@example.org\":mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.11/1)
+
+(ipt:parse/print-test
+"ATTENDEE;MEMBER=\"mailto:projectA@example.com\",\"mailto:projectB@example.com\":mailto:janedoe@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.11/2)
+
+(ipt:parse/print-test
+"ATTENDEE;PARTSTAT=DECLINED:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.12/1)
+
+(ipt:parse/print-test
+"RECURRENCE-ID;RANGE=THISANDFUTURE:19980401T133000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.13/1)
+
+(ipt:parse/print-test
+"TRIGGER;RELATED=END:PT5M\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.14/1)
+
+(ipt:parse/print-test
+"RELATED-TO;RELTYPE=SIBLING:19960401-080045-4000F192713@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.15/1)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=CHAIR:mailto:mrbig@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.16/1)
+
+(ipt:parse/print-test
+"ATTENDEE;RSVP=TRUE:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.17/1)
+
+(ipt:parse/print-test
+"ORGANIZER;SENT-BY=\"mailto:sray@example.com\":mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.18/1)
+
+(ipt:parse/print-test
+"DTSTART;TZID=America/New_York:19980119T020000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.19/1)
+
+(ipt:parse/print-test
+"DTEND;TZID=America/New_York:19980119T030000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.2.19/2)
+
+(ipt:parse/print-test
+"ATTACH;FMTTYPE=image/vnd.microsoft.icon;ENCODING=BASE64;VALUE=BINARY:AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAgIAAAICAgADAwMAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAABNEMQAAAAAAAkQgAAAAAAJEREQgAAACECQ0QgEgAAQxQzM0E0AABERCRCREQAADRDJEJEQwAAAhA0QwEQAAAAAEREAAAAAAAAREQAAAAAAAAkQgAAAAAAAAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.3.1/1)
+
+(ipt:parse/print-test
+"TRUE"
+:type icalendar-boolean
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.2/1)
+
+(ipt:parse/print-test
+"mailto:jane_doe@example.com"
+:type icalendar-cal-address
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.3/1)
+
+(ipt:parse/print-test
+"19970714"
+:type icalendar-date
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.4/1)
+
+(ipt:parse/print-test
+;; 'Floating' time:
+"19980118T230000"
+:type icalendar-date-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.5/1)
+
+(ipt:parse/print-test
+;; UTC time:
+"19980119T070000Z"
+:type icalendar-date-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.5/2)
+
+(ipt:parse/print-test
+;; Leap second (seconds = 60)
+"19970630T235960Z"
+:type icalendar-date-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.5/3)
+
+(ipt:parse/print-test
+;; Local time:
+"DTSTART:19970714T133000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.3.5/4)
+
+(ipt:parse/print-test
+;; UTC time:
+"DTSTART:19970714T173000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.3.5/5)
+
+(ipt:parse/print-test
+;; Local time with TZ identifier:
+"DTSTART;TZID=America/New_York:19970714T133000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.3.5/6)
+
+(ipt:parse/print-test
+"P15DT5H0M20S"
+:expected "P15DT5H20S"
+:type icalendar-dur-value
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.6/1)
+
+(ipt:parse/print-test
+"P7W"
+:type icalendar-dur-value
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.6/2)
+
+(ipt:parse/print-test
+"1000000.0000001"
+:type icalendar-float
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.7/1)
+
+(ipt:parse/print-test
+"1.333"
+:type icalendar-float
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.7/2)
+
+(ipt:parse/print-test
+"-3.14"
+:type icalendar-float
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.7/3)
+
+(ipt:parse/print-test
+"1234567890"
+:type icalendar-integer
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.8/1)
+
+(ipt:parse/print-test
+"-1234567890"
+:type icalendar-integer
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.8/2)
+
+(ipt:parse/print-test
+"+1234567890"
+;; "+" sign isn't required, so it's not re-printed:
+:expected "1234567890"
+:type icalendar-integer
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.8/3)
+
+(ipt:parse/print-test
+"432109876"
+:type icalendar-integer
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.8/4)
+
+(ipt:parse/print-test
+"19970101T180000Z/19970102T070000Z"
+:type icalendar-period
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.9/1)
+
+(ipt:parse/print-test
+"19970101T180000Z/PT5H30M"
+:type icalendar-period
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.9/2)
+
+(ipt:parse/print-test
+"FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"
+:type icalendar-recur
+: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
+: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
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.10/3)
+
+(ipt:parse/print-test
+"Project XYZ Final Review\\nConference Room - 3B\\nCome Prepared."
+:type icalendar-text
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.11/1)
+
+(ipt:parse/print-test
+;; Local time:
+"230000"
+:type icalendar-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.12/1)
+
+(ipt:parse/print-test
+;; UTC time:
+"070000Z"
+:type icalendar-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.12/2)
+
+(ipt:parse/print-test
+;; Local time:
+"083000"
+:type icalendar-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.12/3)
+
+(ipt:parse/print-test
+;; UTC time:
+"133000Z"
+:type icalendar-time
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.12/4)
+
+(ipt:parse/print-test
+;; Local time with TZ identifier:
+"SOMETIMEPROP;TZID=America/New_York;VALUE=TIME:083000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.3.12/5)
+
+(ipt:parse/print-test
+"http://example.com/my-report.txt"
+:type icalendar-uri
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.13/1)
+
+(ipt:parse/print-test
+"-0500"
+:type icalendar-utc-offset
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc5545-sec3.3.14/1)
+
+(ipt:parse/print-test
+"+0100"
+:type icalendar-utc-offset
+:parser icalendar-parse-value-node
+:printer icalendar-print-value-node
+:source rfc55453.3.14/1)
+
+(ipt:parse/print-test
+"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//hacksw/handcal//NONSGML v1.0//EN
+BEGIN:VEVENT
+UID:19970610T172345Z-AF23B2@example.com
+DTSTAMP:19970610T172345Z
+DTSTART:19970714T170000Z
+DTEND:19970715T040000Z
+SUMMARY:Bastille Day Party
+END:VEVENT
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec3.4/1)
+
+(ipt:parse/print-test
+"DTSTART:19960415T133000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.5/1)
+
+(ipt:parse/print-test
+"BEGIN:VEVENT
+UID:19970901T130000Z-123401@example.com
+DTSTAMP:19970901T130000Z
+DTSTART:19970903T163000Z
+DTEND:19970903T190000Z
+SUMMARY:Annual Employee Review
+CLASS:PRIVATE
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+END:VEVENT
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.1/1)
+
+(ipt:parse/print-test
+"BEGIN:VEVENT
+UID:19970901T130000Z-123402@example.com
+DTSTAMP:19970901T130000Z
+DTSTART:19970401T163000Z
+DTEND:19970402T010000Z
+SUMMARY:Laurel is in sensitivity awareness class.
+CLASS:PUBLIC
+CATEGORIES:BUSINESS,HUMAN RESOURCES
+TRANSP:TRANSPARENT
+END:VEVENT
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.1/2)
+
+(ipt:parse/print-test
+"BEGIN:VEVENT
+UID:19970901T130000Z-123403@example.com
+DTSTAMP:19970901T130000Z
+DTSTART;VALUE=DATE:19971102
+SUMMARY:Our Blissful Anniversary
+TRANSP:TRANSPARENT
+CLASS:CONFIDENTIAL
+CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
+RRULE:FREQ=YEARLY
+END:VEVENT
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.1/3)
+
+(ipt:parse/print-test
+"BEGIN:VEVENT
+UID:20070423T123432Z-541111@example.com
+DTSTAMP:20070423T123432Z
+DTSTART;VALUE=DATE:20070628
+DTEND;VALUE=DATE:20070709
+SUMMARY:Festival International de Jazz de Montreal
+TRANSP:TRANSPARENT
+END:VEVENT
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.1/4)
+
+(ipt:parse/print-test
+"BEGIN:VTODO
+UID:20070313T123432Z-456553@example.com
+DTSTAMP:20070313T123432Z
+DUE;VALUE=DATE:20070501
+SUMMARY:Submit Quebec Income Tax Return for 2006
+CLASS:CONFIDENTIAL
+CATEGORIES:FAMILY,FINANCE
+STATUS:NEEDS-ACTION
+END:VTODO
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.2/1)
+
+(ipt:parse/print-test
+"BEGIN:VTODO
+UID:20070514T103211Z-123404@example.com
+DTSTAMP:20070514T103211Z
+DTSTART:20070514T110000Z
+DUE:20070709T130000Z
+COMPLETED:20070707T100000Z
+SUMMARY:Submit Revised Internet-Draft
+PRIORITY:1
+STATUS:NEEDS-ACTION
+END:VTODO
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.2/2)
+
+(ipt:parse/print-test
+"BEGIN:VJOURNAL
+UID:19970901T130000Z-123405@example.com
+DTSTAMP:19970901T130000Z
+DTSTART;VALUE=DATE:19970317
+SUMMARY:Staff meeting minutes
+DESCRIPTION:1.  Staff meeting: Participants include Joe\\,Lisa\\, and Bob.  Aurora project plans were reviewed.  There is currently no budget reserves for this project.  Lisa will escalate to management.  Next meeting on Tuesday.\\n 2.  Telephone Conference: ABC Corp. sales representative called to discuss new printer.  Promised to get us a demo by Friday.\\n3.  Henry Miller (Handsoff Insurance): Car was totaled by tree.  Is looking into a loaner car. 555-2323 (tel).
+END:VJOURNAL
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.3/1)
+
+(ipt:parse/print-test
+"BEGIN:VFREEBUSY
+UID:19970901T082949Z-FA43EF@example.com
+ORGANIZER:mailto:jane_doe@example.com
+ATTENDEE:mailto:john_public@example.com
+DTSTART:19971015T050000Z
+DTEND:19971016T050000Z
+DTSTAMP:19970901T083000Z
+END:VFREEBUSY
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.4/1)
+
+(ipt:parse/print-test
+"BEGIN:VFREEBUSY
+UID:19970901T095957Z-76A912@example.com
+ORGANIZER:mailto:jane_doe@example.com
+ATTENDEE:mailto:john_public@example.com
+DTSTAMP:19970901T100000Z
+FREEBUSY:19971015T050000Z/PT8H30M,19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
+URL:http://example.com/pub/busy/jpublic-01.ifb
+COMMENT:This iCalendar file contains busy time information for the next three months.
+END:VFREEBUSY
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.4/2)
+
+(ipt:parse/print-test
+;; Corrected.  Original has invalid value in ORGANIZER
+"BEGIN:VFREEBUSY
+UID:19970901T115957Z-76A912@example.com
+DTSTAMP:19970901T120000Z
+ORGANIZER:mailto:jsmith@example.com
+DTSTART:19980313T141711Z
+DTEND:19980410T141711Z
+FREEBUSY:19980314T233000Z/19980315T003000Z
+FREEBUSY:19980316T153000Z/19980316T163000Z
+FREEBUSY:19980318T030000Z/19980318T040000Z
+URL:http://www.example.com/calendar/busytime/jsmith.ifb
+END:VFREEBUSY
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.4/3)
+
+(ipt:parse/print-test
+"BEGIN:VTIMEZONE
+TZID:America/New_York
+LAST-MODIFIED:20050809T050000Z
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19750223T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+END:VTIMEZONE
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.5/1)
+
+(ipt:parse/print-test
+"BEGIN:VTIMEZONE
+TZID:America/New_York
+LAST-MODIFIED:20050809T050000Z
+BEGIN:STANDARD
+DTSTART:20071104T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+END:VTIMEZONE
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.5/2)
+
+(ipt:parse/print-test
+"BEGIN:VTIMEZONE
+TZID:America/New_York
+LAST-MODIFIED:20050809T050000Z
+TZURL:http://zones.example.com/tz/America-New_York.ics
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+END:VTIMEZONE
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.5/3)
+
+(ipt:parse/print-test
+"BEGIN:VTIMEZONE
+TZID:Fictitious
+LAST-MODIFIED:19870101T000000Z
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+END:VTIMEZONE
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.5/4)
+
+(ipt:parse/print-test
+"BEGIN:VTIMEZONE
+TZID:Fictitious
+LAST-MODIFIED:19870101T000000Z
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19990424T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+END:VTIMEZONE
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.5/5)
+
+(ipt:parse/print-test
+"BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:19970317T133000Z
+REPEAT:4
+DURATION:PT15M
+ACTION:AUDIO
+ATTACH;FMTTYPE=audio/basic:ftp://example.com/pub/sounds/bell-01.aud
+END:VALARM
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.6/1)
+
+(ipt:parse/print-test
+"BEGIN:VALARM
+TRIGGER:-PT30M
+REPEAT:2
+DURATION:PT15M
+ACTION:DISPLAY
+DESCRIPTION:Breakfast meeting with executive\\nteam at 8:30 AM EST.
+END:VALARM
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.6/2)
+
+(ipt:parse/print-test
+"BEGIN:VALARM
+TRIGGER;RELATED=END:-P2D
+ACTION:EMAIL
+ATTENDEE:mailto:john_doe@example.com
+SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
+DESCRIPTION:A draft agenda needs to be sent out to the attendees to the weekly managers meeting (MGR-LIST).  Attached is a pointer the document template for the agenda file.
+ATTACH;FMTTYPE=application/msword:http://example.com/templates/agenda.doc
+END:VALARM
+"
+:parser icalendar-parse-component
+:printer icalendar-print-component-node
+:source rfc5545-sec3.6.6/3)
+
+(ipt:parse/print-test
+"CALSCALE:GREGORIAN\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.7.1/1)
+
+(ipt:parse/print-test
+"METHOD:REQUEST\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.7.2/1)
+
+(ipt:parse/print-test
+"PRODID:-//ABC Corporation//NONSGML My Product//EN\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.7.3/1)
+
+(ipt:parse/print-test
+"VERSION:2.0\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.7./1)
+
+(ipt:parse/print-test
+"ATTACH:CID:jsmith.part3.960817T083000.xyzMail@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.1/1)
+
+(ipt:parse/print-test
+"ATTACH;FMTTYPE=application/postscript:ftp://example.com/pub/reports/r-960812.ps\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.1/2)
+
+(ipt:parse/print-test
+"CATEGORIES:APPOINTMENT,EDUCATION\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.2/1)
+
+(ipt:parse/print-test
+"CATEGORIES:MEETING\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.2/2)
+
+(ipt:parse/print-test
+"CLASS:PUBLIC\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.3/1)
+
+(ipt:parse/print-test
+"COMMENT:The meeting really needs to include both ourselves and the customer.  We can't hold this meeting without them.  As a matter of fact\\, the venue for the meeting ought to be at their site. - - John\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.4/1)
+
+(ipt:parse/print-test
+"DESCRIPTION:Meeting to provide technical review for \"Phoenix\" design.\\nHappy Face Conference Room.  Phoenix design team MUST attend this meeting.\\nRSVP to team leader.\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.5/1)
+
+(ipt:parse/print-test
+"GEO:37.386013;-122.082932\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.6/1)
+
+(ipt:parse/print-test
+"LOCATION:Conference Room - F123\\, Bldg. 002\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.7/1)
+
+(ipt:parse/print-test
+"LOCATION;ALTREP=\"http://xyzcorp.com/conf-rooms/f123.vcf\":Conference Room - F123\\, Bldg. 002\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.7/2)
+
+(ipt:parse/print-test
+"PERCENT-COMPLETE:39\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.8/1)
+
+(ipt:parse/print-test
+"PRIORITY:1\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.9/1)
+
+(ipt:parse/print-test
+"PRIORITY:2\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.9/2)
+
+(ipt:parse/print-test
+"PRIORITY:0\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.9/3)
+
+(ipt:parse/print-test
+"RESOURCES:EASEL,PROJECTOR,VCR\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.10/1)
+
+(ipt:parse/print-test
+"RESOURCES;LANGUAGE=fr:Nettoyeur haute pression\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.10/2)
+
+(ipt:parse/print-test
+"STATUS:TENTATIVE\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.11/1)
+
+(ipt:parse/print-test
+"STATUS:NEEDS-ACTION\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.11/2)
+
+(ipt:parse/print-test
+"STATUS:DRAFT\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.11/3)
+
+(ipt:parse/print-test
+"SUMMARY:Department Party\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.1.12/1)
+
+(ipt:parse/print-test
+"COMPLETED:19960401T150000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.1/1)
+
+(ipt:parse/print-test
+"DTEND:19960401T150000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.2/1)
+
+(ipt:parse/print-test
+"DTEND;VALUE=DATE:19980704\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.2/2)
+
+(ipt:parse/print-test
+"DUE:19980430T000000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.3/1)
+
+(ipt:parse/print-test
+"DTSTART:19980118T073000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.4/1)
+
+(ipt:parse/print-test
+"DURATION:PT1H0M0S\n"
+;; 0M and 0S are not re-printed because they don't contribute to the duration:
+:expected "DURATION:PT1H\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.5/1)
+
+(ipt:parse/print-test
+"DURATION:PT15M\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.5/2)
+
+(ipt:parse/print-test
+"FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:19970308T160000Z/PT8H30M\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.6/1)
+
+(ipt:parse/print-test
+"FREEBUSY;FBTYPE=FREE:19970308T160000Z/PT3H,19970308T200000Z/PT1H\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.6/2)
+
+(ipt:parse/print-test
+"FREEBUSY;FBTYPE=FREE:19970308T160000Z/PT3H,19970308T200000Z/PT1H,19970308T230000Z/19970309T000000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.6/3)
+
+(ipt:parse/print-test
+"TRANSP:TRANSPARENT\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.7/1)
+
+(ipt:parse/print-test
+"TRANSP:OPAQUE\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.2.7/2)
+
+(ipt:parse/print-test
+"TZID:America/New_York\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.1/1)
+
+(ipt:parse/print-test
+"TZID:America/New_York\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.1/2)
+
+(ipt:parse/print-test
+"TZID:/example.org/America/New_York\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.1/3)
+
+(ipt:parse/print-test
+"TZNAME:EST\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.2/1)
+
+(ipt:parse/print-test
+"TZNAME;LANGUAGE=fr-CA:HNE\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.2/2)
+
+(ipt:parse/print-test
+"TZOFFSETFROM:-0500\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.3/1)
+
+(ipt:parse/print-test
+"TZOFFSETFROM:+1345\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.3/2)
+
+(ipt:parse/print-test
+"TZOFFSETTO:-0400\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.4/1)
+
+(ipt:parse/print-test
+"TZOFFSETTO:+1245\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.4/2)
+
+(ipt:parse/print-test
+"TZURL:http://timezones.example.org/tz/America-Los_Angeles.ics\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.3.5/1)
+
+(ipt:parse/print-test
+"ATTENDEE;MEMBER=\"mailto:DEV-GROUP@example.com\":mailto:joecool@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/1)
+
+(ipt:parse/print-test
+"ATTENDEE;DELEGATED-FROM=\"mailto:immud@example.com\":mailto:ildoit@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/2)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;CN=Henry Cabot:mailto:hcabot@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/3)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=REQ-PARTICIPANT;DELEGATED-FROM=\"mailto:bob@example.com\";PARTSTAT=ACCEPTED;CN=Jane Doe:mailto:jdoe@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/4)
+
+(ipt:parse/print-test
+"ATTENDEE;CN=John Smith;DIR=\"ldap://example.com:6666/o=ABC%20Industries,c=US???(cn=Jim%20Dolittle)\":mailto:jimdo@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/5)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=TENTATIVE;DELEGATED-FROM=\"mailto:iamboss@example.com\";CN=Henry Cabot:mailto:hcabot@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/6)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=NON-PARTICIPANT;PARTSTAT=DELEGATED;DELEGATED-TO=\"mailto:hcabot@example.com\";CN=The Big Cheese:mailto:iamboss@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/7)
+
+(ipt:parse/print-test
+"ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Jane Doe:mailto:jdoe@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/8)
+
+(ipt:parse/print-test
+;; Corrected.  Original lacks quotes around SENT-BY address.
+"ATTENDEE;SENT-BY=\"mailto:jan_doe@example.com\";CN=John Smith:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.1/9)
+
+(ipt:parse/print-test
+"CONTACT:Jim Dolittle\\, ABC Industries\\, +1-919-555-1234\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.2/1)
+
+(ipt:parse/print-test
+;; Corrected.  Original contained unallowed backslash in ldap: URI
+"CONTACT;ALTREP=\"ldap://example.com:6666/o=ABC%20Industries,c=US???(cn=Jim%20Dolittle)\":Jim Dolittle\\, ABC Industries\\,+1-919-555-1234\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.2/2)
+
+(ipt:parse/print-test
+"CONTACT;ALTREP=\"CID:part3.msg970930T083000SILVER@example.com\":Jim Dolittle\\, ABC Industries\\, +1-919-555-1234\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.2/3)
+
+(ipt:parse/print-test
+"CONTACT;ALTREP=\"http://example.com/pdi/jdoe.vcf\":Jim Dolittle\\, ABC Industries\\, +1-919-555-1234\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.2/4)
+
+(ipt:parse/print-test
+"ORGANIZER;CN=John Smith:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.3/1)
+
+(ipt:parse/print-test
+"ORGANIZER;CN=JohnSmith;DIR=\"ldap://example.com:6666/o=DC%20Associates,c=US???(cn=John%20Smith)\":mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.3/2)
+
+(ipt:parse/print-test
+"ORGANIZER;SENT-BY=\"mailto:jane_doe@example.com\":mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.3/3)
+
+(ipt:parse/print-test
+"RECURRENCE-ID;VALUE=DATE:19960401\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.4/1)
+
+(ipt:parse/print-test
+"RECURRENCE-ID;RANGE=THISANDFUTURE:19960120T120000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.4/2)
+
+(ipt:parse/print-test
+"RELATED-TO:jsmith.part7.19960817T083000.xyzMail@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.5/1)
+
+(ipt:parse/print-test
+"RELATED-TO:19960401-080045-4000F192713-0052@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.5/2)
+
+(ipt:parse/print-test
+"URL:http://example.com/pub/calendars/jsmith/mytime.ics\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.6/1)
+
+(ipt:parse/print-test
+"UID:19960401T080045Z-4000F192713-0052@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.4.7/1)
+
+(ipt:parse/print-test
+"EXDATE:19960402T010000Z,19960403T010000Z,19960404T010000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.1/1)
+
+(ipt:parse/print-test
+"RDATE:19970714T123000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.2/1)
+
+(ipt:parse/print-test
+"RDATE;TZID=America/New_York:19970714T083000\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.2/2)
+
+(ipt:parse/print-test
+"RDATE;VALUE=PERIOD:19960403T020000Z/19960403T040000Z,19960404T010000Z/PT3H\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.2/3)
+
+(ipt:parse/print-test
+"RDATE;VALUE=DATE:19970101,19970120,19970217,19970421,19970526,19970704,19970901,19971014,19971128,19971129,19971225\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.2/4)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;COUNT=10\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/1)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;UNTIL=19971224T000000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/2)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;INTERVAL=2\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/3)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/4)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;UNTIL=20000131T140000Z;BYMONTH=1;BYDAY=SU,MO,TU,WE,TH,FR,SA\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/5)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;UNTIL=20000131T140000Z;BYMONTH=1\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/6)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;COUNT=10\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/7)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;UNTIL=19971224T000000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/8)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;INTERVAL=2;WKST=SU\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/9)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;UNTIL=19971007T000000Z;WKST=SU;BYDAY=TU,TH\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/10)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;COUNT=10;WKST=SU;BYDAY=TU,TH\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/11)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;WKST=SU;BYDAY=MO,WE,FR\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/12)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=8;WKST=SU;BYDAY=TU,TH\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/13)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/14)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;UNTIL=19971224T000000Z;BYDAY=1FR\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/15)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/16)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;COUNT=6;BYDAY=-2MO\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/17)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;BYMONTHDAY=-3\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/18)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;COUNT=10;BYMONTHDAY=2,15\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/19)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;COUNT=10;BYMONTHDAY=1,-1\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/20)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;INTERVAL=18;COUNT=10;BYMONTHDAY=10,11,12,13,14,15\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/21)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=TU\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/22)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;COUNT=10;BYMONTH=6,7\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/23)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;INTERVAL=2;COUNT=10;BYMONTH=1,2,3\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/24)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;INTERVAL=3;COUNT=10;BYYEARDAY=1,100,200\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/25)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;BYDAY=20MO\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/26)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;BYWEEKNO=20;BYDAY=MO\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/27)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=TH\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/28)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;BYDAY=TH;BYMONTH=6,7,8\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/29)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;BYDAY=FR;BYMONTHDAY=13\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/30)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/31)
+
+(ipt:parse/print-test
+"RRULE:FREQ=YEARLY;INTERVAL=4;BYMONTH=11;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/32)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;COUNT=3;BYDAY=TU,WE,TH;BYSETPOS=3\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/33)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/34)
+
+(ipt:parse/print-test
+"RRULE:FREQ=HOURLY;INTERVAL=3;UNTIL=19970902T170000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/35)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MINUTELY;INTERVAL=15;COUNT=6\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/36)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MINUTELY;INTERVAL=90;COUNT=4\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/37)
+
+(ipt:parse/print-test
+"RRULE:FREQ=DAILY;BYHOUR=9,10,11,12,13,14,15,16;BYMINUTE=0,20,40\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/38)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MINUTELY;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/39)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4;BYDAY=TU,SU;WKST=MO\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/40)
+
+(ipt:parse/print-test
+"RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4;BYDAY=TU,SU;WKST=SU\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/41)
+
+(ipt:parse/print-test
+"RRULE:FREQ=MONTHLY;BYMONTHDAY=15,30;COUNT=5\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.5.3/42)
+
+(ipt:parse/print-test
+"ACTION:AUDIO\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.1/1)
+
+(ipt:parse/print-test
+"ACTION:DISPLAY\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.1/2)
+
+(ipt:parse/print-test
+"REPEAT:4\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.2/1)
+
+(ipt:parse/print-test
+"TRIGGER:-PT15M\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.3/1)
+
+(ipt:parse/print-test
+"TRIGGER;RELATED=END:PT5M\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.3/2)
+
+(ipt:parse/print-test
+"TRIGGER;VALUE=DATE-TIME:19980101T050000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.6.3/3)
+
+(ipt:parse/print-test
+"CREATED:19960329T133000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.7.1/1)
+
+(ipt:parse/print-test
+"DTSTAMP:19971210T080000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.7.2/1)
+
+(ipt:parse/print-test
+"LAST-MODIFIED:19960817T133000Z\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.7.3/1)
+
+(ipt:parse/print-test
+"SEQUENCE:0\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.7.4/1)
+
+(ipt:parse/print-test
+"SEQUENCE:2\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.7.4/2)
+
+(ipt:parse/print-test
+"DRESSCODE:CASUAL\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.1/1)
+
+(ipt:parse/print-test
+"NON-SMOKING;VALUE=BOOLEAN:TRUE\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.1/2)
+
+(ipt:parse/print-test
+"X-ABC-MMSUBJ;VALUE=URI;FMTTYPE=audio/basic:http://www.example.org/mysubj.au\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.2/1)
+
+(ipt:parse/print-test
+"REQUEST-STATUS:2.0;Success\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.3/1)
+
+(ipt:parse/print-test
+"REQUEST-STATUS:3.1;Invalid property value;DTSTART:96-Apr-01\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.3/2)
+
+(ipt:parse/print-test
+"REQUEST-STATUS:2.8; Success\\, repeating event ignored.  Scheduled as a single event.;RRULE:FREQ=WEEKLY\\;INTERVAL=2\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.3/3)
+
+(ipt:parse/print-test
+"REQUEST-STATUS:4.1;Event conflict.  Date-time is busy.\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.3/4)
+
+(ipt:parse/print-test
+"REQUEST-STATUS:3.7;Invalid calendar user;ATTENDEE:mailto:jsmith@example.com\n"
+:parser icalendar-parse-property
+:printer icalendar-print-property-node
+:source rfc5545-sec3.8.8.3/5)
+
+(ipt:parse/print-test
+"BEGIN:VCALENDAR
+PRODID:-//xyz Corp//NONSGML PDA Calendar Version 1.0//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:19960704T120000Z
+UID:uid1@example.com
+ORGANIZER:mailto:jsmith@example.com
+DTSTART:19960918T143000Z
+DTEND:19960920T220000Z
+STATUS:CONFIRMED
+CATEGORIES:CONFERENCE
+SUMMARY:Networld+Interop Conference
+DESCRIPTION:Networld+Interop Conference and Exhibit\\nAtlanta World Congress Center\\nAtlanta\\, Georgia
+END:VEVENT
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/1)
+
+(ipt:parse/print-test
+"BEGIN:VCALENDAR
+PRODID:-//RDU Software//NONSGML HandCal//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/New_York
+BEGIN:STANDARD
+DTSTART:19981025T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19990404T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:19980309T231000Z
+UID:guid-1.example.com
+ORGANIZER:mailto:mrbig@example.com
+ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:employee-A@example.com
+DESCRIPTION:Project XYZ Review Meeting
+CATEGORIES:MEETING
+CLASS:PUBLIC
+CREATED:19980309T130000Z
+SUMMARY:XYZ Project Review
+DTSTART;TZID=America/New_York:19980312T083000
+DTEND;TZID=America/New_York:19980312T093000
+LOCATION:1CP Conference Room 4350
+END:VEVENT
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/2)
+
+(ipt:parse/print-test
+"BEGIN:VCALENDAR
+METHOD:xyz
+VERSION:2.0
+PRODID:-//ABC Corporation//NONSGML My Product//EN
+BEGIN:VEVENT
+DTSTAMP:19970324T120000Z
+SEQUENCE:0
+UID:uid3@example.com
+ORGANIZER:mailto:jdoe@example.com
+ATTENDEE;RSVP=TRUE:mailto:jsmith@example.com
+DTSTART:19970324T123000Z
+DTEND:19970324T210000Z
+CATEGORIES:MEETING,PROJECT
+CLASS:PUBLIC
+SUMMARY:Calendaring Interoperability Planning Meeting
+DESCRIPTION:Discuss how we can test c&s interoperability\\nusing iCalendar and other IETF standards.
+LOCATION:LDB Lobby
+ATTACH;FMTTYPE=application/postscript:ftp://example.com/pub/conf/bkgrnd.ps
+END:VEVENT
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/3)
+
+(ipt:parse/print-test
+;; Corrected.  The TRIGGER property originally did not specify
+;; VALUE=DATE-TIME, which is required since it is not the default type.
+;; See https://www.rfc-editor.org/errata/eid2039
+"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//ABC Corporation//NONSGML My Product//EN
+BEGIN:VTODO
+DTSTAMP:19980130T134500Z
+SEQUENCE:2
+UID:uid4@example.com
+ORGANIZER:mailto:unclesam@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:jqpublic@example.com
+DUE:19980415T000000
+STATUS:NEEDS-ACTION
+SUMMARY:Submit Income Taxes
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;VALUE=DATE-TIME:19980403T120000Z
+ATTACH;FMTTYPE=audio/basic:http://example.com/pub/audio-files/ssbanner.aud
+REPEAT:4
+DURATION:PT1H
+END:VALARM
+END:VTODO
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/4)
+
+(ipt:parse/print-test
+"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//ABC Corporation//NONSGML My Product//EN
+BEGIN:VJOURNAL
+DTSTAMP:19970324T120000Z
+UID:uid5@example.com
+ORGANIZER:mailto:jsmith@example.com
+STATUS:DRAFT
+CLASS:PUBLIC
+CATEGORIES:Project Report,XYZ,Weekly Meeting
+DESCRIPTION:Project xyz Review Meeting Minutes\\nAgenda\\n1.  Review of project version 1.0 requirements.\\n2.Definitionof project processes.\\n3.  Review of project schedule.\\nParticipants: John Smith\\, Jane Doe\\, Jim Dandy\\n-It was decided that the requirements need to be signed off byproduct marketing.\\n-P roject processes were accepted.\\n-Project schedule needs to account for scheduled holidaysand employee vacation time.  Check with HR for specificdates.\\n-New schedule will be distributed by Friday.\\n-Next weeks meeting is cancelled.  No meeting until 3/23.
+END:VJOURNAL
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/5)
+
+(ipt:parse/print-test
+;; Corrected.  Original text in the standard is missing UID and DTSTAMP.
+;; See https://www.rfc-editor.org/errata/eid4149
+"BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//RDU Software//NONSGML HandCal//EN
+BEGIN:VFREEBUSY
+UID:19970901T115957Z-76A912@example.com
+DTSTAMP:19970901T120000Z
+ORGANIZER:mailto:jsmith@example.com
+DTSTART:19980313T141711Z
+DTEND:19980410T141711Z
+FREEBUSY:19980314T233000Z/19980315T003000Z
+FREEBUSY:19980316T153000Z/19980316T163000Z
+FREEBUSY:19980318T030000Z/19980318T040000Z
+URL:http://www.example.com/calendar/busytime/jsmith.ifb
+END:VFREEBUSY
+END:VCALENDAR
+"
+:parser icalendar-parse-calendar
+:printer icalendar-print-calendar-node
+:source rfc5545-sec4/6)
+
+
+;; Tests from real world data:
+(ert-deftest ipt:bad-organizer-params ()
+  "Real example: bad ORGANIZER property with params introduced by colon"
+  (let ((bad "ORGANIZER:CN=ORGANIZER:mailto:anonymized@domain.example\n")
+        (ok  "ORGANIZER;CN=ORGANIZER:mailto:anonymized@domain.example\n"))
+    (should-error (ical:parse-from-string 'ical:organizer bad))
+    (should (ical:ast-node-p (ical:parse-from-string 'ical:organizer ok)))))
+
+(ert-deftest ipt:bad-attendee ()
+  "Real example: bad ATTENDEE property missing mailto: prefix"
+  (let ((bad "ATTENDEE;ROLE=REQ-PARTICIPANT;CN=TRAVELLER:anonymized@domain.example\n")
+        (ok  "ATTENDEE;ROLE=REQ-PARTICIPANT;CN=TRAVELLER:mailto:anonymized@domain.example\n"))
+    (should-error (ical:parse-from-string 'ical:attendee bad))
+    (should (ical:ast-node-p (ical:parse-from-string 'ical:attendee ok)))))
+
+(ert-deftest ipt:bad-attach ()
+  "Real example: bad ATTACH property containing broken URI"
+  (let ((bad "ATTACH;VALUE=URI:Glass\n")
+        (ok  "ATTACH;VALUE=URI:https://example.com\n"))
+    (should-error (ical:parse-from-string 'ical:attach bad))
+    (should (ical:ast-node-p (ical:parse-from-string 'ical:attach ok)))))
+
+(ert-deftest ipt:bad-cnparam ()
+  "Real example: bad unquoted CN parameter containing a comma"
+  (let ((bad "ORGANIZER;CN=Hartlauer Geschäft Wien, Taborstr. 18:mailto:anonymized@domain.example\n")
+        (ok  "ORGANIZER;CN=\"Hartlauer Geschäft Wien, Taborstr. 18\":mailto:anonymized@domain.example\n"))
+    ;; strict parser should reject bad but accept ok:
+    (let ((ical:parse-strictly t))
+      (should (ical:ast-node-p (ical:parse-from-string 'ical:organizer ok)))
+      (should-error (ical:parse-from-string 'ical:organizer bad)))
+    ;; relaxed parser should accept bad:
+    (let ((ical:parse-strictly nil))
+      (should (ical:ast-node-p (ical:parse-from-string 'ical:organizer bad))))))
+
+(ert-deftest ipt:fix-bad-description ()
+  "Real example: bad DESCRIPTION property containing blank lines,
+fixed by `icalendar-fix-blank-lines'."
+  (let ((bad "BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VEVENT
+UID:45dd7698-5c53-47e3-9280-19c5dff62571
+PRIORITY:1
+DTSTART:20210721T175200
+DTEND:20210721T192400
+LOCATION:Verona Porta Nuova
+DESCRIPTION:Verona Porta Nuova-Firenze S. M. Novella;Train: Frecciarossa 8527, departing from Verona Porta Nuova Hours: 17:52; arriving at Firenze S. M. Novella Hours: 19:24 Coach 8, Position 7A; pnr code CLS345
+
+
+SUMMARY:Trip Verona Porta Nuova-Firenze S. M. Novella, Train Frecciarossa 8527, Coach 8, Position 7A, PNR CLS345,
+ORGANIZER;CN=ORGANIZER:mailto:anonymized@domain.example
+ATTENDEE;ROLE=REQ-PARTICIPANT;CN=BUYER:mailto:anonymized@domain.example
+ATTENDEE;ROLE=REQ-PARTICIPANT;CN=TRAVELLER:mailto:anonymized@domain.example
+END:VEVENT
+END:VCALENDAR
+"))
+    ;; The default parser should produce an error on the blank lines in
+    ;; DESCRIPTION:
+    (let ((ical:pre-parsing-hook nil))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (ical:parse)
+        ;; Parsing should produce error at the bad description property:
+        (should (ical:errors-p))))
+    ;; cleaning up the blank lines before parsing should correct this:
+    (let ((ical:pre-parsing-hook '(ical:fix-blank-lines)))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (let ((vcal (ical:parse)))
+          (should (not (ical:errors-p)))
+          (ical:with-component vcal
+              ((ical:vevent vevent))
+            (ical:with-component vevent
+                ((ical:description :value description))
+              (let* ((expected "CLS345")
+                     (end (length description))
+                     (start (- end (length expected))))
+              (should (equal expected
+                             (substring description start end)))))))))))
+
+(ert-deftest ipt:bad-hyphenated-dates ()
+  "Real example: bad date values containing hyphens, fixed by
+`icalendar-fix-hyphenated-dates'."
+  (let ((bad "BEGIN:VCALENDAR
+X-LOTUS-CHARSET:UTF-8
+VERSION:2.0
+PRODID:http://www.bahn.de
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:bahn2023-08-29141400
+CLASS:PUBLIC
+SUMMARY:Frankfurt(Main)Hbf -> Hamburg Hbf
+DTSTART;TZID=Europe/Berlin:2023-08-29T141400
+DTEND;TZID=Europe/Berlin:2023-08-29T183600
+DTSTAMP:2023-07-30T194700Z
+END:VEVENT
+END:VCALENDAR
+"))
+    ;; default parser should skip the invalid DTSTART, DTEND, and DTSTAMP values:
+    (let ((ical:pre-parsing-hook nil))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (let ((vcal (ical:parse)))
+          ;; Parsing should produce errors as the bad properties are
+          ;; skipped:
+          (should (ical:errors-p))
+          ;; The resulting calendar is invalid because the VEVENT
+          ;; contains no DTSTAMP:
+          (should-error (ical:ast-node-valid-p vcal t)))))
+    ;; cleaning up the hyphenated dates before parsing should correct
+    ;; these problems:
+    (let ((ical:pre-parsing-hook '(ical:fix-hyphenated-dates)))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (let ((vcal (ical:parse))
+              (expected-dtstamp
+               (ical:make-date-time :year 2023 :month 7 :day 30
+                                    :hour 19 :minute 47 :second 0
+                                    :zone 0)))
+          (should (not (ical:errors-p)))
+          (should (ical:ast-node-valid-p vcal t))
+          (ical:with-component vcal
+              ((ical:vevent vevent))
+            (ical:with-component vevent
+                ((ical:dtstamp :value dtstamp))
+              (should (equal dtstamp expected-dtstamp)))))))))
+
+(ert-deftest ipt:bad-user-addresses ()
+  "Real example: bad calendar user addresses missing \"mailto:\", fixed by
+`icalendar-fix-missing-mailtos'."
+  (let ((bad "BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:missing
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VEVENT
+UID:45dd7698-5c53-47e3-9280-19c5dff62571
+PRIORITY:1
+DTSTART:20210721T175200
+DTEND:20210721T192400
+LOCATION:Verona Porta Nuova
+SUMMARY:Trip Verona Porta Nuova-Firenze S. M. Novella
+ORGANIZER;SENT-BY=\"other@domain.example\":anonymized@domain.example
+ATTENDEE;ROLE=REQ-PARTICIPANT;CN=TRAVELER:traveler@domain.example
+END:VEVENT
+END:VCALENDAR
+"))
+    (let ((ical:pre-parsing-hook nil))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (ical:parse)
+        ;; Parsing should produce errors as the bad properties are
+        ;; skipped:
+        (should (ical:errors-p))))
+    ;; cleaning up the addresses before parsing should correct
+    ;; these problems:
+    (let ((ical:pre-parsing-hook '(ical:fix-missing-mailtos)))
+      (with-temp-buffer
+        (ical:init-error-buffer)
+        (insert bad)
+        (goto-char (point-min))
+        (let ((vcal (ical:parse))
+              (expected-attendee "mailto:traveler@domain.example")
+              (expected-organizer "mailto:anonymized@domain.example")
+              (expected-sender "mailto:other@domain.example"))
+          (should (not (ical:errors-p)))
+          (ical:with-component vcal
+              ((ical:vevent vevent))
+            (ical:with-component vevent
+                ((ical:attendee :value attendee)
+                 (ical:organizer :value organizer))
+              (should (equal attendee expected-attendee))
+              (should (equal organizer expected-organizer))
+              (ical:with-property organizer
+                  ((ical:sentbyparam :value sent-by))
+                  (should (equal sent-by expected-sender))))))))))
+
+
+
+
+;; Local Variables:
+;; read-symbol-shorthands: (("ipt:" . "icalendar-parser-test-") ("ical:" . "icalendar-"))
+;; End:
+;;; icalendar-parser-tests.el ends here
diff --git a/test/lisp/calendar/icalendar-recur-tests.el b/test/lisp/calendar/icalendar-recur-tests.el
new file mode 100644
index 00000000000..1df2c5b17e5
--- /dev/null
+++ b/test/lisp/calendar/icalendar-recur-tests.el
@@ -0,0 +1,2880 @@
+;;; icalendar-recur-tests.el --- Tests for icalendar-recur  -*- lexical-binding: t; -*-
+;; Copyright (C) 2025 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+(require 'ert)
+(eval-when-compile (require 'icalendar-macs))
+(require 'icalendar-recur)
+(require 'icalendar-utils)
+(require 'icalendar-parser)
+(require 'icalendar-ast)
+
+;; Some constants for tests that use time zones:
+(defconst ict:tz-eastern
+  (ical:parse-from-string 'ical:vtimezone
+"BEGIN:VTIMEZONE
+TZID:America/New_York
+LAST-MODIFIED:20050809T050000Z
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19740106T020000
+RDATE:19750223T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+END:STANDARD
+END:VTIMEZONE
+")
+"`icalendar-vtimezone' representing America/New_York (Eastern) time.")
+
+(defconst ict:est-latest
+  (ical:with-component ict:tz-eastern
+      ((ical:standard :all stds))
+    (seq-find (lambda (obs)
+                (ical:date-time=
+                 (ical:make-date-time :year 2007 :month 11 :day 4
+                                      :hour 2 :minute 0 :second 0)
+                 (ical:with-property-of obs 'ical:dtstart nil value)))
+              stds))
+  "The observance of Eastern Standard Time which began 2007-11-04")
+
+(defconst ict:edt-latest
+  (ical:with-component ict:tz-eastern
+      ((ical:daylight :all dls))
+    (seq-find (lambda (obs)
+                (ical:date-time=
+                 (ical:make-date-time :year 2007 :month 3 :day 11
+                                      :hour 2 :minute 0 :second 0)
+                 (ical:with-property-of obs 'ical:dtstart nil value)))
+              dls))
+  "The observance of Eastern Daylight Time which began 2007-03-11")
+
+(defconst ict:est -18000  ;; = -0500
+  "UTC offset for Eastern Standard Time")
+
+(defconst ict:edt -14400 ;; = -0400
+  "UTC offset for Eastern Daylight Time")
+
+
+;; Tests for basic functions:
+
+(ert-deftest ict:recur-bysetpos-filter ()
+  "Test that `icr:make-bysetpos-filter' filters correctly by position"
+  (let* ((t1 (list 1 1 2024))
+         (t2 (list 2 1 2024))
+         (t3 (list 12 30 2024))
+         (dts (list t1 t2 t3))
+         (filter (icr:make-bysetpos-filter (list 1 -1)))
+         (filtered (funcall filter dts)))
+    (should (member t1 filtered))
+    (should (member t3 filtered))
+    (should-not (member t2 filtered))))
+
+(ert-deftest ict:recur-yearday-number ()
+  "Test that `calendar-date-from-day-of-year' finds correct dates"
+  (let* ((year 2025)
+         (daynos (list '(1 . (1 1 2025))
+                       '(8 . (1 8 2025))
+                       '(-1 . (12 31 2025))
+                       '(363 . (12 29 2025)))))
+    (dolist (d daynos)
+      (let ((dayno (car d))
+            (date (cdr d)))
+        (should
+         (equal date (calendar-date-from-day-of-year year dayno)))))))
+
+(ert-deftest ict:date-time-add ()
+  "Does `ical:date-time-add' correctly handle time zone transitions?"
+  ;; A sum that does not use a time zone at all:
+  (let* ((dt (ical:make-date-time :year 2007 :month 1 :day 1
+                                  :hour 12 :minute 0 :second 0))
+         (delta (make-decoded-time :day 2))
+         (expected (ical:date-time-variant dt :day 3)))
+    (should (equal expected (ical:date-time-add dt delta))))
+
+  ;; A sum that does not cross an observance boundary:
+  (let* ((dt (ical:make-date-time :year 2007 :month 2 :day 1
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (delta (make-decoded-time :day 2))
+         (expected (ical:date-time-variant dt :day 3 :tz 'preserve)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that crosses the Std->DST boundary and should preserve clock time:
+  (let* ((dt (ical:make-date-time :year 2007 :month 3 :day 10
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (delta (make-decoded-time :day 2))
+         (expected (ical:date-time-variant dt :day 12 :zone ict:edt :dst t)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that crosses the Std->DST boundary and should be exactly 48 hours later:
+  (let* ((dt (ical:make-date-time :year 2007 :month 3 :day 10
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (delta (make-decoded-time :hour 48))
+         (expected (ical:date-time-variant dt :day 12 :hour 13
+                                           :zone ict:edt :dst t)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that crosses the DST->Std boundary and should preserve clock time:
+  (let* ((dt (ical:make-date-time :year 2007 :month 11 :day 3
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (delta (make-decoded-time :day 2))
+         (expected (ical:date-time-variant dt :day 5 :zone ict:est :dst nil)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that crosses the DST->Std boundary and should be exactly 48 hours later:
+  (let* ((dt (ical:make-date-time :year 2007 :month 11 :day 3
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (delta (make-decoded-time :hour 48))
+         (expected (ical:date-time-variant dt :day 5 :hour 11
+                                           :zone ict:est :dst nil)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that lands exactly on the Std->DST boundary and should result
+  ;; in a clock time one hour later:
+  (let* ((dt (ical:make-date-time :year 2007 :month 3 :day 10
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (delta (make-decoded-time :hour 24))
+         (expected (ical:date-time-variant dt :day 11 :hour 3
+                                           :zone ict:edt :dst t)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern))))
+
+  ;; A sum that lands exactly on the DST->Std boundary and should result
+  ;; in a clock time one hour earlier:
+  (let* ((dt (ical:make-date-time :year 2007 :month 11 :day 3
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (delta (make-decoded-time :hour 24))
+         (expected (ical:date-time-variant dt :day 4 :hour 1
+                                           :zone ict:est :dst nil)))
+    (should (equal expected (ical:date-time-add dt delta ict:tz-eastern)))))
+
+(ert-deftest ict:recur-nonexistent-date-time-p ()
+  "Does `icr:nonexistent-date-time-p' correctly identify nonexistent times?"
+  (let*  ((dst-onset (ical:make-date-time :year 2025 :month 3 :day 9
+                                          :hour 2 :minute 0 :second 0
+                                          :zone ict:est :dst nil))
+          ;; 2:30 AM falls into the gap when shifting from 2AM EST to 3AM EDT:
+          (nonexistent1 (ical:make-date-time :year 2025 :month 3 :day 9
+                                             :hour 2 :minute 30 :second 0
+                                             :zone ict:est :dst nil))
+          (nonexistent2 (ical:date-time-variant nonexistent1
+                                                :zone ict:edt :dst t))
+          (std-onset (ical:make-date-time :year 2025 :month 11 :day 2
+                                          :hour 2 :minute 0 :second 0
+                                          :zone ict:edt :dst t))
+          ;; 1:30AM around the shift back to EST exists twice (once in
+          ;; EDT, once in EST) and should not be nonexistent:
+          (existent1 (ical:make-date-time :year 2025 :month 11 :day 2
+                                          :hour 1 :minute 30 :second 0
+                                          :zone ict:edt :dst t))
+          (existent2 (ical:make-date-time :year 2025 :month 11 :day 2
+                                          :hour 1 :minute 30 :second 0
+                                          :zone ict:est :dst nil)))
+    (should (icr:nonexistent-date-time-p nonexistent1 dst-onset ict:edt-latest))
+    (should (icr:nonexistent-date-time-p nonexistent2 dst-onset ict:edt-latest))
+    (should-not
+     (icr:nonexistent-date-time-p existent1 std-onset ict:est-latest))
+    (should-not
+     (icr:nonexistent-date-time-p existent2 std-onset ict:est-latest))))
+
+(ert-deftest ict:recur-date-time-occurs-twice-p ()
+  "Does `icr:date-time-occurs-twice-p' correctly identify times that occur twice?"
+  (let*  ((std-onset (ical:make-date-time :year 2025 :month 11 :day 2
+                                          :hour 2 :minute 0 :second 0
+                                          :zone ict:edt :dst t))
+          ;; 1:00, 1:30 AM occur twice when shifting from 2AM EDT to 1AM EST:
+          (twice1 (ical:make-date-time :year 2025 :month 11 :day 2
+                                       :hour 1 :minute 0 :second 0))
+          (twice2 (ical:make-date-time :year 2025 :month 11 :day 2
+                                       :hour 1 :minute 30 :second 0))
+          ;; 12:59 AM, 2AM should not occur twice:
+          (once1 (ical:make-date-time :year 2025 :month 11 :day 2
+                                      :hour 0 :minute 59 :second 0
+                                      :zone ict:edt :dst t))
+          (once2 (ical:make-date-time :year 2025 :month 11 :day 2
+                                      :hour 2 :minute 0 :second 0
+                                      :zone ict:est :dst nil)))
+    (should (icr:date-time-occurs-twice-p twice1 std-onset ict:est-latest))
+    (should (icr:date-time-occurs-twice-p twice2 std-onset ict:est-latest))
+    (should-not
+     (icr:date-time-occurs-twice-p once1 std-onset ict:est-latest))
+    (should-not
+     (icr:date-time-occurs-twice-p once2 std-onset ict:est-latest))))
+
+(ert-deftest ict:recur-find-secondly-interval ()
+  "Does `icr:find-secondly-interval' find correct intervals?"
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 1
+                                       :hour 0 :minute 0 :second 0
+                                       ;; Use UTC for the tests with no
+                                       ;; time zone, so that the results
+                                       ;; don't depend on system's local time
+                                       :zone 0))
+         (dtstart/tz (ical:date-time-variant dtstart :zone ict:est :dst nil)))
+
+    ;; Year numbers are monotonically increasing in the following test cases,
+    ;; to make it easy to tell which of them fails.
+
+    ;; No timezone, just clock time, around a target that doesn't fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2026 :second 5 :zone 0))
+           (expected-int
+            (list
+             (ical:date-time-variant target :second 0 :tz 'preserve)
+             (ical:date-time-variant target :second 1 :tz 'preserve)
+             (ical:date-time-variant target :second 10 :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart 10))))
+
+    ;; No timezone, just clock time, around a target that does fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2027 :second 10 :zone 0))
+           (expected-int
+            (list
+             (ical:date-time-variant target :second 10 :tz 'preserve)
+             (ical:date-time-variant target :second 11 :tz 'preserve)
+             (ical:date-time-variant target :second 20 :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart 10))))
+
+    ;; With timezone, around a target that falls on an interval
+    ;; boundary, in the same observance:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2028 :month 2 :second 20
+                                           :zone ict:est :dst nil))
+           (expected-int
+            (list
+             (ical:date-time-variant target :second 20 :tz 'preserve)
+             (ical:date-time-variant target :second 21 :tz 'preserve)
+             (ical:date-time-variant target :second 30 :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart/tz 10
+                                          ict:tz-eastern))))
+
+    ;; With timezone, around a target that does not fall on an interval
+    ;; boundary, and after the time zone observance shift:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2029 :month 5 :second 30
+                                           :zone ict:edt :dst t))
+           (expected-int
+            (list
+             (ical:date-time-variant target :second 30 :tz 'preserve)
+             (ical:date-time-variant target :second 31 :tz 'preserve)
+             (ical:date-time-variant target :second 40 :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart/tz 10 ict:tz-eastern))))
+
+    ;; With timezone, around a target that falls into the gap in local
+    ;; times and thus does not exist as a local time.  In this case, what
+    ;; is supposed to happen is that the clock time value in the [observance]
+    ;; recurrences "is interpreted using the UTC offset before the gap
+    ;; in local times."  So we should get the same absolute times back,
+    ;; but re-decoded into the new observance, i.e., one hour later.
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2030 :month 3 :day 10
+                                           :hour 2 :minute 30 :second 0
+                                           :zone ict:est :dst nil))
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 3 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 3 :second 1
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target
+                                     :hour 3 :second 10
+                                     :zone ict:edt :dst t))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart/tz 10 ict:tz-eastern))))
+
+    ;; With timezone, with a "pathological" interval size of 59 seconds.
+    ;; There should be no problem with this case, because the interval
+    ;; bounds calculation is done in absolute time, but it's annoying to
+    ;; calculate the expected interval by hand:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2031 :month 4 :day 15
+                                           :hour 12 :minute 0 :second 0
+                                           :zone ict:edt :dst t))
+           (intsize 59)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 11 :minute 59 :second 16
+                                     :tz 'preserve)
+             (ical:date-time-variant target :hour 11 :minute 59 :second 17
+                                     :tz 'preserve)
+             (ical:date-time-variant target :hour 12 :minute 0 :second 15
+                                     :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-secondly-interval target dtstart/tz intsize
+                                          ict:tz-eastern))))))
+
+(ert-deftest ict:recur-find-minutely-interval ()
+  "Does `icr:find-minutely-interval' find correct intervals?"
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 1
+                                       :hour 0 :minute 0
+                                       ;; make sure intervals are
+                                       ;; bounded on whole minutes:
+                                       :second 23))
+         (dtstart/tz (ical:date-time-variant dtstart :zone ict:est :dst nil)))
+
+    ;; Year numbers are monotonically increasing in the following test cases,
+    ;; to make it easy to tell which of them fails.
+
+    ;; No timezone, just a fixed offset, around a target that doesn't fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2026 :minute 5))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :minute 0 :second 0)
+             (ical:date-time-variant target :minute 1 :second 0)
+             (ical:date-time-variant target :minute 10 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-minutely-interval target dtstart intsize))))
+
+    ;; No timezone, just clock time, around a target that does fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2027 :minute 10))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :minute 10 :second 0)
+             (ical:date-time-variant target :minute 11 :second 0)
+             (ical:date-time-variant target :minute 20 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-minutely-interval target dtstart intsize))))
+
+    ;; With timezone, around a target that falls on an interval
+    ;; boundary, in the same observance:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2028 :month 2 :minute 20
+                                           :zone ict:est :dst nil))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :minute 20 :second 0
+                                     :zone ict:est :dst nil)
+             (ical:date-time-variant target :minute 21 :second 0
+                                     :zone ict:est :dst nil)
+             (ical:date-time-variant target :minute 30 :second 0
+                                     :zone ict:est :dst nil))))
+      (should
+       (equal expected-int
+              (icr:find-minutely-interval target dtstart/tz intsize
+                                          ict:tz-eastern))))
+
+    ;; With timezone, around a target that does not fall on an interval
+    ;; boundary, and after the time zone observance shift:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2029 :month 5 :minute 30
+                                           :zone ict:edt :dst t))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :minute 30 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :minute 31 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :minute 40 :second 0
+                                     :zone ict:edt :dst t))))
+      (should
+       (equal expected-int
+              (icr:find-minutely-interval target dtstart/tz intsize
+                                          ict:tz-eastern))))
+
+    ;; With timezone, around a target that falls into the gap in local
+    ;; times and thus does not exist as a local time.  In this case, what
+    ;; is supposed to happen is that the clock time value in the [observance]
+    ;; recurrences "is interpreted using the UTC offset before the gap
+    ;; in local times."  So we should get the same absolute times back,
+    ;; but re-decoded into the new observance, i.e., one hour later.
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2030 :month 3 :day 10
+                                           :hour 2 :minute 30 :second 0
+                                           :zone ict:est :dst nil))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 3 :minute 30 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 3 :minute 31 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target
+                                     :hour 3 :minute 40 :second 0
+                                     :zone ict:edt :dst t))))
+      (should
+       (equal expected-int
+              (icr:find-minutely-interval target dtstart/tz intsize
+                                          ict:tz-eastern))))))
+
+(ert-deftest ict:recur-find-hourly-interval ()
+  "Does `icr:find-hourly-interval' find correct intervals?"
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 1
+                                       :hour 0
+                                       ;; make sure intervals are bounded on
+                                       ;; whole hours:
+                                       :minute 11 :second 23))
+         (dtstart/tz (ical:date-time-variant dtstart :zone ict:est :dst nil)))
+
+    ;; Year numbers are monotonically increasing in the following test cases,
+    ;; to make it easy to tell which of them fails.
+    ;; No timezone, just clock time, around a target that doesn't fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2026 :hour 5))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :hour 1 :minute 0 :second 0)
+             (ical:date-time-variant target :hour 10 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-hourly-interval target dtstart intsize))))
+
+    ;; No timezone, just clock time, around a target that does fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2027 :hour 10))
+           (intsize 10)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 10 :minute 0 :second 0)
+             (ical:date-time-variant target :hour 11 :minute 0 :second 0)
+             (ical:date-time-variant target :hour 20 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-hourly-interval target dtstart intsize))))
+
+    ;; With timezone, around a target that falls on an interval
+    ;; boundary, in the same observance:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2028 :month 2 :hour 10
+                                           :zone ict:est :dst nil))
+           (intsize 2)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 10 :minute 0 :second 0
+                                     :zone ict:est :dst nil)
+             (ical:date-time-variant target :hour 11 :minute 0 :second 0
+                                     :zone ict:est :dst nil)
+             (ical:date-time-variant target :hour 12 :minute 0 :second 0
+                                     :zone ict:est :dst nil))))
+      (should
+       (equal expected-int
+              (icr:find-hourly-interval target dtstart/tz intsize
+                                        ict:tz-eastern))))
+
+    ;; With time zone, around a target that does not fall on an interval
+    ;; boundary, and after the time zone observance shift.  Note that
+    ;; because of our decision to calculate with absolute times in
+    ;; SECONDLY/MINUTELY/HOURLY rules (see `icr:find-secondly-recurrence-rule')
+    ;; the interval clock times shift an hour here:
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2029 :month 5 :hour 12
+                                           :zone ict:edt :dst t))
+           (intsize 2)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 11 :minute 0 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 12 :minute 0 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 13 :minute 0 :second 0
+                                     :zone ict:edt :dst t))))
+      (should
+       (equal expected-int
+              (icr:find-hourly-interval target dtstart/tz intsize
+                                        ict:tz-eastern))))
+
+    ;; With timezone, around a target that falls into the gap in local
+    ;; times and thus does not exist as a local time.  In this case, what
+    ;; is supposed to happen is that the clock time value in the [observance]
+    ;; recurrences "is interpreted using the UTC offset before the gap
+    ;; in local times."  So we should get the same absolute times back,
+    ;; but re-decoded into the new observance, i.e., one hour later.
+    (let* ((target (ical:make-date-time :year 2030 :month 3 :day 10
+                                        :hour 2 :minute 30 :second 30
+                                        :zone ict:est :dst nil))
+           (intsize 2)
+           (expected-int
+            (list
+             (ical:date-time-variant target :hour 3 :minute 0 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 4 :minute 0 :second 0
+                                     :zone ict:edt :dst t)
+             (ical:date-time-variant target :hour 5 :minute 0 :second 0
+                                     :zone ict:edt :dst t))))
+      (should
+       (equal expected-int
+              (icr:find-hourly-interval target dtstart/tz intsize
+                                        ict:tz-eastern))))))
+
+(ert-deftest ict:recur-find-daily-interval-w/date ()
+  "Does `icr:find-daily-interval' find correct date intervals?"
+  (let* ((dtstart (list 1 8 2025)))
+    ;; Since all the results should be the same after the initial
+    ;; calculation of the absolute dates DTSTART and TARGET, we just
+    ;; test one simple case here and test with date-times more
+    ;; thoroughly below.
+
+    ;; A target that doesn't fall on an interval boundary:
+    (let* ((target (list 1 9 2026))
+           (intsize 7)
+           (expected-int
+            (list
+             (ical:make-date-time :year 2026 :month 1 :day 7
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2026 :month 1 :day 8
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2026 :month 1 :day 14
+                                  :hour 0 :minute 0 :second 0))))
+      (should (equal expected-int
+                     (icr:find-daily-interval target dtstart intsize))))))
+
+(ert-deftest ict:recur-find-daily-interval-w/date-time ()
+  "Does `icr:find-daily-interval' find correct date-time intervals?"
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 8 ; a Wednesday
+                                       ;; make sure intervals are bounded on
+                                       ;; whole days:
+                                       :hour 7 :minute 11 :second 23))
+         (dtstart/tz (ical:date-time-variant dtstart :zone ict:est :dst nil)))
+
+    ;; Year numbers are monotonically increasing in the following test cases,
+    ;; to make it easy to tell which of them fails.
+
+    ;; No timezone, just clock time, around a target that doesn't fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart
+                                              :year 2026 :month 1 :day 9))
+           (intsize 7)
+           (expected-int
+            (list
+             (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 8 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 14
+                                     :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-daily-interval target dtstart intsize))))
+
+    ;; No timezone, just clock time, around a target that does fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2027 :month 1 :day 6))
+           (intsize 7)
+           (expected-int
+            (list
+             (ical:date-time-variant target :day 6 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 13 :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-daily-interval target dtstart intsize))))
+
+    ;; With timezone, around a target that falls on an interval
+    ;; boundary, in the same observance:
+    (let* ((target (ical:date-time-variant dtstart/tz :year 2028 :month 2 :day 2
+                                           :zone ict:est :dst nil))
+           (intsize 7)
+           (expected-int
+            (list
+             (ical:date-time-variant target :day 2 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve)
+             (ical:date-time-variant target :day 3 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve)
+             (ical:date-time-variant target :day 9 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-daily-interval target dtstart/tz intsize ict:tz-eastern))))
+
+    ;; With time zone, around a target that does not fall on an interval
+    ;; boundary, and after the time zone observance shift.
+    (let* ((target (ical:date-time-variant dtstart/tz
+                                           :year 2029 :month 5 :day 28
+                                           :zone ict:edt :dst t))
+           (intsize 7)
+           (expected-int
+            (list
+             (ical:date-time-variant target :day 23 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve)
+             (ical:date-time-variant target :day 24 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve)
+             (ical:date-time-variant target :day 30 :hour 0 :minute 0 :second 0
+                                     :tz 'preserve))))
+      (should
+       (equal expected-int
+              (icr:find-daily-interval target dtstart/tz intsize
+                                       ict:tz-eastern))))))
+
+(ert-deftest ict:recur-find-weekly-interval-w/date ()
+  "Does `icr:find-weekly-interval' find correct date intervals?"
+  (let* ((dtstart '(1 8 2025)))
+    ;; Since all the results should be the same after the initial
+    ;; calculation of the absolute dates DTSTART and TARGET, we just
+    ;; test one simple case here and test with date-times more
+    ;; thoroughly below.
+
+    ;; A target that doesn't fall on an interval boundary:
+    (let* ((target '(1 9 2026))
+           (intsize 2)
+           (expected-int-mon
+            (list
+             (ical:make-date-time :year 2026 :month 1 :day 5
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2026 :month 1 :day 12
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2026 :month 1 :day 19
+                                  :hour 0 :minute 0 :second 0))))
+      (should (equal expected-int-mon
+                     (icr:find-weekly-interval target dtstart intsize))))))
+
+(ert-deftest ict:recur-find-weekly-interval-w/date-time ()
+  "Does `icr:find-weekly-interval' find correct date-time intervals?"
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 8 ; a Wednesday
+                                       ;; make sure intervals are bounded on
+                                       ;; whole days:
+                                       :hour 7 :minute 11 :second 23)))
+
+    ;; Year numbers are monotonically increasing in the following test cases,
+    ;; to make it easy to tell which of them fails.
+
+    ;; No timezone, just clock time, around a target that doesn't fall on
+    ;; an interval boundary:
+    (let* ((target (ical:date-time-variant dtstart :year 2026 :month 1 :day 9))
+           (intsize 2)
+           (weds 3)
+           ;; expected interval for Monday (default) week start:
+           (expected-int-mon
+            (list
+             (ical:date-time-variant target :day 5 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 12 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 19 :hour 0 :minute 0 :second 0)))
+           ;; expected interval for Wednesday week start:
+           (expected-int-wed
+            (list
+             (ical:date-time-variant target :day 7 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 14 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 21 :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int-mon
+              (icr:find-weekly-interval target dtstart intsize)))
+      (should
+       (equal expected-int-wed
+              (icr:find-weekly-interval target dtstart intsize weds))))
+
+    ;; Around a target that does fall on an interval boundary, Monday week start:
+    (let* ((target (ical:date-time-variant dtstart :year 2027 :month 1 :day 4))
+           (intsize 3)
+           ;; expected interval for Monday (default) week start:
+           (expected-int-mon
+            (list
+             (ical:date-time-variant target :year 2026 :month 12 :day 21
+                                     :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :year 2026 :month 12 :day 28
+                                     :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 11
+                                     :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int-mon
+              (icr:find-weekly-interval target dtstart intsize))))
+
+    ;; Around a target that does fall on an interval boundary, Sunday week start:
+    (let* ((target (ical:date-time-variant dtstart :year 2028 :month 1 :day 2))
+           (intsize 3)
+           (sun 0)
+           ;; expected interval for Sunday week start:
+           (expected-int-sun
+            (list
+             (ical:date-time-variant target :day 2 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 9 :hour 0 :minute 0 :second 0)
+             (ical:date-time-variant target :day 23 :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int-sun
+              (icr:find-weekly-interval target dtstart intsize sun))))))
+
+(ert-deftest ict:recur-find-monthly-interval ()
+  "Does `icr:find-monthly-interval' find correct intervals?"
+  ;; Year numbers are monotonically increasing in the following test cases,
+  ;; to make it easy to tell which of them fails.
+
+  ;; One test with dates, to make sure that works:
+  (let* ((dtstart '(1 8 2025))
+         (target '(10 9 2025))
+           (intsize 5)
+           (expected-int
+            (list
+             (ical:make-date-time :year 2025 :month 6 :day 1
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2025 :month 7 :day 1
+                                  :hour 0 :minute 0 :second 0)
+             (ical:make-date-time :year 2025 :month 11 :day 1
+                                  :hour 0 :minute 0 :second 0))))
+      (should (equal expected-int
+                     (icr:find-monthly-interval target dtstart intsize))))
+
+  ;; Around a target that doesn't fall on an interval boundary:
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 1
+                                       ;; make sure intervals are bounded on
+                                       ;; whole days:
+                                       :hour 7 :minute 11 :second 23))
+         (target (ical:date-time-variant dtstart :year 2026 :month 3 :day 9))
+         (intsize 2)
+         (expected-int
+          (list
+           (ical:date-time-variant target :day 1 :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :month 4 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :month 5 :day 1
+                                   :hour 0 :minute 0 :second 0))))
+    (should
+     (equal expected-int
+            (icr:find-monthly-interval target dtstart intsize))))
+
+  ;; Around a target that does fall on an interval boundary:
+  (let* ((dtstart (ical:make-date-time :year 2025 :month 1 :day 1
+                                       ;; make sure intervals are bounded on
+                                       ;; whole days:
+                                       :hour 7 :minute 11 :second 23))
+         (target (ical:date-time-variant dtstart :year 2027 :month 5 :day 1))
+         (intsize 7)
+         (expected-int
+          (list
+           (ical:date-time-variant target :year 2027 :month 5 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2027 :month 6 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2027 :month 12 :day 1
+                                   :hour 0 :minute 0 :second 0))))
+    (should
+     (equal expected-int
+            (icr:find-monthly-interval target dtstart intsize))))
+
+  ;; Around a target that does not fall on an interval boundary, where
+  ;; start month > target month
+  (let* ((dtstart (ical:make-date-time :year 2028 :month 11 :day 11
+                                       :hour 11 :minute 11 :second 11))
+         (target (ical:date-time-variant dtstart
+                                         :year 2029 :month 4 :day 15))
+         (intsize 2)
+         (expected-int
+          (list
+           (ical:date-time-variant target :year 2029 :month 3 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2029 :month 4 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2029 :month 5 :day 1
+                                   :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-monthly-interval target dtstart intsize))))
+
+  ;; Around a target that falls on an interval boundary, where
+  ;; start month > target month
+  (let* ((dtstart (ical:make-date-time :year 2029 :month 11 :day 11
+                                       :hour 11 :minute 11 :second 11 ))
+         (target (ical:date-time-variant dtstart
+                                         :year 2030 :month 5 :day 1))
+         (intsize 2)
+         (expected-int
+          (list
+           (ical:date-time-variant target :year 2030 :month 5 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2030 :month 6 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2030 :month 7 :day 1
+                                   :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-monthly-interval target dtstart intsize))))
+
+  ;; Around a target that falls on an interval boundary, where
+  ;; start month = target month
+  (let* ((dtstart (ical:make-date-time :year 2031 :month 11 :day 11
+                                       :hour 11 :minute 11 :second 11 ))
+         (target (ical:date-time-variant dtstart :year 2032 :month 11 :day 11))
+         (intsize 2)
+         (expected-int
+          (list
+           (ical:date-time-variant target :year 2032 :month 11 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2032 :month 12 :day 1
+                                   :hour 0 :minute 0 :second 0)
+           (ical:date-time-variant target :year 2033 :month 1 :day 1
+                                   :hour 0 :minute 0 :second 0))))
+      (should
+       (equal expected-int
+              (icr:find-monthly-interval target dtstart intsize)))))
+
+(ert-deftest ict:recur-find-yearly-interval ()
+  "Does `icr:find-yearly-interval' find correct date intervals?"
+  ;; Year numbers are monotonically increasing in the following test cases,
+  ;; to make it easy to tell which of them fails.
+
+  ;; One test with dates, to make sure that works:
+  (let* ((dtstart '(1 8 2025))
+         (target '(10 9 2025))
+         (intsize 2)
+         (expected-int
+          (list
+           (ical:make-date-time :year 2025 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2026 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2027 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0))))
+    (should (equal expected-int
+                   (icr:find-yearly-interval target dtstart intsize))))
+
+  ;; A target not on an interval boundary:
+  (let* ((dtstart (ical:make-date-time :year 2026 :month 3 :day 1
+                                       :hour 1 :minute 2 :second 3))
+         (target (ical:make-date-time :year 2026 :month 7 :day 28
+                                      :hour 11 :minute 58 :second 0))
+         (intsize 3)
+         (expected-int
+          (list
+           (ical:make-date-time :year 2026 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2027 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2029 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0))))
+    (should (equal expected-int
+                   (icr:find-yearly-interval target dtstart intsize))))
+
+  ;; A target on an interval boundary:
+  (let* ((dtstart (ical:make-date-time :year 2027 :month 3 :day 1
+                                       :hour 1 :minute 2 :second 3))
+         (target (ical:make-date-time :year 2028 :month 1 :day 1
+                                      :hour 0 :minute 0 :second 0))
+         (intsize 4)
+         (expected-int
+          (list
+           (ical:make-date-time :year 2027 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2028 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2031 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0))))
+    (should (equal expected-int
+                   (icr:find-yearly-interval target dtstart intsize))))
+
+  ;; A target earlier than dtstart but in the same year;
+  ;; it's important that this works when looking up recurrences of
+  ;; time zone observance onsets
+  (let* ((dtstart (ical:make-date-time :year 2029 :month 5 :day 28
+                                       :hour 1 :minute 2 :second 3))
+         (target (ical:make-date-time :year 2029 :month 2 :day 14
+                                      :hour 11 :minute 58 :second 0))
+         (intsize 1)
+         (expected-int
+          (list
+           (ical:make-date-time :year 2029 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2030 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0)
+           (ical:make-date-time :year 2030 :month 1 :day 1
+                                :hour 0 :minute 0 :second 0))))
+    (should (equal expected-int
+                   (icr:find-yearly-interval target dtstart intsize)))))
+
+;; Subintervals:
+
+(ert-deftest ict:recur-refine-byyearday ()
+  "Does `icr:refine-byyearday' correctly refine by yeardays?"
+  (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :year 1))
+         (interval (list low high high))
+         (yeardays (list 2 -7))
+         (sub1 (list (ical:date-time-variant low :day 2)
+                     (ical:date-time-variant low :day 3)))
+         (sub2 (list (ical:date-time-variant low :month 12 :day 25)
+                     (ical:date-time-variant low :month 12 :day 26)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byyearday interval yeardays)))))
+
+(ert-deftest ict:recur-refine-bymonth ()
+  "Does `icr:refine-bymonth' correctly refine by months?"
+  (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :year 1))
+         (interval (list low high high))
+         (months (list 9 2))
+         (sub1 (list (ical:date-time-variant low :month 2 :day 1)
+                     (ical:date-time-variant low :month 3 :day 1)))
+         (sub2 (list (ical:date-time-variant low :month 9 :day 1)
+                     (ical:date-time-variant low :month 10 :day 1)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-bymonth interval months)))))
+
+(ert-deftest ict:recur-refine-bymonthday ()
+  "Does `icr:refine-bymonthday' correctly refine by days of the month?"
+  (let* ((low (ical:make-date-time :year 2025 :month 2 :day 1
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :month 1))
+         (interval (list low high high))
+         (monthdays (list -1 2 29))
+         ;; N.B. we should get no subinterval for Feb. 29, 2025
+         (sub1 (list (ical:date-time-variant low :day 2)
+                     (ical:date-time-variant low :day 3)))
+         (sub2 (list (ical:date-time-variant low :day 28)
+                     (ical:date-time-variant low :month 3 :day 1)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-bymonthday interval monthdays)))))
+
+(ert-deftest ict:recur-refine-byday ()
+  "Does `icr:refine-byday' correctly refine by days of the week?"
+  ;; The simple case: just day names
+  (let* ((low (ical:make-date-time :year 2025 :month 3 :day 3 ; a Monday
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :day 7))
+         (interval (list low high high))
+         (days (list 0 6)) ; just the weekend, please!
+         (sub1 (list (ical:date-time-variant low :day 8)
+                     (ical:date-time-variant low :day 9)))
+         (sub2 (list (ical:date-time-variant low :day 9)
+                     (ical:date-time-variant low :day 10)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byday interval days))))
+
+  ;; Day names with offsets within the month
+  (let* ((low (ical:make-date-time :year 2025 :month 3 :day 1 ; a Saturday
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :month 1))
+         (interval (list low high high))
+         (days (list '(1 . 2) '(1 . -1)))  ; second and last Monday
+         (sub1 (list (ical:date-time-variant low :day 10)
+                     (ical:date-time-variant low :day 11)))
+         (sub2 (list (ical:date-time-variant low :day 31)
+                     (ical:date-time-variant low :month 4 :day 1)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byday interval days t))))
+
+  ;; Day names with offsets within the year
+  (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :year 1))
+         (interval (list low high high))
+         (days (list '(5 . 1) '(5 . -1)))  ; first and last Friday
+         (sub1 (list (ical:date-time-variant low :day 3)
+                     (ical:date-time-variant low :day 4)))
+         (sub2 (list (ical:date-time-variant low :month 12 :day 26)
+                     (ical:date-time-variant low :month 12 :day 27)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byday interval days nil)))))
+
+(ert-deftest ict:recur-refine-byhour ()
+  "Does `icr:refine-byhour' correctly refine by hours?"
+  ;; No time zone, just clock times:
+  (let* ((low (ical:make-date-time :year 2025 :month 1 :day 1
+                                   :hour 0 :minute 0 :second 0))
+         (high (ical:date/time-add low :day 1))
+         (interval (list low high high))
+         (hours (list 2 19))
+         (sub1 (list (ical:date-time-variant low :hour 2)
+                     (ical:date-time-variant low :hour 3)))
+         (sub2 (list (ical:date-time-variant low :hour 19)
+                     (ical:date-time-variant low :hour 20)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byhour interval hours))))
+
+  ;; With time zone, but without crossing an observance boundary:
+  (let* ((low (ical:make-date-time :year 2025 :month 2 :day 1
+                                   :hour 0 :minute 0 :second 0
+                                   :zone ict:est :dst nil))
+         (high (ical:date/time-add low :day 1 ict:tz-eastern))
+         (interval (list low high high))
+         (hours (list 2 19))
+         (sub1 (list (ical:date-time-variant low :hour 2 :tz 'preserve)
+                     (ical:date-time-variant low :hour 3 :tz 'preserve)))
+         (sub2 (list (ical:date-time-variant low :hour 19 :tz 'preserve)
+                     (ical:date-time-variant low :hour 20 :tz 'preserve)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byhour interval hours ict:tz-eastern)))))
+
+(ert-deftest ict:recur-refine-byminute ()
+  "Does `icr:refine-byminute' correctly refine by minutes?"
+  ;; No time zone, just clock times:
+  (let* ((low (ical:make-date-time :year 2025 :month 5 :day 1
+                                   :hour 13 :minute 0 :second 0))
+         (high (ical:date/time-add low :hour 1))
+         (interval (list low high high))
+         (minutes (list 7 59))
+         (sub1 (list (ical:date-time-variant low :minute 7)
+                     (ical:date-time-variant low :minute 8)))
+         (sub2 (list (ical:date-time-variant low :minute 59)
+                     (ical:date-time-variant low :hour 14 :minute 0)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byminute interval minutes))))
+
+  ;; With time zone, but without crossing an observance boundary:
+  (let* ((low (ical:make-date-time :year 2025 :month 2 :day 1
+                                   :hour 13 :minute 0 :second 0
+                                   :zone ict:est :dst nil))
+         (high (ical:date/time-add low :hour 1 ict:tz-eastern))
+         (interval (list low high high))
+         (minutes (list 7 59))
+         (sub1 (list (ical:date-time-variant low :minute 7 :tz 'preserve)
+                     (ical:date-time-variant low :minute 8 :tz 'preserve)))
+         (sub2 (list (ical:date-time-variant low :minute 59 :tz 'preserve)
+                     (ical:date-time-variant low :hour 14 :minute 0
+                                             :tz 'preserve)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-byminute interval minutes ict:tz-eastern)))))
+
+(ert-deftest ict:recur-refine-bysecond ()
+  "Does `icr:refine-bysecond' correctly refine by seconds?"
+  ;; No time zone, just clock times:
+  (let* ((low (ical:make-date-time :year 2025 :month 5 :day 1
+                                   :hour 13 :minute 59 :second 0))
+         (high (ical:date/time-add low :minute 1))
+         (interval (list low high high))
+         (seconds (list 24 59))
+         (sub1 (list (ical:date-time-variant low :second 24)
+                     (ical:date-time-variant low :second 25)))
+         (sub2 (list (ical:date-time-variant low :second 59)
+                     (ical:date-time-variant low :hour 14 :minute 0 :second 0)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-bysecond interval seconds))))
+
+  ;; With time zone, but without crossing an observance boundary:
+  (let* ((low (ical:make-date-time :year 2025 :month 2 :day 1
+                                   :hour 13 :minute 19 :second 0
+                                   :zone ict:est :dst nil))
+         (high (ical:date/time-add low :minute 1 ict:tz-eastern))
+         (interval (list low high high))
+         (seconds (list 24 59))
+         (sub1 (list (ical:date-time-variant low :second 24 :tz 'preserve)
+                     (ical:date-time-variant low :second 25 :tz 'preserve)))
+         (sub2 (list (ical:date-time-variant low :second 59 :tz 'preserve)
+                     (ical:date-time-variant low :minute 20 :second 0
+                                             :tz 'preserve)))
+         (expected-subintervals (list sub1 sub2)))
+    (should (equal expected-subintervals
+                   (icr:refine-bysecond interval seconds ict:tz-eastern)))))
+
+(ert-deftest ict:recur-subintervals-to-dates ()
+  "Does `icr:subintervals-to-dates' correctly generate recurrences?"
+  ;; Two subintervals, the first three days long, the second less than a single day
+  (let* ((low1 (ical:make-date-time :year 2025 :month 5 :day 1
+                                    :hour 13 :minute 59 :second 0))
+         (high1 (ical:date/time-add low1 :day 3))
+         (sub1 (list low1 high1))
+         (low2 (ical:make-date-time :year 2025 :month 5 :day 31
+                                    :hour 14 :minute 0 :second 0))
+         (high2 (ical:date/time-add low2 :hour 3)) ; later but on the same day
+         (sub2 (list low2 high2))
+         (low-date1 (ical:date-time-to-date low1))
+         (low-date2 (ical:date-time-to-date low2))
+         (expected-recs (list low-date1
+                              (ical:date/time-add low-date1 :day 1)
+                              (ical:date/time-add low-date1 :day 2)
+                              (ical:date/time-add low-date1 :day 3)
+                              low-date2)))
+    (should (equal expected-recs
+                   (icr:subintervals-to-dates (list sub1 sub2))))))
+
+(ert-deftest ict:recur-subintervals-to-date-times ()
+  "Does `icr:subintervals-to-date-times' correctly generate recurrences?"
+  ;; Two subintervals, each one second long, no time zone
+  (let* ((low1 (ical:make-date-time :year 2025 :month 5 :day 1
+                                    :hour 13 :minute 59 :second 0))
+         (high1 (ical:date/time-add low1 :second 1))
+         (sub1 (list low1 high1))
+         (low2 (ical:make-date-time :year 2025 :month 5 :day 2
+                                    :hour 14 :minute 0 :second 0))
+         (high2 (ical:date/time-add low2 :second 1))
+         (sub2 (list low2 high2))
+         (expected-recs (list low1 low2)))
+    (should (equal expected-recs
+                   (icr:subintervals-to-date-times (list sub1 sub2)))))
+
+  ;; A subinterval five seconds long, with time zone
+  (let* ((low1 (ical:make-date-time :year 2025 :month 6 :day 1
+                                    :hour 13 :minute 59 :second 0
+                                    :zone ict:edt :dst t))
+         (high1 (ical:date/time-add low1 :second 5 ict:tz-eastern))
+         (sub1 (list low1 high1))
+         (expected-recs
+          (list low1
+                (ical:date/time-add low1 :second 1 ict:tz-eastern)
+                (ical:date/time-add low1 :second 2 ict:tz-eastern)
+                (ical:date/time-add low1 :second 3 ict:tz-eastern)
+                (ical:date/time-add low1 :second 4 ict:tz-eastern))))
+    (should (equal expected-recs
+                   (icr:subintervals-to-date-times (list sub1) ict:tz-eastern))))
+
+  ;; A subinterval five seconds long, with time zone, which crosses an
+  ;; observance boundary where the final three seconds occur after
+  ;; clocks are set forward an hour; these seconds should therefore be in EDT:
+  (let* ((low1 (ical:make-date-time :year 2025 :month 3 :day 9
+                                    :hour 1 :minute 59 :second 58
+                                    :zone ict:est :dst nil))
+         (high1 (ical:make-date-time :year 2025 :month 3 :day 9
+                                     :hour 3 :minute 0 :second 3
+                                     :zone ict:edt :dst t))
+         (sub1 (list low1 high1))
+         (expected-recs
+          (list low1
+                (ical:date-time-variant low1 :second 59 :tz 'preserve)
+                (ical:date-time-variant high1 :second 0 :tz 'preserve)
+                (ical:date-time-variant high1 :second 1 :tz 'preserve)
+                (ical:date-time-variant high1 :second 2 :tz 'preserve))))
+    (should (equal expected-recs
+                   (icr:subintervals-to-date-times (list sub1) ict:tz-eastern))))
+
+  ;; A subinterval five seconds long, with time zone, which crosses an
+  ;; observance boundary where the final three seconds occur after
+  ;; clocks are set back an hour; these seconds should therefore be in
+  ;; EST:
+  (let* ((low1 (ical:make-date-time :year 2024 :month 11 :day 3
+                                    :hour 1 :minute 59 :second 58
+                                    :zone ict:edt :dst t))
+         (high1 (ical:make-date-time :year 2024 :month 11 :day 3
+                                     :hour 1 :minute 0 :second 2
+                                     :zone ict:est :dst nil))
+         (sub1 (list low1 high1))
+         (expected-recs
+          (list low1
+                (ical:date-time-variant low1 :second 59 :tz 'preserve)
+                (ical:date-time-variant high1 :second 0 :tz 'preserve)
+                (ical:date-time-variant high1 :second 1 :tz 'preserve))))
+    (should (equal expected-recs
+                   (icr:subintervals-to-date-times (list sub1) ict:tz-eastern)))))
+
+;; Tests for time zone functions:
+
+(ert-deftest ict:recur-tz-observance-on/nonexistent ()
+  "Does `icr:tz-observance-on' correctly interpret nonexistent times?"
+  (let* ((onset-start (ical:make-date-time :year 2030 :month 3 :day 10
+                                           :hour 2 :minute 0 :second 0
+                                           :zone ict:est :dst nil))
+         (start-shifted (ical:date-time-variant onset-start :hour 3
+                                                :zone ict:edt :dst t))
+         ;; 2:30AM falls into the gap when the clock jumps from 2AM to 3AM:
+         (nonexistent (ical:date-time-variant onset-start :minute 30
+                                              :zone ict:est :dst nil))
+         (nonexistent-shifted (ical:date-time-variant nonexistent :hour 3
+                                                      :zone ict:edt :dst t)))
+    (icr:tz-observance-on onset-start ict:tz-eastern t) ;; updates the time to EDT
+    (icr:tz-observance-on nonexistent ict:tz-eastern t) ;; updates the time to EDT
+    (should (equal onset-start start-shifted))
+    (should (equal nonexistent nonexistent-shifted))))
+
+(ert-deftest ict:recur-tz-observance-on/occurs-twice ()
+  "Does `icr:tz-observance-on' correctly interpret times that occur twice?"
+  (let* ((onset-start (ical:make-date-time :year 2025 :month 11 :day 2
+                                           :hour 2 :minute 0 :second 0
+                                           :zone ict:edt :dst t))
+         ;; 1:30AM occurs twice when the clock is set back from 2AM to 1AM:
+         (no-zone (ical:date-time-variant onset-start :hour 1 :minute 30))
+         (first (ical:date-time-variant onset-start :hour 1 :minute 30
+                                        :zone ict:edt :dst t))
+         (second (ical:date-time-variant first :zone ict:est :dst nil))
+         (first+1h (ical:date/time-add first :hour 1 ict:tz-eastern)))
+    (icr:tz-observance-on no-zone ict:tz-eastern t) ;; sets zone
+    (should (equal first no-zone))
+    (should (equal second first+1h))))
+
+(ert-deftest ict:recur-tz-observance-on ()
+  "Does `icr:tz-observance-on' correctly find observances?"
+
+  ;; A date before the start of all observances in the timezone.
+  ;; In this case, there is no matching observance, so we should get nil.
+  (let* ((dt (ical:make-date-time :year 1900 :month 1 :day 1
+                                  :hour 12 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (ts (encode-time dt)))
+    (should (null (icr:tz-observance-on dt ict:tz-eastern)))
+    (should (null (icr:tz-observance-on ts ict:tz-eastern))))
+
+  ;; A date matching the start of one of the STANDARD observances:
+  (let* ((dt (ical:make-date-time :year 1967 :month 10 :day 29
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal dt onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; A date matching the start of a DAYLIGHT observance:
+  (let* ((dt (ical:make-date-time :year 1967 :month 4 :day 30
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (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 obs/onset ts-obs/onset)))
+
+  ;; A date matching an RDATE of a DAYLIGHT observance:
+  (let* ((dt (ical:make-date-time :year 1975 :month 2 :day 23
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (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 obs/onset ts-obs/onset)))
+
+  ;; A date matching the end of a STANDARD observance:
+  (let* ((ut (ical:make-date-time :year 2006 :month 10 :day 29
+                                  :hour 6 :minute 0 :second 0
+                                  :zone 0 :dst nil)) ; UNTIL is in UTC
+         (dt (ical:make-date-time :year 2006 :month 10 :day 29
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (ical:date-time-simultaneous-p ut dt))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal dt onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; A date matching the end of a DAYLIGHT observance:
+  (let* ((ut (ical:make-date-time :year 2006 :month 4 :day 2
+                                  :hour 7 :minute 0 :second 0
+                                  :zone 0 :dst nil)) ; UNTIL is in UTC
+         (dt (ical:make-date-time :year 2006 :month 4 :day 2
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (ical:date-time-simultaneous-p ut dt))
+    (should (eq 'ical:daylight (ical:ast-node-type obs)))
+    (should (equal dt onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; A date matching an onset in the middle of a DAYLIGHT observance
+  ;; which has ended:
+  (let* ((dt (ical:make-date-time :year 1980 :month 4 :day 27
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (end (ical:make-date-time :year 1986 :month 4 :day 27
+                                   :hour 7 :minute 0 :second 0
+                                   :zone 0)) ; UNTIL is in UTC
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (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
+                        (ical:with-property-of obs 'ical:rrule nil value))))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; A date matching an onset of the DAYLIGHT observance which is
+  ;; ongoing:
+  (let* ((dt (ical:make-date-time :year 2025 :month 3 :day 9
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (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 obs/onset ts-obs/onset)))
+
+  ;; A date in the middle of the DAYLIGHT observance which is ongoing:
+  (let* ((start (ical:make-date-time :year 2025 :month 3 :day 9
+                                     :hour 2 :minute 0 :second 0
+                                     :zone ict:est :dst nil))
+         (dt (ical:make-date-time :year 2025 :month 5 :day 28
+                                  :hour 2 :minute 0 :second 0
+                                  :zone ict:edt :dst t))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (eq 'ical:daylight (ical:ast-node-type obs)))
+    (should (equal start onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; A date in the middle of the STANDARD observance which is ongoing:
+  (let* ((start (ical:make-date-time :year 2025 :month 11 :day 2
+                                     :hour 2 :minute 0 :second 0
+                                     :zone ict:edt :dst t))
+         (dt (ical:make-date-time :year 2026 :month 1 :day 28
+                                  :hour 12 :minute 30 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal start onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  ;; The following two tests were useful in detecting a broken optimization:
+  (let* ((start (ical:make-date-time :year 2006 :month 10 :day 29
+                                     :hour 2 :minute 0 :second 0
+                                     :zone ict:edt :dst t))
+         (dt (ical:make-date-time :year 2006 :month 11 :day 1
+                                  :hour 12 :minute 30 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal start onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+  (let* ((start (ical:make-date-time :year 2007 :month 11 :day 4
+                                     :hour 2 :minute 0 :second 0
+                                     :zone ict:edt :dst t))
+         (dt (ical:make-date-time :year 2008 :month 2 :day 1
+                                  :hour 12 :minute 30 :second 0
+                                  :zone ict:est :dst nil))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset))
+         ;; make sure we get the same result with an absolute time:
+         (ts (encode-time dt))
+         (ts-obs/onset (icr:tz-observance-on ts ict:tz-eastern)))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal start onset))
+    (should (equal obs/onset ts-obs/onset)))
+
+
+  ;; A date in the middle of the STANDARD observance which is ongoing;
+  ;; test that the update flag correctly sets the zone information:
+  (let* ((start (ical:make-date-time :year 2025 :month 11 :day 2
+                                     :hour 2 :minute 0 :second 0
+                                     :zone ict:edt :dst t))
+         (dt (ical:make-date-time :year 2026 :month 1 :day 28
+                                  :hour 12 :minute 30 :second 0
+                                  ;; no zone information
+                                  ))
+         (obs/onset (icr:tz-observance-on dt ict:tz-eastern t))
+         (obs (car obs/onset))
+         (onset (cadr obs/onset)))
+    (should (eq 'ical:standard (ical:ast-node-type obs)))
+    (should (equal start onset))))
+
+
+;; Tests for recurrence rule interpretation:
+(cl-defmacro ict:rrule-test (recur-string doc
+                             &key dtstart
+                             (low dtstart)
+                             high
+                             tz
+                             rdates
+                             exdates
+                             members
+                             nonmembers
+                             size
+                             (tags nil)
+                             source)
+
+  "Create a test which parses RECUR-STRING to an `icalendar-recur',
+creates an event with a recurrence set from this value, and checks
+various properties of the recurrence set.
+
+DTSTART should be an `icalendar-date' or `icalendar-date-time'
+  value appropriate to the RECUR-STRING.  The value will be
+  bound to the symbol `dtstart'; this symbol can thus be used inside
+  the expressions for MEMBERS and NONMEMBERS.
+LOW and HIGH should be the bounds of the window in which to compute
+  recurrences.  LOW defaults to DTSTART.
+TZ, if present, should be an `icalendar-vtimezone'.
+  Date-times in the recurrence set will be calculated relative to this
+  time zone.
+RDATES, if present, should be a list of additional
+  `icalendar-date' or `icalendar-date-time' values to be added to
+  the recurrence set *in addition to* those generated by the
+  recurrence rule (see `icalendar-rdate').
+EXDATES, if present, should be a list of `icalendar-date' or
+  `icalendar-date-time' values to be excluded from the recurrence
+  set, *even if* they are in RDATES or generated by the
+  recurrence rule (see `icalendar-exdate').
+MEMBERS, if present, should be a list of values that are expected
+  to be present in the recurrence set.
+NONMEMBERS, if present, should be a list of values that are expected
+  to be excluded from the recurrence set.
+SIZE, if present, should be a positive integer representing the
+  expected size of the recurrence set.  Defaults to the value of the
+  COUNT clause in the recurrence rule, if any.
+TAGS is passed on to `ert-deftest'.
+SOURCE should be a symbol; it is used to name the test."
+  `(ert-deftest ,(intern (concat "ict:rrule-test-" (symbol-name source))) ()
+     ,(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))
+            (recvalue (ical:ast-node-value parsed))
+            (until (ical:recur-until recvalue))
+            (count (ical:recur-count recvalue))
+            (dtstart ,dtstart)
+            (tzid
+             (when (cl-typep dtstart 'ical:date-time)
+               "America/New_York"))
+            (recset-size (or ,size count))
+            (vevent
+             (ical:make-vevent
+              (ical:uid (concat "uid-test-" ,(symbol-name source)))
+              (ical:dtstart dtstart (ical:tzidparam tzid))
+              (ical:rrule parsed)
+              (ical:rdate ,rdates)
+              (ical:exdate ,exdates)))
+            ;; default for HIGH: UNTIL or DTSTART+3*INTERVAL
+            (win-high
+             (or ,high
+                 until
+                 (cadr
+                  (icr:nth-interval 2 ,dtstart recvalue))))
+            (recs
+             (if count
+                 (icr:recurrences-to-count vevent ,tz)
+               (icr:recurrences-in-window ,low win-high vevent ,tz))))
+       (should (ical:ast-node-valid-p parsed))
+       (when ,members
+         (dolist (dt ,members)
+           (should (member dt recs))))
+       (when ,nonmembers
+         (dolist (dt ,nonmembers)
+           (should-not (member dt recs))))
+       (when recset-size
+         (should (length= recs recset-size))))))
+
+(ict:rrule-test
+ "FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"
+ "Last non-weekend day of the month"
+ :dtstart '(3 31 2025)
+ :high '(6 1 2025)
+ :members '((3 31 2025) (4 30 2025) (5 30 2025))
+ :nonmembers '((5 31 2025)) ;; 5/31/2025 is a Saturday
+ :source rfc5545-sec3.3.10/1)
+
+(ict:rrule-test
+ "FREQ=YEARLY;INTERVAL=2;BYMONTH=1;BYDAY=SU;BYHOUR=8,9;BYMINUTE=30"
+ "Every Sunday in January at 8:30AM and 9:30AM, every other year"
+ :dtstart (ical:read-date-time "20250105T083000")
+ :high (ical:read-date-time "20271231T000000")
+ :members
+ (let ((jan3-27 (ical:make-date-time :year 2027 :month 1 :day 3
+                                     :hour 8 :minute 30 :second 0)))
+   (list dtstart
+         ;; 2025: Jan 5, 12, 19, 26
+         (ical:date-time-variant dtstart :hour 9)
+         (ical:date-time-variant dtstart :day 12)
+         (ical:date-time-variant dtstart :day 12 :hour 9)
+         (ical:date-time-variant dtstart :day 19)
+         (ical:date-time-variant dtstart :day 19 :hour 9)
+         (ical:date-time-variant dtstart :day 19)
+         (ical:date-time-variant dtstart :day 19 :hour 9)
+         (ical:date-time-variant dtstart :day 26)
+         (ical:date-time-variant dtstart :day 26 :hour 9)
+         ;; 2027: Jan 3, 10, 17, 24, 31
+         (ical:date-time-variant jan3-27 :hour 9)
+         (ical:date-time-variant jan3-27 :day 10)
+         (ical:date-time-variant jan3-27 :day 10 :hour 9)
+         (ical:date-time-variant jan3-27 :day 17)
+         (ical:date-time-variant jan3-27 :day 17 :hour 9)
+         (ical:date-time-variant jan3-27 :day 24)
+         (ical:date-time-variant jan3-27 :day 24 :hour 9)
+         (ical:date-time-variant jan3-27 :day 31)
+         (ical:date-time-variant jan3-27 :day 31 :hour 9)))
+ :nonmembers
+ (list
+  (ical:make-date-time :year 2026 :month 1 :day 4
+                       :hour 8 :minute 30 :second 0)
+  (ical:make-date-time :year 2026 :month 1 :day 4
+                       :hour 9 :minute 30 :second 0))
+ :source rfc5545-sec3.3.10/2)
+
+(ict:rrule-test
+ "FREQ=YEARLY;BYMONTH=2;BYMONTHDAY=-1"
+ "Every year on the last day in February"
+ :dtstart '(2 29 2024)
+ :high '(3 1 2028)
+ :members '((2 28 2025) (2 28 2026) (2 28 2027) (2 29 2028))
+ :nonmembers '((2 28 2028))
+ :source leap-day/1)
+
+(ict:rrule-test
+ "FREQ=YEARLY;INTERVAL=4;BYMONTH=2;BYMONTHDAY=29"
+ "Every four years on February 29"
+ :dtstart '(2 29 2024)
+ :high '(3 1 2028)
+ :members '((2 29 2028))
+ :nonmembers '((2 28 2028))
+ :source leap-day/2)
+
+(ict:rrule-test
+"FREQ=DAILY;COUNT=10"
+"Daily for 10 occurrences"
+:dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                              :hour 9 :minute 0 :second 0)
+:members
+;; (1997 9:00 AM EDT) September 2-11
+(mapcar
+ (lambda (day) (ical:date-time-variant dtstart :day day))
+ (number-sequence 2 11))
+:source rfc5545-sec3.3.10/3)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY"
+ "Every year on a specific date, e.g. an anniversary"
+ :dtstart '(11 11 2024)
+ :high '(10 1 2030)
+ :members '((11 11 2024)
+            (11 11 2025)
+            (11 11 2026)
+            (11 11 2027)
+            (11 11 2028)
+            (11 11 2029))
+ :nonmembers '((11 11 2030))
+ :source rfc5545-sec3.6.1/3)
+
+;; Time zone tests
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z"
+ "Every year on the last Sunday of April (through 1973-04-29) at 2AM.
+(Onset of US Eastern Daylight Time.)"
+ :tz ict:tz-eastern
+ ;; DTSTART and all the times below are at *3*AM EDT, because 2AM EST
+ ;; (the onset of the observance) does not exist as a local time:
+ :dtstart (ical:make-date-time :year 1967 :month 4 :day 30
+                               :hour 3 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:date-time-variant dtstart :year 1973 :month 4 :day 30
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  (ical:date-time-variant dtstart :year 1968 :day 28 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1969 :day 27 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1970 :day 26 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1971 :day 25 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1972 :day 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1973 :day 29 :tz 'preserve))
+ :source rfc5545-sec3.6.5/1)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"
+ "Every year on the first Sunday of November at 2AM.
+(Onset of Eastern Standard Time)."
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 2007 :month 11 :day 4
+                               :hour 2 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:date-time-variant dtstart :year 2010 :month 11 :day 8
+                               :zone ict:est :dst nil)
+ :members
+ ;; all the times below are at *1*AM EST, because 2AM EDT (the onset of
+ ;; the observance) is when clocks get set back:
+ (list (ical:date-time-variant dtstart
+                               :year 2008 :month 11 :day 2
+                               :zone ict:est :dst nil)
+       (ical:date-time-variant dtstart
+                               :year 2009 :month 11 :day 1
+                               :zone ict:est :dst nil)
+       (ical:date-time-variant dtstart
+                               :year 2010 :month 11 :day 7
+                               :zone ict:est :dst nil))
+ :source rfc5545-sec3.6.5/3.1)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;INTERVAL=3;BYDAY=1SU"
+ "Every three months on the first Sunday of the month."
+ :dtstart '(1 5 2025)
+ :high '(1 1 2026)
+ :members (list '(4 6 2025)
+                '(7 6 2025)
+                '(10 5 2025))
+ :nonmembers (list '(1 12 2025) ;; second Sun.
+                   '(2 2 2025) ;; first Sun. in Feb.
+                   '(4 5 2025)) ;; Sat.
+ :source monthly/interval)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;COUNT=10\n"
+ "Daily for 10 occurrences"
+ :dtstart (ical:read-date-time "19970902T090000")
+ :members
+ (mapcar
+  (lambda (day) (ical:date-time-variant dtstart :day day))
+  (number-sequence 2 11))
+ :nonmembers (list (ical:date-time-variant dtstart :day 12))
+ :high (ical:read-date-time "19970912T090000")
+ :source rfc5545-sec3.8.5.3/1)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;UNTIL=19971224T000000Z\n"
+ "Daily at 9AM until December 24, 1997"
+ :tags '(:expensive-test)
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (append
+   ;; EDT:
+  (mapcar
+   (lambda (day) (ical:date-time-variant dtstart :day day :tz 'preserve))
+   (number-sequence 2 30)) ;; Sept. 2--30
+  (mapcar
+   (lambda (day) (ical:date-time-variant dtstart :month 10 :day day
+                                         :tz 'preserve))
+   (number-sequence 1 25)) ;; Oct. 1--25
+  ;; EST:
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :month 10 :day day :zone ict:est :dst nil))
+   (number-sequence 26 31))) ;; Oct. 26--31
+ :source rfc5545-sec3.8.5.3/2)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;INTERVAL=2\n"
+ "Every other day - forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1997 :month 12 :day 4
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ (append
+  ;; (1997 9:00 AM EDT) September 2,4,6,8...24,26,28,30;
+  ;;                    October 2,4,6...20,22,24
+  (mapcar
+   (lambda (n)
+     (ical:date-time-variant dtstart :day (* 2 n) :tz 'preserve))
+   (number-sequence 1 15))
+  (mapcar
+   (lambda (n)
+     (ical:date-time-variant dtstart :month 10 :day (* 2 n) :tz 'preserve))
+   (number-sequence 1 12))
+  ;; (1997 9:00 AM EST) October 26,28,30;
+  ;;                    November 1,3,5,7...25,27,29;
+  ;;                    December 1,3,...
+  (mapcar
+   (lambda (n)
+     (ical:date-time-variant dtstart :month 10 :day (* 2 n)
+                             :zone ict:est :dst nil))
+   (number-sequence 13 15))
+  (mapcar
+   (lambda (n)
+     (ical:date-time-variant dtstart :month 11 :day (1- (* 2 n))
+                             :zone ict:est :dst nil))
+   (number-sequence 1 15))
+  (mapcar
+   (lambda (n)
+     (ical:date-time-variant dtstart :month 12 :day (1- (* 2 n))
+                             :zone ict:est :dst nil))
+   (number-sequence 1 2)))
+
+ :nonmembers
+ (list
+  ;; e.g.
+  (ical:make-date-time :year 1997 :month 10 :day 27
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/3)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5\n"
+ "Every ten days for five recurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+
+ :members ;; (1997 9:00 AM EDT) September 2,12,22; October 2,12
+ (list
+  dtstart
+  (ical:make-date-time :year 1997 :month 9 :day 12
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:edt :dst t)
+  (ical:make-date-time :year 1997 :month 9 :day 22
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:edt :dst t)
+  (ical:make-date-time :year 1997 :month 10 :day 2
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:edt :dst t)
+  (ical:make-date-time :year 1997 :month 10 :day 12
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:edt :dst t))
+ :source rfc5545-sec3.8.5.3/4)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;UNTIL=20000131T140000Z;BYMONTH=1;BYDAY=SU,MO,TU,WE,TH,FR,SA\n"
+ "Every day in January, for three years (weekdays explicit)"
+ :tags '(:expensive-test)
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1998 :month 1 :day 1
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+ :high (ical:make-date-time :year 2000 :month 2 :day 1
+                            :hour 9 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ ;; (1998 9:00 AM EST)January 1-31
+ ;; (1999 9:00 AM EST)January 1-31
+ ;; (2000 9:00 AM EST)January 1-31
+ (append
+  (mapcar
+   (lambda (day) (ical:date-time-variant dtstart :day day :tz 'preserve))
+   (number-sequence 1 31))
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :year 1999 :day day :tz 'preserve))
+   (number-sequence 1 31))
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :year 2000 :day day :tz 'preserve))
+   (number-sequence 1 31)))
+ :source rfc5545-sec3.8.5.3/5)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;UNTIL=20000131T140000Z;BYMONTH=1\n"
+ "Every day in January, for three years (weekdays implicit)"
+ :tags '(:expensive-test)
+ ;; TODO: as things are currently implemented, this way of expressing
+ ;; the rule is quite expensive, since we end up computing intervals and
+ ;; recurrences for every day of the year, even though the only relevant
+ ;; days are in January and there are no recurrences on the other days.
+ ;; We could try to optimize e.g. icr:refine-from-clauses to deal with such
+ ;; cases.
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1998 :month 1 :day 1
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+ :high (ical:make-date-time :year 2000 :month 2 :day 1
+                            :hour 9 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ ;; (1998 9:00 AM EST)January 1-31
+ ;; (1999 9:00 AM EST)January 1-31
+ ;; (2000 9:00 AM EST)January 1-31
+ (append
+  (mapcar
+   (lambda (day) (ical:date-time-variant dtstart :day day :tz 'preserve))
+   (number-sequence 1 31))
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :year 1999 :day day :tz 'preserve))
+   (number-sequence 1 31))
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :year 2000 :day day :tz 'preserve))
+   (number-sequence 1 31)))
+ :source rfc5545-sec3.8.5.3/6)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;COUNT=10\n"
+ "Weekly for ten occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (append
+  ;; (1997 9:00 AM EDT) September 2,9,16,23,30;October 7,14,21
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :day day :tz 'preserve))
+   (list 2 9 16 23 30))
+  (mapcar
+   (lambda (day)
+     (ical:date-time-variant dtstart :month 10 :day day :tz 'preserve))
+   (list 7 14 21))
+  ;; (1997 9:00 AM EST) October 28;November 4
+  (list
+   (ical:make-date-time :year 1997 :month 10 :day 28
+                        :hour 9 :minute 0 :second 0
+                        :zone ict:est :dst nil)
+   (ical:make-date-time :year 1997 :month 11 :day 4
+                        :hour 9 :minute 0 :second 0
+                        :zone ict:est :dst nil)))
+ :source rfc5545-sec3.8.5.3/7)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;UNTIL=19971224T000000Z\n"
+ "Every week until December 24, 1997"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (let ((oct97 (ical:date-time-variant dtstart :month 10
+                                      :zone ict:edt :dst t))
+       (nov97 (ical:date-time-variant dtstart :month 11
+                                      :zone ict:est :dst nil))
+       (dec97 (ical:date-time-variant dtstart :month 12
+                                      :zone ict:est :dst nil)))
+   (append
+    ;; (1997 9:00 AM EDT) September 2,9,16,23,30;
+    ;;                    October 7,14,21
+    (mapcar
+     (lambda (day)
+       (ical:date-time-variant dtstart :day day :tz 'preserve))
+     (list 2 9 16 23 30))
+    (mapcar
+     (lambda (day)
+       (ical:date-time-variant oct97 :day day :tz 'preserve))
+     (list 7 14 21))
+    ;; (1997 9:00 AM EST) October 28;
+    ;;                    November 4,11,18,25;
+    ;;                    December 2,9,16,23
+    (list (ical:date-time-variant oct97 :day 28 :zone ict:est :dst nil))
+    (mapcar
+     (lambda (day)
+       (ical:date-time-variant nov97 :day day :tz 'preserve))
+     (list 4 11 18 25))
+    (mapcar
+     (lambda (day)
+       (ical:date-time-variant dec97 :day day :tz 'preserve))
+     (list 2 9 16 23))))
+ :source rfc5545-sec3.8.5.3/8)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;INTERVAL=2;WKST=SU\n"
+ "Every other week - forever; Weekstart on Sunday"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1998 :month 3 :day 1
+                            :hour 9 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 2,16,30;
+  ;;                        October 14
+  dtstart
+  (ical:date-time-variant dtstart :day 16 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 14 :tz 'preserve)
+  ;;    (1997 9:00 AM EST) October 28;
+  ;;                       November 11,25;
+  ;;                       December 9,23
+  (ical:date-time-variant dtstart :month 10 :day 28 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 11 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 25 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 23 :zone ict:est :dst nil)
+  ;;    (1998 9:00 AM EST) January 6,20;
+  ;;                       February 3, 17
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 6
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 20
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 3
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 17
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/9)
+
+(ict:rrule-test
+"RRULE:FREQ=WEEKLY;UNTIL=19971007T000000Z;WKST=SU;BYDAY=TU,TH\n"
+"Weekly on Tuesday and Thursday for five weeks, using UNTIL"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1997 :month 10 :day 8
+                            :hour 0 :minute 0 :second 0 :zone 0)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 2,4,9,11,16,18,23,25,30;
+  ;;                        October 2
+  dtstart
+  (ical:date-time-variant dtstart :day 4 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 9 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 11 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 16 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 18 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 23 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 25 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 2 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/10)
+
+(ict:rrule-test
+"RRULE:FREQ=WEEKLY;COUNT=10;WKST=SU;BYDAY=TU,TH\n"
+"Weekly on Tuesday and Thursday for five weeks, using COUNT"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1997 :month 10 :day 8
+                            :hour 0 :minute 0 :second 0 :zone 0)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 2,4,9,11,16,18,23,25,30;
+  ;;                        October 2
+  dtstart
+  (ical:date-time-variant dtstart :day 4 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 9 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 11 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 16 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 18 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 23 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 25 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 2 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/11)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;WKST=SU;BYDAY=MO,WE,FR\n"
+ "Every other week on Monday, Wednesday, and Friday until December 24,
+1997, starting on Monday, September 1, 1997"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 1
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  dtstart
+  ;; ==> (1997 9:00 AM EDT) September 1,3,5,15,17,19,29;
+  ;;                        October 1,3,13,15,17
+  (ical:date-time-variant dtstart :day 3 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 5 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 15 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 17 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 19 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 29 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 1 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 3 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 13 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 15 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 17 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) October 27,29,31;
+  ;;                        November 10,12,14,24,26,28;
+  ;;                        December 8,10,12,22
+  (ical:date-time-variant dtstart :month 10 :day 27 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 10 :day 29 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 10 :day 31 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 10 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 12 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 14 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 24 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 26 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 28 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 8  :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 10 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 12 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 22 :zone ict:est :dst nil))
+ :nonmembers
+ (list
+  ;; These match the rule, but are just past the UNTIL date:
+  (ical:date-time-variant dtstart :month 12 :day 24 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 26 :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/12)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=8;WKST=SU;BYDAY=TU,TH\n"
+ "Every other week on Tuesday and Thursday, for 8 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ ;; ==> (1997 9:00 AM EDT) September 2,4,16,18,30;
+ ;;                        October 2,14,16
+ (list
+   dtstart
+   (ical:date-time-variant dtstart :day 4 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 16 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 18 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+   (ical:date-time-variant dtstart :month 10 :day 2 :tz 'preserve)
+   (ical:date-time-variant dtstart :month 10 :day 14 :tz 'preserve)
+   (ical:date-time-variant dtstart :month 10 :day 16 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/13)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR\n"
+ "Monthly on the first Friday for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 5;October 3
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 3 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 7;December 5
+  (ical:date-time-variant dtstart :month 11 :day 7 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 5 :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 2;February 6;March 6;April 3
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 2
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 6
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 6
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 4 :day 3
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EDT) May 1;June 5
+  (ical:date-time-variant dtstart :year 1998 :month 5 :day 1 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1998 :month 6 :day 5 :tz 'preserve))
+  :source rfc5545-sec3.8.5.3/14)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;UNTIL=19971224T000000Z;BYDAY=1FR\n"
+ "Monthly on the first Friday until December 24, 1997"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 5; October 3
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 3 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 7;December 5
+  (ical:date-time-variant dtstart :month 11 :day 7 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 5 :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/15)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU\n"
+ "Every other month on the first and last Sunday of the month for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 7
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 7,28
+  dtstart
+  (ical:date-time-variant dtstart :day 28 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 2,30
+  (ical:date-time-variant dtstart :month 11 :day 2 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 30 :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 4,25;March 1,29
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 4
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 25
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 1
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 29
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EDT) May 3,31
+  (ical:date-time-variant dtstart :year 1998 :month 5 :day 3 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1998 :month 5 :day 31 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/16)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;COUNT=6;BYDAY=-2MO\n"
+ "Monthly on the second-to-last Monday of the month for 6 months"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 22
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 22;October 20
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 20 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 17;December 22
+  (ical:date-time-variant dtstart :month 11 :day 17
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 22
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 19;February 16
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 19
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 16
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/17)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;BYMONTHDAY=-3\n"
+ "Monthly on the third-to-the-last day of the month, forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 28
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1998 :month 3 :day 1
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 28
+  dtstart
+  ;;     (1997 9:00 AM EST) October 29;November 28;December 29
+  (ical:date-time-variant dtstart :month 10 :day 29
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 28
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 29
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 29;February 26
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 29
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 26
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/18)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;COUNT=10;BYMONTHDAY=2,15\n"
+ "Monthly on the 2nd and 15th of the month for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 2,15;October 2,15
+  dtstart
+  (ical:date-time-variant dtstart :day 15 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 2 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 10 :day 15 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 2,15;December 2,15
+  (ical:date-time-variant dtstart :month 11 :day 2
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 15
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 2
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 15
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 2,15
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 2
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 15
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/19)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;COUNT=10;BYMONTHDAY=1,-1\n"
+ "Monthly on the first and last day of the month for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 30
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 30;October 1
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 1 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) October 31;November 1,30;December 1,31
+  (ical:date-time-variant dtstart :month 10 :day 31
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 1
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 30
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 1
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 31
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 1,31;February 1
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 1
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 31
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 1
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/20)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;INTERVAL=18;COUNT=10;BYMONTHDAY=10,11,12,13,14,15\n"
+ "Every 18 months on the 10th thru 15th of the month for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 10
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (append
+  (list
+   ;; ==> (1997 9:00 AM EDT) September 10,11,12,13,14,15
+   dtstart
+   (ical:date-time-variant dtstart :day 11 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 12 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 13 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 14 :tz 'preserve)
+   (ical:date-time-variant dtstart :day 15 :tz 'preserve))
+
+  ;;     (1999 9:00 AM EST) March 10,11,12,13
+  (let ((mar99 (ical:make-date-time :year 1999 :month 3 :day 10
+                                    :hour 9 :minute 0 :second 0
+                                    :zone ict:est :dst nil)))
+    (list
+     mar99
+     (ical:date-time-variant mar99 :day 11 :tz 'preserve)
+     (ical:date-time-variant mar99 :day 12 :tz 'preserve)
+     (ical:date-time-variant mar99 :day 13 :tz 'preserve))))
+ :nonmembers
+ (list
+  ;; These match the rule but are excluded by the COUNT clause:
+  (ical:make-date-time :year 1999 :month 3 :day 14
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:est :dst nil)
+  (ical:make-date-time :year 1999 :month 3 :day 15
+                       :hour 9 :minute 0 :second 0
+                       :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/21)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=TU\n"
+ "Every Tuesday, every other month"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1998 :month 4 :day 1
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 2,9,16,23,30
+  dtstart
+  (ical:date-time-variant dtstart :day 9 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 16 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 23 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 4,11,18,25
+  (ical:date-time-variant dtstart :month 11 :day 4
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 11
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 11
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 25
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 6,13,20,27;March 3,10,17,24,31
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 6
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 13
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 20
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 27
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 3
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 10
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 17
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 24
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 31
+                          :zone ict:est :dst nil))
+ :nonmembers
+ ;; e.g. Tuesdays in December 1997:
+ (list
+  (ical:date-time-variant dtstart :month 12 :day 2 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 9 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 16 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 23 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 30 :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/22)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;COUNT=10;BYMONTH=6,7\n"
+ "Yearly in June and July for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 6 :day 10
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ ;; Note: Since none of the BYDAY, BYMONTHDAY, or BYYEARDAY
+ ;; clauses are specified, the month day is gotten from "DTSTART"
+ :members
+ ;; ==> (1997 9:00 AM EDT) June 10;July 10
+ ;;     (1998 9:00 AM EDT) June 10;July 10
+ ;;     (1999 9:00 AM EDT) June 10;July 10
+ ;;     (2000 9:00 AM EDT) June 10;July 10
+ ;;     (2001 9:00 AM EDT) June 10;July 10
+ (mapcan
+  (lambda (y)
+    (list
+     (ical:date-time-variant dtstart :year y :month 6 :tz 'preserve)
+     (ical:date-time-variant dtstart :year y :month 7 :tz 'preserve)))
+  (number-sequence 1997 2001))
+ :source rfc5545-sec3.8.5.3/23)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;INTERVAL=2;COUNT=10;BYMONTH=1,2,3\n"
+ "Every other year on January, February, and March for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 3 :day 10
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+ :members
+ ;; ==> (1997 9:00 AM EST) March 10
+ ;;     (1999 9:00 AM EST) January 10;February 10;March 10
+ ;;     (2001 9:00 AM EST) January 10;February 10;March 10
+ ;;     (2003 9:00 AM EST) January 10;February 10;March 10
+ (cons
+  dtstart
+  ;; FIXME: this mapcan appears to produce a spurious warning:
+  (with-suppressed-warnings ((ignored-return-value mapcan))
+    (mapcan
+     (lambda (y)
+       (list
+        (ical:date-time-variant dtstart :year y :month 1 :tz 'preserve)
+        (ical:date-time-variant dtstart :year y :month 2 :tz 'preserve)
+        (ical:date-time-variant dtstart :year y :month 3 :tz 'preserve)))
+   (list 1999 2001 2003))))
+ :source rfc5545-sec3.8.5.3/24)
+
+(ict:rrule-test
+"RRULE:FREQ=YEARLY;INTERVAL=3;COUNT=10;BYYEARDAY=1,100,200\n"
+"Every third year on the 1st, 100th, and 200th day for 10 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 1 :day 1
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EST) January 1
+  dtstart
+  ;;     (1997 9:00 AM EDT) April 10;July 19
+  (ical:date-time-variant dtstart :month 4 :day 10 :zone ict:edt :dst t)
+  (ical:date-time-variant dtstart :month 7 :day 19 :zone ict:edt :dst t)
+  ;;     (2000 9:00 AM EST) January 1
+  (ical:date-time-variant dtstart :year 2000 :tz 'preserve)
+  ;;     (2000 9:00 AM EDT) April 9;July 18
+  (ical:date-time-variant dtstart :year 2000 :month 4 :day 9 :zone ict:edt :dst t)
+  (ical:date-time-variant dtstart :year 2000 :month 7 :day 18 :zone ict:edt :dst t)
+  ;;     (2003 9:00 AM EST) January 1
+  (ical:date-time-variant dtstart :year 2003 :tz 'preserve)
+  ;;     (2003 9:00 AM EDT) April 10;July 19
+  (ical:date-time-variant dtstart :year 2003 :month 4 :day 10 :zone ict:edt :dst t)
+  (ical:date-time-variant dtstart :year 2003 :month 7 :day 19 :zone ict:edt :dst t)
+  ;;     (2006 9:00 AM EST) January 1
+  (ical:date-time-variant dtstart :year 2006 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/25)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;BYDAY=20MO\n"
+ "Every 20th Monday of the year, forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 5 :day 19
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) May 19
+  ;;     (1998 9:00 AM EDT) May 18
+  ;;     (1999 9:00 AM EDT) May 17
+  ;;     ...
+  dtstart
+  (ical:date-time-variant dtstart :year 1998 :day 18 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1999 :day 17 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/26)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;BYWEEKNO=20;BYDAY=MO\n"
+ "Every year on Monday in Week 20 (where the week starts Monday), forever"
+ :tz ict:tz-eastern
+ :dtstart
+ (ical:make-date-time :year 1997 :month 5 :day 12
+                      :hour 9 :minute 0 :second 0
+                      :zone ict:edt :dst t)
+ :members
+ (list
+  (ical:date-time-variant dtstart :year 1998 :day 11 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1999 :day 17 :tz 'preserve))
+ :nonmembers
+ (list
+  (ical:date-time-variant dtstart :year 1998 :day 12 :tz 'preserve) ; a Tuesday
+  (ical:date-time-variant dtstart :year 1998 :day 18 :tz 'preserve)) ; wrong weekno
+ :source rfc5545-sec3.8.5.3/27)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=TH\n"
+ "Every Thursday in March, forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 3 :day 13
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+ :members
+ (append
+  ;; ==> (1997 9:00 AM EST) March 13,20,27
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :day d :tz 'preserve))
+   (list 13 20 27))
+  ;;     (1998 9:00 AM EST) March 5,12,19,26
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1998 :day d :tz 'preserve))
+   (list 5 12 19 26))
+  ;;     (1999 9:00 AM EST) March 4,11,18,25
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1999 :day d :tz 'preserve))
+   (list 4 11 18 25)))
+ :source rfc5545-sec3.8.5.3/28)
+
+(ict:rrule-test
+"RRULE:FREQ=YEARLY;BYDAY=TH;BYMONTH=6,7,8\n"
+"Every Thursday, but only during June, July, and August, forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 6 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (append
+  ;; ==> (1997 9:00 AM EDT) June 5,12,19,26;July 3,10,17,24,31;
+  ;;                        August 7,14,21,28
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :day d :tz 'preserve))
+   (list 5 12 19 26))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :month 7 :day d :tz 'preserve))
+   (list 3 10 17 24 31))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :month 8 :day d :tz 'preserve))
+   (list 7 14 21 28))
+  ;;     (1998 9:00 AM EDT) June 4,11,18,25;July 2,9,16,23,30;
+  ;;                        August 6,13,20,27
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1998 :day d :tz 'preserve))
+   (list 4 11 18 25))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1998 :month 7 :day d :tz 'preserve))
+   (list 2 9 16 23 30))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1998 :month 8 :day d :tz 'preserve))
+   (list 6 13 20 27))
+  ;;     (1999 9:00 AM EDT) June 3,10,17,24;July 1,8,15,22,29;
+  ;;                        August 5,12,19,26
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1999 :day d :tz 'preserve))
+   (list 3 10 17 24))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1999 :month 7 :day d :tz 'preserve))
+   (list 1 8 15 22 29))
+  (mapcar
+   (lambda (d)
+     (ical:date-time-variant dtstart :year 1999 :month 8 :day d :tz 'preserve))
+   (list 5 12 19 26)))
+ :source rfc5545-sec3.8.5.3/29)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;BYDAY=FR;BYMONTHDAY=13\n"
+ "Every Friday the 13th, forever, *excluding* DTSTART "
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 2000 :month 10 :day 14
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:edt :dst t)
+ :exdates (list dtstart)
+ :members
+ (list
+  ;; ==> (1998 9:00 AM EST) February 13;March 13;November 13
+  ;;     (1999 9:00 AM EDT) August 13
+  ;;     (2000 9:00 AM EDT) October 13
+  ;;     ...
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 13
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 13
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 11 :day 13
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1999 :month 8 :day 13 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 2000 :month 10 :day 13 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/30)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13\n"
+ "The first Saturday that follows the first Sunday of the month, forever"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 13
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1998 :month 6 :day 14
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 13;October 11
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 11 :tz 'preserve)
+  ;;     (1997 9:00 AM EST) November 8;December 13
+  (ical:date-time-variant dtstart :month 11 :day 8 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 13 :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 10;February 7;March 7
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 10
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 7
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 7
+                          :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EDT) April 11;May 9;June 13...
+  (ical:date-time-variant dtstart :year 1998 :month 4 :day 11 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1998 :month 5 :day 9 :tz 'preserve)
+  (ical:date-time-variant dtstart :year 1998 :month 6 :day 13 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/31)
+
+(ict:rrule-test
+ "RRULE:FREQ=YEARLY;INTERVAL=4;BYMONTH=11;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8\n"
+ "Every 4 years, the first Tuesday after a Monday in November, forever
+(U.S. Presidential Election day)"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1996 :month 11 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+
+ :members
+ (list
+  ;; ==> (1996 9:00 AM EST) November 5
+  dtstart
+  ;;     (2000 9:00 AM EST) November 7
+  (ical:date-time-variant dtstart :year 2000 :day 7 :tz 'preserve)
+  ;;     (2004 9:00 AM EST) November 2
+  (ical:date-time-variant dtstart :year 2004 :day 2 :tz 'preserve))
+  :source rfc5545-sec3.8.5.3/32)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;COUNT=3;BYDAY=TU,WE,TH;BYSETPOS=3\n"
+ "The third instance into the month of one of Tuesday, Wednesday, or
+Thursday, for the next 3 months"
+ ;; TODO: Yikes, why is this so slow??
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 4
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 4;October 7
+  ;;     (1997 9:00 AM EST) November 6
+  dtstart
+  (ical:date-time-variant dtstart :month 10 :day 7 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 11 :day 6 :zone ict:est :dst nil))
+:source rfc5545-sec3.8.5.3/33)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2\n"
+ "The second-to-last weekday of the month"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 29
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1998 :month 4 :day 1
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:est :dst nil)
+ :members
+ (list
+  ;; ==> (1997 9:00 AM EDT) September 29
+  dtstart
+  ;;     (1997 9:00 AM EST) October 30;November 27;December 30
+  (ical:date-time-variant dtstart :month 10 :day 30 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 11 :day 27 :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :month 12 :day 30 :zone ict:est :dst nil)
+  ;;     (1998 9:00 AM EST) January 29;February 26;March 30
+  (ical:date-time-variant dtstart :year 1998 :month 1 :day 29
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 2 :day 26
+                          :zone ict:est :dst nil)
+  (ical:date-time-variant dtstart :year 1998 :month 3 :day 30
+                          :zone ict:est :dst nil))
+ :source rfc5545-sec3.8.5.3/34)
+
+(ict:rrule-test
+ ;; corrected, see Errata ID 3883: https://www.rfc-editor.org/errata/eid3883
+ "RRULE:FREQ=HOURLY;INTERVAL=3;UNTIL=19970902T210000Z\n"
+ "Every 3 hours from 9:00 AM to 5:00 PM on a specific day"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+
+ :members
+ (list
+  ;; ==> (September 2, 1997 EDT) 09:00,12:00,15:00
+  dtstart
+  (ical:date-time-variant dtstart :hour 12 :tz 'preserve)
+  (ical:date-time-variant dtstart :hour 15 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/35)
+
+(ict:rrule-test
+ "RRULE:FREQ=MINUTELY;INTERVAL=15;COUNT=6\n"
+ "Every 15 minutes for 6 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+
+ :members
+ (list
+  ;; ==> (September 2, 1997 EDT) 09:00,09:15,09:30,09:45,10:00,10:15
+  dtstart
+  (ical:date-time-variant dtstart :minute 15 :tz 'preserve)
+  (ical:date-time-variant dtstart :minute 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :minute 45 :tz 'preserve)
+  (ical:date-time-variant dtstart :hour 10 :minute 0 :tz 'preserve)
+  (ical:date-time-variant dtstart :hour 10 :minute 15 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/36)
+
+(ict:rrule-test
+ "RRULE:FREQ=MINUTELY;INTERVAL=90;COUNT=4\n"
+ "Every hour and a half for 4 occurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (September 2, 1997 EDT) 09:00,10:30;12:00;13:30
+  dtstart
+  (ical:date-time-variant dtstart :hour 10 :minute 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :hour 12 :minute 0 :tz 'preserve)
+  (ical:date-time-variant dtstart :hour 13 :minute 30 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/37)
+
+(ict:rrule-test
+ "RRULE:FREQ=DAILY;BYHOUR=9,10,11,12,13,14,15,16;BYMINUTE=0,20,40\n"
+ "Every 20 minutes from 9:00 AM to 4:40 PM every day"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1997 :month 9 :day 4
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:edt :dst t)
+ :members
+ (append
+  ;; ==> (September 2, 1997 EDT) 9:00,9:20,9:40,10:00,10:20,
+  ;;                             ... 16:00,16:20,16:40
+  (mapcan
+   (lambda (h)
+     (list
+      (ical:date-time-variant dtstart :hour h :minute 0 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :minute 20 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :minute 40 :tz 'preserve)))
+   (number-sequence 9 16))
+  ;;     (September 3, 1997 EDT) 9:00,9:20,9:40,10:00,10:20,
+  ;;                             ...16:00,16:20,16:40
+  (mapcan
+   (lambda (h)
+     (list
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 0 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 20 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 40 :tz 'preserve)))
+   (number-sequence 9 16)))
+ :source rfc5545-sec3.8.5.3/38)
+
+(ict:rrule-test
+ "RRULE:FREQ=MINUTELY;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16\n"
+ "Every 20 minutes from 9:00 AM to 4:40 PM every day
+(Alternative rule for the previous example)"
+ :tags '(:expensive-test)
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 9 :day 2
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :high (ical:make-date-time :year 1997 :month 9 :day 4
+                            :hour 0 :minute 0 :second 0
+                            :zone ict:edt :dst t)
+ :members
+ (append
+  ;; ==> (September 2, 1997 EDT) 9:00,9:20,9:40,10:00,10:20,
+  ;;                             ... 16:00,16:20,16:40
+  (mapcan
+   (lambda (h)
+     (list
+      (ical:date-time-variant dtstart :hour h :minute 0 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :minute 20 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :minute 40 :tz 'preserve)))
+   (number-sequence 9 16))
+  ;;     (September 3, 1997 EDT) 9:00,9:20,9:40,10:00,10:20,
+  ;;                             ...16:00,16:20,16:40
+  (mapcan
+   (lambda (h)
+     (list
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 0 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 20 :tz 'preserve)
+      (ical:date-time-variant dtstart :hour h :day 3 :minute 40 :tz 'preserve)))
+   (number-sequence 9 16)))
+:source rfc5545-sec3.8.5.3/39)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4;BYDAY=TU,SU;WKST=MO\n"
+ "An example where the days generated makes a difference because of WKST:
+every other week on Tuesday and Sunday, week start Monday, for four recurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 8 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 EDT) August 5,10,19,24
+  dtstart
+  (ical:date-time-variant dtstart :day 10 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 19 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 24 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/40)
+
+(ict:rrule-test
+ "RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4;BYDAY=TU,SU;WKST=SU\n"
+ "An example where the days generated makes a difference because of WKST:
+every other week on Tuesday and Sunday, week start Sunday, for four recurrences"
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 1997 :month 8 :day 5
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (1997 EDT) August 5,17,19,31
+  dtstart
+  (ical:date-time-variant dtstart :day 17 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 19 :tz 'preserve)
+  (ical:date-time-variant dtstart :day 31 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/41)
+
+(ict:rrule-test
+ "RRULE:FREQ=MONTHLY;BYMONTHDAY=15,30;COUNT=5\n"
+ "An example where an invalid date (i.e., February 30) is ignored."
+ :tz ict:tz-eastern
+ :dtstart (ical:make-date-time :year 2007 :month 1 :day 15
+                               :hour 9 :minute 0 :second 0
+                               :zone ict:est :dst nil)
+ :high (ical:make-date-time :year 2007 :month 4 :day 1
+                               :hour 0 :minute 0 :second 0
+                               :zone ict:edt :dst t)
+ :members
+ (list
+  ;; ==> (2007 EST) January 15,30
+  ;;     (2007 EST) February 15
+  ;;     (2007 EDT) March 15,30
+  dtstart
+  (ical:date-time-variant dtstart :day 30 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 2 :day 15 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 3 :day 15 :zone ict:edt :dst t)
+  (ical:date-time-variant dtstart :month 3 :day 30 :zone ict:edt :dst t))
+ :nonmembers
+ (list
+  (ical:date-time-variant dtstart :month 2 :day 28 :tz 'preserve)
+  (ical:date-time-variant dtstart :month 2 :day 30 :tz 'preserve))
+ :source rfc5545-sec3.8.5.3/42)
+
+;; Local Variables:
+;; read-symbol-shorthands: (("ict:" . "icalendar-test-") ("icr:" . "icalendar-recur-") ("ical:" . "icalendar-"))
+;; End:
+;;; icalendar-recur-tests.el ends here
diff --git a/test/lisp/calendar/icalendar-resources/import-legacy-function.ics b/test/lisp/calendar/icalendar-resources/import-legacy-function.ics
new file mode 100644
index 00000000000..760131b8192
--- /dev/null
+++ b/test/lisp/calendar/icalendar-resources/import-legacy-function.ics
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:Testing legacy `icalendar-import-format' function

+DESCRIPTION:described

+CLASS:private

+LOCATION:somewhere

+ORGANIZER;CN="Baz Foo":mailto:baz@example.com

+STATUS:CONFIRMED

+URL:http://example.com/foo/baz

+UID:some-unique-id-here

+DTSTART;VALUE=DATE-TIME:20250919T090000

+DTEND;VALUE=DATE-TIME:20250919T113000

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-legacy-vars.ics b/test/lisp/calendar/icalendar-resources/import-legacy-vars.ics
new file mode 100644
index 00000000000..8aa80277b09
--- /dev/null
+++ b/test/lisp/calendar/icalendar-resources/import-legacy-vars.ics
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:Testing legacy `icalendar-import-format*' vars

+DESCRIPTION:described

+CLASS:private

+LOCATION:somewhere

+ORGANIZER;CN="Baz Foo":mailto:baz@example.com

+STATUS:CONFIRMED

+URL:http://example.com/foo/baz

+UID:some-unique-id-here

+DTSTART;VALUE=DATE-TIME:20250919T090000

+DTEND;VALUE=DATE-TIME:20250919T113000

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
index 4efa8ffa133..53380b9734d 100644
--- a/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
@@ -1,9 +1,8 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:non-recurring allday
-DTSTART;VALUE=DATE-TIME:20030919
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:non-recurring allday

+DTSTART;VALUE=DATE:20030919

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
index 2996f494167..de402a29d26 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
@@ -1,11 +1,10 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20040815
-DTEND;VALUE=DATE:20040816
-SUMMARY:Maria Himmelfahrt
-RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=8
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+DTSTART;VALUE=DATE:20040815

+SUMMARY:Maria Himmelfahrt

+RRULE:FREQ=YEARLY

+END:VEVENT

+END:VCALENDAR

+

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
index 5284bf42d8b..350e1aa0f24 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
@@ -1,12 +1,11 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:rrule daily with exceptions
-DTSTART;VALUE=DATE-TIME:20030919T090000
-DTEND;VALUE=DATE-TIME:20030919T113000
-RRULE:FREQ=DAILY;INTERVAL=2
-EXDATE:20030921,20030925
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:rrule daily with exceptions

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+RRULE:FREQ=DAILY;INTERVAL=2

+EXDATE;VALUE=DATE:20030921,20030925

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics b/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
index 6d013b0b4f6..93ed08065bc 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
@@ -1,11 +1,11 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:rrule daily
-DTSTART;VALUE=DATE-TIME:20030919T090000
-DTEND;VALUE=DATE-TIME:20030919T113000
-RRULE:FREQ=DAILY;
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:rrule daily

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+RRULE:FREQ=DAILY

+END:VEVENT

+END:VCALENDAR

+

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
index b871658600a..9448ca058f8 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
@@ -1,11 +1,11 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:rrule monthly no end
-DTSTART;VALUE=DATE-TIME:20030919T090000
-DTEND;VALUE=DATE-TIME:20030919T113000
-RRULE:FREQ=MONTHLY;
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:rrule monthly no end

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+RRULE:FREQ=MONTHLY

+END:VEVENT

+END:VCALENDAR

+

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
index d8a1fe2e5af..0434765d613 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
@@ -1,11 +1,10 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:rrule monthly with end
-DTSTART;VALUE=DATE-TIME:20030919T090000
-DTEND;VALUE=DATE-TIME:20030919T113000
-RRULE:FREQ=MONTHLY;UNTIL=20050819;
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:rrule monthly with end

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+RRULE:FREQ=MONTHLY;UNTIL=20050819

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
index c3f0b8ae933..44b6f44e2e0 100644
--- a/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
@@ -1,11 +1,11 @@
-BEGIN:VCALENDAR
-PRODID:-//Emacs//NONSGML icalendar.el//EN
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:rrule weekly
-DTSTART;VALUE=DATE-TIME:20030919T090000
-DTEND;VALUE=DATE-TIME:20030919T113000
-RRULE:FREQ=WEEKLY;
-END:VEVENT
-END:VCALENDAR
-
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:rrule weekly

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+RRULE:FREQ=WEEKLY

+END:VEVENT

+END:VCALENDAR

+

diff --git a/test/lisp/calendar/icalendar-resources/import-time-format-12hr-blank.ics b/test/lisp/calendar/icalendar-resources/import-time-format-12hr-blank.ics
new file mode 100644
index 00000000000..7f436df5391
--- /dev/null
+++ b/test/lisp/calendar/icalendar-resources/import-time-format-12hr-blank.ics
@@ -0,0 +1,9 @@
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+SUMMARY:12hr blank-padded

+DTSTART;VALUE=DATE-TIME:20030919T090000

+DTEND;VALUE=DATE-TIME:20030919T113000

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-with-attachment.ics b/test/lisp/calendar/icalendar-resources/import-with-attachment.ics
new file mode 100644
index 00000000000..0b1201714ef
--- /dev/null
+++ b/test/lisp/calendar/icalendar-resources/import-with-attachment.ics
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR

+PRODID:-//Emacs//NONSGML icalendar.el//EN

+VERSION:2.0

+BEGIN:VEVENT

+UID:f9fee9a0-1231-4984-9078-f1357db352db

+SUMMARY:Has an attachment

+ATTACH;VALUE=BINARY;FMTTYPE=text/plain;ENCODING=BASE64:R3JlZXRpbmdzISBJIGFt

+ IGEgYmFzZTY0LWVuY29kZWQgZmlsZQ==

+DTSTART;VALUE=DATE-TIME:20030919T090000

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-resources/import-with-timezone.ics b/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
index 110a9835e41..0db619e4f0a 100644
--- a/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
+++ b/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
@@ -1,27 +1,27 @@
-BEGIN:VCALENDAR
-BEGIN:VTIMEZONE
-TZID:fictional, nonexistent, arbitrary
-BEGIN:STANDARD
-DTSTART:20100101T000000
-TZOFFSETFROM:+0200
-TZOFFSETTO:-0200
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=01
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:20101201T000000
-TZOFFSETFROM:-0200
-TZOFFSETTO:+0200
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-SUMMARY:standardtime
-DTSTART;TZID="fictional, nonexistent, arbitrary":20120115T120000
-DTEND;TZID="fictional, nonexistent, arbitrary":20120115T123000
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:daylightsavingtime
-DTSTART;TZID="fictional, nonexistent, arbitrary":20121215T120000
-DTEND;TZID="fictional, nonexistent, arbitrary":20121215T123000
-END:VEVENT
-END:VCALENDAR
+BEGIN:VCALENDAR

+BEGIN:VTIMEZONE

+TZID:fictional

+BEGIN:STANDARD

+DTSTART:20100101T000000

+TZOFFSETFROM:+0200

+TZOFFSETTO:-0200

+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=01

+END:STANDARD

+BEGIN:DAYLIGHT

+DTSTART:20101201T000000

+TZOFFSETFROM:-0200

+TZOFFSETTO:+0200

+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11

+END:DAYLIGHT

+END:VTIMEZONE

+BEGIN:VEVENT

+SUMMARY:standardtime

+DTSTART;TZID=fictional:20120115T120000

+DTEND;TZID=fictional:20120115T123000

+END:VEVENT

+BEGIN:VEVENT

+SUMMARY:daylightsavingtime

+DTSTART;TZID=fictional:20121215T120000

+DTEND;TZID=fictional:20121215T123000

+END:VEVENT

+END:VCALENDAR

diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index fa1d1169ed6..bd2097b2fb8 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -30,11 +30,34 @@
 ;; Note: Watch the trailing blank that is added on import.
 
 ;;; Code:
-
 (require 'ert)
 (require 'ert-x)
 (require 'icalendar)
 
+;; Some variables in the icalendar-* namespace have now been aliased to
+;; diary-icalendar-*:
+(require 'diary-icalendar)
+
+(defmacro ical:deftest-obsolete (name _ &rest args-and-body)
+  "Define NAME as an obsolete icalendar.el test."
+  (let (args body)
+    (while (not body)
+      (cond ((stringp (car args-and-body))
+             (push (pop args-and-body) args)) ; docstring
+            ((keywordp (car args-and-body))
+             (push (pop args-and-body) args)  ; keyword
+             (push (pop args-and-body) args)) ; value
+            (t
+             (setq body args-and-body)
+             (setq args (nreverse args)))))
+    `(ert-deftest ,name () ,@args
+        ;; These values were used by icalendar.el when tests were written:
+        (let ((icalendar-recurring-start-year 2005)
+              (icalendar-vcalendar-prodid "-//Emacs//NONSGML icalendar.el//EN")
+              (icalendar-uid-format "emacs%t%c")
+              (icalendar-export-hidden-diary-entries t))
+          ,@body))))
+
 ;; ======================================================================
 ;; Helpers
 ;; ======================================================================
@@ -75,7 +98,7 @@
 ;; Tests of functions
 ;; ======================================================================
 
-(ert-deftest icalendar--create-uid ()
+(ical:deftest-obsolete icalendar--create-uid ()
   "Test for `icalendar--create-uid'."
   (let* ((icalendar-uid-format "xxx-%c-%h-%u-%s")
          (icalendar--uid-count 77)
@@ -92,7 +115,7 @@
     (should (string=  (concat "yyyDTSTARTyyy")
                       (icalendar--create-uid entry-full contents)))))
 
-(ert-deftest icalendar-convert-anniversary-to-ical ()
+(ical:deftest-obsolete icalendar-convert-anniversary-to-ical ()
   "Test method for `icalendar--convert-anniversary-to-ical'."
   (let* ((calendar-date-style 'iso)
          result)
@@ -106,7 +129,7 @@
                      (car result)))
     (should (string= "g" (cdr result)))))
 
-(ert-deftest icalendar--convert-cyclic-to-ical ()
+(ical:deftest-obsolete icalendar--convert-cyclic-to-ical ()
   "Test method for `icalendar--convert-cyclic-to-ical'."
   (let* ((calendar-date-style 'iso)
          result)
@@ -119,7 +142,7 @@
                      (car result)))
     (should (string= "Sommerferien" (cdr result)))))
 
-(ert-deftest icalendar--convert-block-to-ical ()
+(ical:deftest-obsolete icalendar--convert-block-to-ical ()
   "Test method for `icalendar--convert-block-to-ical'."
   (let* ((calendar-date-style 'iso)
          result)
@@ -132,7 +155,7 @@
                      (car result)))
     (should (string= "Sommerferien" (cdr result)))))
 
-(ert-deftest icalendar--convert-float-to-ical ()
+(ical:deftest-obsolete icalendar--convert-float-to-ical ()
   "Test method for `icalendar--convert-float-to-ical'."
   ;; See Bug#78085
   (let* ((calendar-date-style 'iso)
@@ -148,7 +171,7 @@
                      (car result)))
     (should (string= "1st Sat/month" (cdr result)))))
 
-(ert-deftest icalendar--convert-yearly-to-ical ()
+(ical:deftest-obsolete icalendar--convert-yearly-to-ical ()
   "Test method for `icalendar--convert-yearly-to-ical'."
   (let* ((calendar-date-style 'iso)
          result
@@ -164,7 +187,7 @@
                      (car result)))
     (should (string= "Tag der Arbeit" (cdr result)))))
 
-(ert-deftest icalendar--convert-weekly-to-ical ()
+(ical:deftest-obsolete icalendar--convert-weekly-to-ical ()
   "Test method for `icalendar--convert-weekly-to-ical'."
   (let* ((calendar-date-style 'iso)
          result
@@ -179,7 +202,7 @@
                      (car result)))
     (should (string= "subject" (cdr result)))))
 
-(ert-deftest icalendar--convert-sexp-to-ical ()
+(ical:deftest-obsolete icalendar--convert-sexp-to-ical ()
   "Test method for `icalendar--convert-sexp-to-ical'."
   (let* (result
          (icalendar-export-sexp-enumeration-days 3))
@@ -192,7 +215,7 @@
             (should (string-match "Hebrew date (until sunset): .*" (cdr i))))
           result)))
 
-(ert-deftest icalendar--convert-to-ical ()
+(ical:deftest-obsolete icalendar--convert-to-ical ()
   "Test method for `icalendar--convert-to-ical'."
   (let* (result
          (icalendar-export-sexp-enumerate-all t)
@@ -216,7 +239,7 @@
              (car (car result))))
     (should (string-match "Newton's birthday" (cdr (car result))))))
 
-(ert-deftest icalendar--parse-vtimezone ()
+(ical:deftest-obsolete icalendar--parse-vtimezone ()
   "Test method for `icalendar--parse-vtimezone'."
   (let (vtimezone result)
     ;; testcase: valid timezone with rrule
@@ -290,7 +313,7 @@ END:VTIMEZONE
     ;; FIXME: add testcase that covers changes for fix of bug#34315
     ))
 
-(ert-deftest icalendar--convert-ordinary-to-ical ()
+(ical:deftest-obsolete icalendar--convert-ordinary-to-ical ()
   "Test method for `icalendar--convert-ordinary-to-ical'."
   (let* ((calendar-date-style 'iso)
          result)
@@ -328,7 +351,7 @@ END:VTIMEZONE
                       (car result)))
     (should (string= "s" (cdr result)))))
 
-(ert-deftest icalendar--diarytime-to-isotime ()
+(ical:deftest-obsolete icalendar--diarytime-to-isotime ()
   "Test method for `icalendar--diarytime-to-isotime'."
   (should (string= "T011500"
                    (icalendar--diarytime-to-isotime "01:15" "")))
@@ -361,7 +384,7 @@ END:VTIMEZONE
   (should (string= "T150000"
                    (icalendar--diarytime-to-isotime "3" "pm"))))
 
-(ert-deftest icalendar--datetime-to-diary-date ()
+(ical:deftest-obsolete icalendar--datetime-to-diary-date ()
   "Test method for `icalendar--datetime-to-diary-date'."
   (let* ((datetime '(59 59 23 31 12 2008))
          (calendar-date-style 'iso))
@@ -374,7 +397,7 @@ END:VTIMEZONE
     (should (string= "12 31 2008"
                      (icalendar--datetime-to-diary-date datetime)))))
 
-(ert-deftest icalendar--datestring-to-isodate ()
+(ical:deftest-obsolete icalendar--datestring-to-isodate ()
   "Test method for `icalendar--datestring-to-isodate'."
   (let ((calendar-date-style 'iso))
     ;; numeric iso
@@ -427,7 +450,7 @@ END:VTIMEZONE
                      (icalendar--datestring-to-isodate "2021 Feb 11" nil 80)))
     ))
 
-(ert-deftest icalendar--first-weekday-of-year ()
+(ical:deftest-obsolete icalendar--first-weekday-of-year ()
   "Test method for `icalendar-first-weekday-of-year'."
   (should (eq 1 (icalendar-first-weekday-of-year "TU" 2008)))
   (should (eq 3 (icalendar-first-weekday-of-year "WE" 2007)))
@@ -439,7 +462,7 @@ END:VTIMEZONE
   (should (eq 3 (icalendar-first-weekday-of-year "MO" 2000)))
   (should (eq 1 (icalendar-first-weekday-of-year "TH" 1970))))
 
-(ert-deftest icalendar--import-format-sample ()
+(ical:deftest-obsolete icalendar--import-format-sample ()
   "Test method for `icalendar-import-format-sample'."
   (should (string= (concat "SUMMARY='a' DESCRIPTION='b' LOCATION='c' "
                            "ORGANIZER='d' STATUS='' URL='' CLASS=''")
@@ -455,7 +478,7 @@ DESCRIPTION:b
 END:VEVENT
 ")))))
 
-(ert-deftest icalendar--format-ical-event ()
+(ical:deftest-obsolete icalendar--format-ical-event ()
   "Test `icalendar--format-ical-event'."
   (let ((icalendar-import-format "%s%d%l%o%t%u%c")
         (icalendar-import-format-summary "SUM %s")
@@ -493,7 +516,7 @@ END:VEVENT
     (should (string= "-sum-des-loc-org-nil-nil-nil-"
                      (icalendar--format-ical-event event)))))
 
-(ert-deftest icalendar--parse-summary-and-rest ()
+(ical:deftest-obsolete icalendar--parse-summary-and-rest ()
   "Test `icalendar--parse-summary-and-rest'."
   (let ((icalendar-import-format "%s%d%l%o%t%u%c")
         (icalendar-import-format-summary "SUM %s")
@@ -521,7 +544,7 @@ END:VEVENT
     (should (not result))
     ))
 
-(ert-deftest icalendar--decode-isodatetime ()
+(ical:deftest-obsolete icalendar--decode-isodatetime ()
   "Test `icalendar--decode-isodatetime'."
   (let ((tz (getenv "TZ")))
     (unwind-protect
@@ -571,7 +594,7 @@ END:VEVENT
       ;; restore time-zone even if something went terribly wrong
       (setenv "TZ" tz))))
 
-(ert-deftest icalendar--convert-tz-offset ()
+(ical:deftest-obsolete icalendar--convert-tz-offset ()
   "Test `icalendar--convert-tz-offset'."
   (let ((tz (getenv "TZ")))
     (unwind-protect
@@ -634,7 +657,7 @@ END:VEVENT
       ;; restore time-zone even if something went terribly wrong
       (setenv "TZ" tz))))
 
-(ert-deftest icalendar--decode-isoduration ()
+(ical:deftest-obsolete icalendar--decode-isoduration ()
   "Test `icalendar--decode-isoduration'."
 
   ;; testcase: 7 days
@@ -764,7 +787,7 @@ END:VCALENDAR
       ;; cleanup!!
       (kill-buffer (find-buffer-visiting temp-file)))))
 
-(ert-deftest icalendar-export-ordinary-no-time ()
+(ical:deftest-obsolete icalendar-export-ordinary-no-time ()
   "Perform export test."
 
   (let ((icalendar-export-hidden-diary-entries nil))
@@ -783,7 +806,7 @@ DTEND;VALUE=DATE:20001004
 SUMMARY:ordinary no time
 "))
 
-(ert-deftest icalendar-export-ordinary ()
+(ical:deftest-obsolete icalendar-export-ordinary ()
   "Perform export test."
 
   (icalendar-tests--test-export
@@ -812,7 +835,7 @@ DTEND;VALUE=DATE-TIME:20001003T173000
 SUMMARY:ordinary with time 3
 "))
 
-(ert-deftest icalendar-export-multiline ()
+(ical:deftest-obsolete icalendar-export-multiline ()
   "Perform export test."
 
   ;; multiline -- FIXME!!!
@@ -830,7 +853,7 @@ DESCRIPTION:
   17:30 multiline continued FIXME
 "))
 
-(ert-deftest icalendar-export-weekly-by-day ()
+(ical:deftest-obsolete icalendar-export-weekly-by-day ()
   "Perform export test."
 
   ;; weekly by day
@@ -854,7 +877,7 @@ RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO
 SUMMARY:weekly by day with start and end time
 "))
 
-(ert-deftest icalendar-export-yearly ()
+(ical:deftest-obsolete icalendar-export-yearly ()
   "Perform export test."
   ;; yearly
   (icalendar-tests--test-export
@@ -867,7 +890,7 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYMONTHDAY=1
 SUMMARY:yearly no time
 "))
 
-(ert-deftest icalendar-export-anniversary ()
+(ical:deftest-obsolete icalendar-export-anniversary ()
   "Perform export test."
   ;; anniversaries
   (icalendar-tests--test-export
@@ -889,7 +912,7 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10;BYMONTHDAY=03
 SUMMARY:anniversary with time
 "))
 
-(ert-deftest icalendar-export-block ()
+(ical:deftest-obsolete icalendar-export-block ()
   "Perform export test."
   ;; block
   (icalendar-tests--test-export
@@ -919,7 +942,7 @@ RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20010706
 SUMMARY:block no end time
 "))
 
-(ert-deftest icalendar-export-alarms ()
+(ical:deftest-obsolete icalendar-export-alarms ()
   "Perform export test with different settings for exporting alarms."
   ;; no alarm
   (icalendar-tests--test-export
@@ -1016,7 +1039,7 @@ END:VALARM
 (defun icalendar-tests--diary-float (&rest args)
   (apply #'diary-float args))
 
-(ert-deftest icalendar-export-bug-56241-dotted-pair ()
+(ical:deftest-obsolete icalendar-export-bug-56241-dotted-pair ()
   "See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56241#5"
   ;; This test started failing early July 2023 without any apparent change
   ;; to the underlying code, so is probably sensitive to the current date.
@@ -1029,7 +1052,7 @@ END:VALARM
             "%%(icalendar-tests--diary-float 7 0 1) First Sunday in July 2"))))
 
 
-;; (ert-deftest icalendar-export-bug-56241-sexp-does-not-match ()
+;; (ical:deftest-obsolete icalendar-export-bug-56241-sexp-does-not-match ()
 ;;   "Reported in #bug56241 -- needs to be fixed!"
 ;;   (let ((icalendar-export-sexp-enumeration-days 0))
 ;;     (mapc (lambda (diary-string)
@@ -1038,7 +1061,7 @@ END:VALARM
 ;;           '("%%(diary-float 7 0 1) First Sunday in July 1"
 ;;             "%%(icalendar-tests--diary-float 7 0 1) First Sunday in July 2"))))
 
-(ert-deftest icalendar-export-bug-56241-nested-sexps ()
+(ical:deftest-obsolete icalendar-export-bug-56241-nested-sexps ()
   "Reported in #bug56241 -- needs to be fixed!"
   (let ((icalendar-export-sexp-enumeration-days 366))
     (mapc (lambda (diary-string)
@@ -1130,7 +1153,7 @@ Argument EXPECTED-OUTPUT file containing expected diary string."
         (should (string= expected-output result)))
       (kill-buffer (find-buffer-visiting temp-file)))))
 
-(ert-deftest icalendar-import-non-recurring ()
+(ical:deftest-obsolete icalendar-import-non-recurring ()
   "Perform standard import tests."
   (icalendar-tests--test-import "import-non-recurring-1.ics"
                                 "import-non-recurring-1.diary-iso"
@@ -1158,7 +1181,7 @@ Argument EXPECTED-OUTPUT file containing expected diary string."
                                 "import-non-recurring-another-example.diary-american"))
 
 
-(ert-deftest icalendar-import-rrule ()
+(ical:deftest-obsolete icalendar-import-rrule ()
   (icalendar-tests--test-import "import-rrule-daily.ics"
                                 "import-rrule-daily.diary-iso"
                                 "import-rrule-daily.diary-european"
@@ -1217,7 +1240,7 @@ Argument EXPECTED-OUTPUT file containing expected diary string."
                                 "import-rrule-count-every-second-year.diary-american")
   )
 
-(ert-deftest icalendar-import-duration ()
+(ical:deftest-obsolete icalendar-import-duration ()
   (icalendar-tests--test-import "import-duration.ics"
                                 "import-duration.diary-iso"
                                 "import-duration.diary-european"
@@ -1228,41 +1251,41 @@ Argument EXPECTED-OUTPUT file containing expected diary string."
                                 "import-duration-2.diary-european"
                                 "import-duration-2.diary-american"))
 
-(ert-deftest icalendar-import-bug-6766 ()
+(ical:deftest-obsolete icalendar-import-bug-6766 ()
   ;;bug#6766 -- multiple byday values in a weekly rrule
   (icalendar-tests--test-import "import-bug-6766.ics"
                                 "import-bug-6766.diary-iso"
                                 "import-bug-6766.diary-european"
                                 "import-bug-6766.diary-american"))
 
-(ert-deftest icalendar-import-bug-24199 ()
+(ical:deftest-obsolete icalendar-import-bug-24199 ()
   ;;bug#24199 -- monthly rule with byday-clause
   (icalendar-tests--test-import "import-bug-24199.ics"
                                 "import-bug-24199.diary-iso"
                                 "import-bug-24199.diary-european"
                                 "import-bug-24199.diary-american"))
 
-(ert-deftest icalendar-import-bug-33277 ()
+(ical:deftest-obsolete icalendar-import-bug-33277 ()
   ;;bug#33277 -- start time equals end time
   (icalendar-tests--test-import "import-bug-33277.ics"
                                 "import-bug-33277.diary-iso"
                                 "import-bug-33277.diary-european"
                                 "import-bug-33277.diary-american"))
 
-(ert-deftest icalendar-import-multiple-vcalendars ()
+(ical:deftest-obsolete icalendar-import-multiple-vcalendars ()
   (icalendar-tests--test-import "import-multiple-vcalendars.ics"
                                 "import-multiple-vcalendars.diary-iso"
                                 "import-multiple-vcalendars.diary-european"
                                 "import-multiple-vcalendars.diary-american"))
 
-(ert-deftest icalendar-import-with-uid ()
+(ical:deftest-obsolete icalendar-import-with-uid ()
   "Perform import test with uid."
   (icalendar-tests--test-import "import-with-uid.ics"
                                 "import-with-uid.diary-iso"
                                 "import-with-uid.diary-european"
                                 "import-with-uid.diary-american"))
 
-(ert-deftest icalendar-import-with-timezone ()
+(ical:deftest-obsolete icalendar-import-with-timezone ()
   ;; This is known to fail on MS-Windows, because the test assumes
   ;; Posix features of specifying DST rules.
   :expected-result (if (memq system-type '(windows-nt ms-dos))
@@ -1334,7 +1357,7 @@ Argument INPUT icalendar event string."
             (set-buffer-modified-p nil)
             (kill-buffer (current-buffer))))))))
 
-(ert-deftest icalendar-cycle ()
+(ical:deftest-obsolete icalendar-cycle ()
   "Perform cycling tests.
 Take care to avoid auto-generated UIDs here."
   (icalendar-tests--test-cycle
@@ -1363,7 +1386,7 @@ SUMMARY:and diary-anniversary
 ;; ======================================================================
 ;; Real world
 ;; ======================================================================
-(ert-deftest icalendar-real-world ()
+(ical:deftest-obsolete icalendar-real-world ()
   "Perform real-world tests, as gathered from problem reports."
   ;; This is known to fail on MS-Windows, since it doesn't support DST
   ;; specification with month and day.
@@ -1506,7 +1529,7 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=09;BYMONTHDAY=21
 SUMMARY:ff birthday (%d years old)")
 
   ;; FIXME: this testcase verifies that icalendar-export fails to
-  ;; export the nested sexp. After repairing bug56241 icalendar-export
+  ;; export the nested sexp.  After repairing bug56241 icalendar-export
   ;; works correctly for this sexp but now the testcase fails.
   ;; Therefore this testcase is disabled for the time being.
   ;;  (icalendar-tests--test-export
@@ -1702,7 +1725,7 @@ SUMMARY:NNN Wwwwwwww Wwwww - Aaaaaa Pppppppp rrrrrr ddd oo Nnnnnnnn 30
   (let ((time (icalendar--decode-isodatetime string day zone)))
     (format-time-string "%FT%T%z" (encode-time time) 0)))
 
-(ert-deftest icalendar-tests--decode-isodatetime ()
+(ical:deftest-obsolete icalendar-tests--decode-isodatetime ()
   "Test `icalendar--decode-isodatetime'."
   (should (equal (icalendar-test--format "20040917T050910-02:00")
                  "2004-09-17T03:09:10+0000"))
@@ -1728,4 +1751,8 @@ SUMMARY:NNN Wwwwwwww Wwwww - Aaaaaa Pppppppp rrrrrr ddd oo Nnnnnnnn 30
                  "2004-09-17T06:09:10+0000")))
 
 (provide 'icalendar-tests)
+;; Local Variables:
+;; read-symbol-shorthands: (("ical:" . "icalendar-"))
+;; byte-compile-warnings: (not obsolete)
+;; End:
 ;;; icalendar-tests.el ends here
diff --git a/test/lisp/misc-tests.el b/test/lisp/misc-tests.el
index b6f5f01ad2a..81ebe1a5869 100644
--- a/test/lisp/misc-tests.el
+++ b/test/lisp/misc-tests.el
@@ -25,6 +25,7 @@
 
 (require 'ert)
 (require 'misc)
+(require 'mule-util)
 
 (defmacro with-misc-test (original result &rest body)
   (declare (indent 2))
@@ -243,5 +244,94 @@
       (setq-default display-line-numbers dln))
     (should (= w0 w1))))
 
+;; Exercise `truncate-string-pixelwise' with strings of the same
+;; characters of differing widths, with and without ellipses, in varying
+;; faces, and varying face heights and compare results to each
+;; character's measured width.
+(ert-deftest misc-test-truncate-string-pixelwise ()
+  ;; Test empty string without an explicit buffer.
+  (should (equal (truncate-string-pixelwise "" 123) ""))
+  ;; Test fast path without an explicit buffer.
+  (should (equal (truncate-string-pixelwise "123" 123) "123"))
+  (with-temp-buffer
+    ;; Test empty string with an explicit buffer.
+    (should (equal (truncate-string-pixelwise "" 123 (current-buffer)) ""))
+    ;; Test fast path with an explicit buffer.
+    (should (equal (truncate-string-pixelwise "123" 123 (current-buffer)) "123")))
+
+  (dolist (c '(?W ?X ?y ?1))
+    (dolist (ellipsis `(nil "..." ,(truncate-string-ellipsis)))
+      (dolist (face '(fixed-pitch variable-pitch))
+        (dolist (height '(1.0 0.5 1.5))
+          (with-temp-buffer
+            (setq-local face-remapping-alist `((,face . default)))
+            (face-remap-add-relative 'default :height height)
+            (let ((char-pixels (string-pixel-width
+                                (make-string 1 c) (current-buffer))))
+              (dotimes (i 20)
+                (setq i (1+ i))
+                (should (eq i (length
+                               (truncate-string-pixelwise
+                                (make-string (* i 2) c)
+                                (* i char-pixels)
+                                (current-buffer)
+                                ellipsis))))))))))))
+
+;; Exercise `truncate-string-pixelwise' with varying unicode strings, in
+;; varying faces, and varying face heights and compare results to a
+;; naive `string-pixel-width' based string truncate function.
+(ert-deftest misc-test-truncate-string-pixelwise-unicode ()
+  :tags '(:expensive-test)
+  (skip-when noninteractive)
+  (let ((max-pixels 500)
+        (truncate-string-naive (lambda (string pixels buffer)
+                                 (while (and (length> string 0)
+                                             (> (string-pixel-width string buffer) pixels))
+                                   (setq string (substring string 0 (1- (length string)))))
+                                 string))
+        (strings (list
+                  "foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz"
+                  (concat "話說天下大勢，分久必合，合久必分：周末七國分爭，并入於秦。"
+                          "及秦滅之後，楚、漢分爭，又并入於漢。漢朝自高祖斬白蛇而起義，"
+                          "一統天下。後來光武中興，傳至獻帝，遂分為三國。推其致亂之由，"
+                          "殆始於桓、靈二帝。桓帝禁錮善類，崇信宦官。及桓帝崩，靈帝即位，"
+                          "大將軍竇武、太傅陳蕃，共相輔佐。時有宦官曹節等弄權，竇武、陳蕃謀誅之，"
+                          "作事不密，反為所害。中涓自此愈橫")
+                  (concat "короче теперь если по русски написать все четко или все равно"
+                          " короче теперь если по русски написать все четко или все равно"
+                          " короче теперь если по русски написать все четко или все равно"
+                          " короче теперь если по русски написать все четко или все равно")
+                  "будет разрыв строки непонятно где🏁🚩🎌🏴🏳️ 🏳️ <200d>🌈🏳️ <200d>⚧️🏴<200d>☠️"
+                  (apply #'concat (make-list 200 "\u0065\u0301 ")) ; composed é \u00E9
+                  (let ((woman-loves-man ; 👩‍❤️‍👨
+                         (concat "\N{WOMAN}"
+                                 "\N{ZERO WIDTH JOINER}"
+                                 "\N{HEAVY BLACK HEART}"
+                                 "\N{VARIATION SELECTOR-16}"
+                                 "\N{ZERO WIDTH JOINER}"
+                                 "\N{MAN}"
+                                 " ")))
+                    (apply #'concat (make-list 200 woman-loves-man)))
+                  (propertize (let ((varying-height-string
+                                     (mapconcat
+                                      #'identity
+                                      (list "AWi!"
+                                            (propertize "foo" 'face '(:height 2.5))
+                                            (propertize "bar" 'face '(:height 0.5))
+                                            (propertize "baz" 'face '(:height 1.0)))
+                                      " ")))
+                                (apply #'concat (make-list 100 varying-height-string)))
+                              'face 'variable-pitch))))
+    (dolist (face '(fixed-pitch variable-pitch))
+      (dolist (height '(1.0 0.5 1.5))
+        (with-temp-buffer
+          (setq-local face-remapping-alist `((,face . default)))
+          (face-remap-add-relative 'default :height height)
+          (dolist (string strings)
+            (should (eq (length (funcall truncate-string-naive
+                                         string max-pixels (current-buffer)))
+                        (length (truncate-string-pixelwise
+                                 string max-pixels (current-buffer)))))))))))
+
 (provide 'misc-tests)
 ;;; misc-tests.el ends here
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 53ce1929cad..3d0ab522d3f 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -28,10 +28,9 @@
 (defvar dbus-debug)
 (defvar dbus-message-type-signal)
 (declare-function dbus-get-unique-name "dbusbind.c" (bus))
-(declare-function dbus-close-inhibitor-lock "dbusbind.c" (lock))
-(declare-function dbus-registered-inhibitor-locks "dbusbind.c" ())
-(declare-function dbus-make-inhibitor-lock "dbusbind.c"
-                  (what why &optional block))
+(declare-function dbus--fd-open "dbusbind.c" (filename))
+(declare-function dbus--fd-close "dbusbind.c" (fd))
+(declare-function dbus--registered-fds "dbusbind.c" ())
 
 (defconst dbus--test-enabled-session-bus
   (and (featurep 'dbusbind)
@@ -2308,89 +2307,156 @@ The argument EXPECTED-ARGS is a list of expected arguments for the method."
     ;; Cleanup.
     (dbus-unregister-service :session dbus--test-service)))
 
-(ert-deftest dbus-test10-inhibitor-locks ()
-  "Check `dbus-*-inhibitor-locks'."
+(ert-deftest dbus-test10-keep-fd ()
+  "Check D-Bus `:keep-fd' argument."
   :tags '(:expensive-test)
   (skip-unless dbus--test-enabled-system-bus)
   (skip-unless (dbus-ping :system dbus--test-systemd-service 1000))
 
-  (let (lock1 lock2)
+  (let ((what "sleep")
+        (who "Emacs test user")
+        (why "Test delay")
+        (mode "delay")
+        (fd-directory (format "/proc/%d/fd" (emacs-pid)))
+        lock1 lock2)
     ;; Create inhibitor lock.
-    (setq lock1 (dbus-make-inhibitor-lock "sleep" "Test delay"))
+    (setq lock1
+          (dbus-call-method
+           :system dbus--test-systemd-service dbus--test-systemd-path
+           dbus--test-systemd-manager-interface "Inhibit"
+           what who why mode))
     (should (natnump lock1))
     ;; The lock is reported by systemd.
     (should
      (member
-      (list "sleep" "Emacs" "Test delay" "delay" (user-uid) (emacs-pid))
+      (list what who why mode (user-uid) (emacs-pid))
       (dbus-call-method
        :system dbus--test-systemd-service dbus--test-systemd-path
        dbus--test-systemd-manager-interface "ListInhibitors")))
-    ;; The lock is registered internally.
-    (should
-     (member
-      (list lock1 "sleep" "Test delay" nil)
-      (dbus-registered-inhibitor-locks)))
+    ;; The lock is not registered internally.
+    (should-not (assoc lock1 (dbus--registered-fds)))
     ;; There exist a file descriptor.
-    (when (file-directory-p (format "/proc/%d/fd" (emacs-pid)))
-      (should (file-symlink-p (format "/proc/%d/fd/%d" (emacs-pid) lock1))))
-
-    ;; It is not possible to modify registered inhibitor locks on Lisp level.
-    (setcar (assoc lock1 (dbus-registered-inhibitor-locks)) 'malicious)
-    (should (assoc lock1 (dbus-registered-inhibitor-locks)))
-    (should-not (assoc 'malicious (dbus-registered-inhibitor-locks)))
-
-    ;; Creating it again returns the same inhibitor lock.
-    (should (= lock1 (dbus-make-inhibitor-lock "sleep" "Test delay")))
+    (when (file-directory-p fd-directory)
+      (should
+       (file-symlink-p
+        (expand-file-name (number-to-string lock1) fd-directory))))
 
-    ;; Create another inhibitor lock.
-    (setq lock2 (dbus-make-inhibitor-lock "sleep" "Test block" 'block))
+    ;; Create another inhibitor lock.  Keep the file descriptor.
+    (setq lock2
+          (dbus-call-method
+           :system dbus--test-systemd-service dbus--test-systemd-path
+           dbus--test-systemd-manager-interface "Inhibit" :keep-fd
+           what who why mode))
     (should (natnump lock2))
     (should-not (= lock1 lock2))
     ;; The lock is reported by systemd.
     (should
      (member
-      (list "sleep" "Emacs" "Test block" "block" (user-uid) (emacs-pid))
+      (list what who why mode (user-uid) (emacs-pid))
       (dbus-call-method
        :system dbus--test-systemd-service dbus--test-systemd-path
        dbus--test-systemd-manager-interface "ListInhibitors")))
     ;; The lock is registered internally.
     (should
      (member
-      (list lock2 "sleep" "Test block" t)
-      (dbus-registered-inhibitor-locks)))
+      (cons lock2 dbus--test-systemd-path)
+      (dbus--registered-fds)))
     ;; There exist a file descriptor.
-    (when (file-directory-p (format "/proc/%d/fd" (emacs-pid)))
-      (should (file-symlink-p (format "/proc/%d/fd/%d" (emacs-pid) lock2))))
-
-    ;; Close the first inhibitor lock.
-    (should (dbus-close-inhibitor-lock lock1))
-    ;; The internal registration has gone.
-    (should-not
-     (member
-      (list lock1 "sleep" "Test delay" nil)
-      (dbus-registered-inhibitor-locks)))
-    ;; The file descriptor has been deleted.
-    (when (file-directory-p (format "/proc/%d/fd" (emacs-pid)))
-      (should-not (file-symlink-p (format "/proc/%d/fd/%d" (emacs-pid) lock1))))
-
-    ;; Closing it again is a noop.
-    (should-not (dbus-close-inhibitor-lock lock1))
-
-    ;; Creating it again returns (another?) inhibitor lock.
-    (setq lock1 (dbus-make-inhibitor-lock "sleep" "Test delay"))
+    (when (file-directory-p fd-directory)
+      (should
+       (file-symlink-p
+        (expand-file-name (number-to-string lock2) fd-directory))))
+
+    ;; Create another inhibitor lock via
+    ;; `dbus-call-method-asynchronously'.  Keep the file descriptor.
+    (setq lock1 nil)
+    (dbus-call-method-asynchronously
+     :system dbus--test-systemd-service dbus--test-systemd-path
+     dbus--test-systemd-manager-interface "Inhibit"
+     (lambda (lock) (setq lock1 lock)) :keep-fd
+     what who why mode)
+    (with-timeout (1 (dbus--test-timeout-handler))
+      (while (null lock1) (read-event nil nil 0.1)))
     (should (natnump lock1))
+    (should-not (= lock1 lock2))
     ;; The lock is registered internally.
     (should
      (member
-      (list lock1 "sleep" "Test delay" nil)
-      (dbus-registered-inhibitor-locks)))
+      (cons lock1 dbus--test-systemd-path)
+      (dbus--registered-fds)))
     ;; There exist a file descriptor.
-    (when (file-directory-p (format "/proc/%d/fd" (emacs-pid)))
-      (should (file-symlink-p (format "/proc/%d/fd/%d" (emacs-pid) lock1))))
+    (when (file-directory-p fd-directory)
+      (should
+       (file-symlink-p
+        (expand-file-name (number-to-string lock1) fd-directory))))
+
+    ;; It is not possible to modify registered inhibitor locks on Lisp level.
+    (setcar (assoc lock1 (dbus--registered-fds)) 'malicious)
+    (should (assoc lock1 (dbus--registered-fds)))
+    (should-not (assoc 'malicious (dbus--registered-fds)))
 
     ;; Close the inhibitor locks.
-    (should (dbus-close-inhibitor-lock lock1))
-    (should (dbus-close-inhibitor-lock lock2))))
+    (should (dbus--fd-close lock1))
+    (should (dbus--fd-close lock2))
+    ;; The internal registration has gone.
+    (should-not
+     (member
+      (cons lock1 dbus--test-systemd-path)
+      (dbus--registered-fds)))
+    (should-not
+     (member
+      (cons lock2 dbus--test-systemd-path)
+      (dbus--registered-fds)))
+    ;; The file descriptors have been deleted.
+    (when (file-directory-p fd-directory)
+      (should-not
+       (file-exists-p (expand-file-name (number-to-string lock1) fd-directory)))
+      (should-not
+       (file-exists-p (expand-file-name (number-to-string lock2) fd-directory))))
+
+    ;; Closing them again is a noop.
+    (should-not (dbus--fd-close lock1))
+    (should-not (dbus--fd-close lock2))))
+
+(ert-deftest dbus-test10-open-close-fd ()
+  "Check D-Bus open/close a file descriptor."
+  :tags '(:expensive-test)
+  (skip-unless dbus--test-enabled-system-bus)
+  (skip-unless (dbus-ping :system dbus--test-systemd-service 1000))
+
+  (ert-with-temp-file tmpfile
+    (let ((fd-directory (format "/proc/%d/fd" (emacs-pid)))
+          fd)
+      ;; Create file descriptor.
+      (setq fd (dbus--fd-open tmpfile))
+      (should (natnump fd))
+      ;; The file descriptor is registered internally.
+      (should (member (cons fd tmpfile) (dbus--registered-fds)))
+      ;; There exist a file descriptor file.
+      (when (file-directory-p fd-directory)
+        (should
+         (file-symlink-p (expand-file-name (number-to-string fd) fd-directory)))
+        (should
+         (string-equal
+          (file-truename (expand-file-name (number-to-string fd) fd-directory))
+          tmpfile)))
+
+      ;; It is not possible to modify registered file descriptors on Lisp level.
+      (setcar (assoc fd (dbus--registered-fds)) 'malicious)
+      (should (assoc fd (dbus--registered-fds)))
+      (should-not (assoc 'malicious (dbus--registered-fds)))
+
+      ;; Close the file descriptor.
+      (should (dbus--fd-close fd))
+      ;; The internal registration has gone.
+      (should-not (member (cons fd tmpfile) (dbus--registered-fds)))
+      ;; The file descriptor file has been deleted.
+      (when (file-directory-p fd-directory)
+        (should-not
+         (file-exists-p (expand-file-name (number-to-string fd) fd-directory))))
+
+      ;; Closing it again is a noop.
+      (should-not (dbus--fd-close fd)))))
 
 (defun dbus-test-all (&optional interactive)
   "Run all tests for \\[dbus]."
diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index f3bfaac005c..79fbe38b299 100644
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -757,7 +757,7 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
           ;; `set-file-modes' is not implemented.
           (should-error
            (set-file-modes tmp-name1 #o777)
-           :type 'file-error)
+           :type 'remote-file-error)
           (should (= (file-modes tmp-name1) #o400))
           (should-not (file-executable-p tmp-name1))
           (should-not (file-writable-p tmp-name1))
@@ -766,7 +766,7 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
           ;; `set-file-modes' is not implemented.
           (should-error
            (set-file-modes tmp-name2 #o777)
-           :type 'file-error)
+           :type 'remote-file-error)
           (should (= (file-modes tmp-name2) #o500))
           (should (file-executable-p tmp-name2))
           (should-not (file-writable-p tmp-name2)))
@@ -796,7 +796,7 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'."
           ;; `make-symbolic-link' is not implemented.
           (should-error
            (make-symbolic-link tmp-name1 tmp-name2)
-           :type 'file-error)
+           :type 'remote-file-error)
           (should (file-symlink-p tmp-name2))
           (should (file-regular-p tmp-name2))
           (should
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index bbfe15d2f59..28d773ca616 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -71,6 +71,7 @@
 (declare-function edebug-mode "edebug")
 (declare-function project-mode-line-format "project")
 (declare-function tramp-check-remote-uname "tramp-sh")
+(declare-function tramp-file-name-with-sudo "tramp-cmds")
 (declare-function tramp-find-executable "tramp-sh")
 (declare-function tramp-get-remote-chmod-h "tramp-sh")
 (declare-function tramp-get-remote-path "tramp-sh")
@@ -185,7 +186,7 @@ The temporary file is not created."
   (declare (indent defun) (debug (body)))
   `(condition-case err
        (progn ,@body)
-     (file-error
+     (remote-file-error
       (unless (string-match-p
                (rx bol (| "make-symbolic-link not supported"
                           (: "Making symbolic link"
@@ -2203,19 +2204,31 @@ being the result.")
            m))
          :type 'user-error)))))
 
-(ert-deftest tramp-test03-file-name-method-rules ()
-  "Check file name rules for some methods."
-  (skip-unless (eq tramp-syntax 'default))
-  (skip-unless (tramp--test-enabled))
-
-  ;; Multi hops are allowed for inline methods only.
-  (let (non-essential)
-    (should-error
-     (expand-file-name "/ssh:user1@host1|method:user2@host2:/path/to/file")
-     :type 'user-error)
-    (should-error
-     (expand-file-name "/method:user1@host1|ssh:user2@host2:/path/to/file")
-     :type 'user-error)))
+(ert-deftest tramp-test03-file-error ()
+  "Check that Tramp signals an error in case of connection problems."
+  ;; Connect to a non-existing host.
+  (let ((vec (copy-tramp-file-name tramp-test-vec))
+        ;; Don't poison it.
+        (tramp-default-proxies-alist tramp-default-proxies-alist)
+        (tramp-show-ad-hoc-proxies t))
+    (cl-letf* (((symbol-function #'read-string) #'ignore) ; Suppress password.
+               ((tramp-file-name-host vec) "example.com.invalid"))
+      (should-error
+       (file-exists-p (tramp-make-tramp-file-name vec))
+       ;; `user-error' is raised if the host shall be local.
+       ;; `remote-file-error' is raised if the host cannot be connected.
+       :type (if (tramp--test-ange-ftp-p)
+                 'ftp-error '(user-error remote-file-error)))
+      (should-error
+       (file-exists-p (tramp-make-tramp-file-name vec))
+       ;; `ftp-error' and `remote-file-error' are subcategories of
+       ;; `file-error'.  Let's check this as well.
+       :type '(user-error file-error))
+      ;; Check multi-hop.
+      (should-error
+       (file-exists-p
+        (tramp-file-name-with-sudo (tramp-make-tramp-file-name vec)))
+       :type '(user-error file-error)))))
 
 (ert-deftest tramp-test04-substitute-in-file-name ()
   "Check `substitute-in-file-name'."
@@ -7637,11 +7650,12 @@ This requires restrictions of file name syntax."
   (unless (tramp--test-crypt-p)
     (or (tramp--test-adb-p) (tramp--test-sh-p) (tramp--test-sshfs-p)
         (and (tramp--test-smb-p)
-             (file-writable-p
-              (file-name-concat
-               (file-remote-p ert-remote-temporary-file-directory)
-               ;; We check a directory on the "ADMIN$" share.
-               "ADMIN$" "Boot"))))))
+             (ignore-errors
+               (file-writable-p
+                (file-name-concat
+                 (file-remote-p ert-remote-temporary-file-directory)
+                 ;; We check a directory on the "ADMIN$" share.
+                 "ADMIN$" "Boot")))))))
 
 (defun tramp--test-supports-set-file-modes-p ()
   "Return whether the method under test supports setting file modes."
diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el
index 7267754dc7d..ffc097fee74 100644
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -1017,7 +1017,8 @@ int main() {
            "fn main() -> i32 { return 42.2;}")
           ("other-file.rs" .
            "fn foo() -> () { let hi=3; }"))))
-    (let ((eglot-server-programs '((rust-mode . ("rust-analyzer")))))
+    (let ((eglot-server-programs '((rust-mode . ("rust-analyzer"))))
+          (project-vc-non-essential-cache-timeout 0))
       ;; Open other-file.rs, and see diagnostics arrive for main.rs,
       ;; which we didn't open.
       (with-current-buffer (eglot--find-file-noselect "project/other-file.rs")
diff --git a/test/lisp/vc/ediff-mult-tests.el b/test/lisp/vc/ediff-mult-tests.el
index e3514f77d2f..7887ae086fe 100644
--- a/test/lisp/vc/ediff-mult-tests.el
+++ b/test/lisp/vc/ediff-mult-tests.el
@@ -20,13 +20,12 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'ediff-mult)
 
 (ert-deftest ediff-test-bug3348 ()
   "After saving `ediff-meta-diff-buffer' to a file, we should not reuse it."
-  (let ((test-dir
-         (expand-file-name "bug-3348-testdir" temporary-file-directory)))
-    (make-directory test-dir t)
+  (ert-with-temp-directory test-dir
     (cd test-dir)
 
     (make-directory "dir-a" t)
diff --git a/test/lisp/vc/vc-git-tests.el b/test/lisp/vc/vc-git-tests.el
index fe55cc75d6f..9721cc4d4ff 100644
--- a/test/lisp/vc/vc-git-tests.el
+++ b/test/lisp/vc/vc-git-tests.el
@@ -194,4 +194,39 @@ is absent."
               ("Tracking" . ,main-branch)
               ("Remote"   . "none (tracking local branch)")))))))))
 
+(ert-deftest vc-git-test-branch-remotes ()
+  "Test behavior of `vc-git--branch-remotes'."
+  (skip-unless (executable-find vc-git-program))
+  (vc-git-test--with-repo repo
+    (let ((main-branch (vc-git-test--start-branch)))
+      (should (null (vc-git--branch-remotes)))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.remote" main-branch)
+                      "origin")
+      (should (null (vc-git--branch-remotes)))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.merge" main-branch)
+                      main-branch)
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (null (assq 'push alist))))
+      (vc-git--out-ok "config"
+                      (format "branch.%s.pushRemote" main-branch)
+                      "fork")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (equal (cdr (assq 'push alist))
+                       (concat "fork/" main-branch))))
+      (vc-git--out-ok "config" "--unset"
+                      (format "branch.%s.pushRemote" main-branch))
+      (vc-git--out-ok "config" "remote.pushDefault" "fork")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (equal (cdr (assq 'push alist))
+                       (concat "fork/" main-branch))))
+      (vc-git--out-ok "config" "remote.pushDefault" "origin")
+      (let ((alist (vc-git--branch-remotes)))
+        (should (assq 'upstream alist))
+        (should (null (assq 'push alist)))))))
+
 ;;; vc-git-tests.el ends here
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index 5f534ed513a..f4654e90bce 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1060,7 +1060,9 @@ should evaporate overlays in both."
       (should-length 2 (overlays-in 1 (point-max)))
       (should-length 1 (overlays-in (point-max) (point-max)))
       (narrow-to-region 1 50)
-      (should-length 1 (overlays-in 1 (point-max)))
+      ;; We only count empty overlays in narrowed buffers excluding the
+      ;; real EOB when the region is confined to `point-max'.
+      (should-length 0 (overlays-in 1 (point-max)))
       (should-length 1 (overlays-in (point-max) (point-max))))))
 
 
@@ -8375,8 +8377,11 @@ dicta sunt, explicabo.  "))
     (should (= (length (overlays-in 1 2)) 0))
     (narrow-to-region 1 2)
     ;; We've now narrowed, so the zero-length overlay is at the end of
-    ;; the (accessible part of the) buffer.
-    (should (= (length (overlays-in 1 2)) 1))
+    ;; the (accessible part of the) buffer, but we only count it when
+    ;; the region is confined to `point-max'.
+    (should (= (length (overlays-in 1 2)) 0))
+    (should (= (length (overlays-in 2 2)) 1))
+    (should (= (length (overlays-in (point-max) (point-max))) 1))
     (remove-overlays)
     (should (= (length (overlays-in (point-min) (point-max))) 0))))
 
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index 0540a99f4c3..2fc971d0214 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -951,4 +951,38 @@ comparing the subr with a much slower Lisp implementation."
     (should-error (aset s 3 #x3fff80))) ; new char not ASCII
   )
 
+(ert-deftest data-tests-per-buffer-var-predicates ()
+  (with-temp-buffer
+    ;; per buffer variable without predicate
+    (progn
+      (setq line-spacing 2.3)
+      (should (= line-spacing 2.3))
+      (setq line-spacing "2.3")
+      (should (equal line-spacing "2.3"))
+      (setq line-spacing nil)
+      (should (equal line-spacing nil)))
+    ;; per buffer variable with 'fraction predicate
+    (progn
+      (dolist (v '(nil 0.7))
+        (setq scroll-up-aggressively v)
+        (should (equal scroll-up-aggressively v)))
+      (should-error (setq scroll-up-aggressively 'abc)
+                    :type 'wrong-type-argument)
+      (should-error (setq scroll-up-aggressively 2.7))
+      (should (equal scroll-up-aggressively 0.7)))
+    ;; per buffer variable with 'vertical-scroll-bar predicate
+    (progn
+      (dolist (v (get 'vertical-scroll-bar 'choice))
+        (setq vertical-scroll-bar v)
+        (should (equal vertical-scroll-bar v)))
+      (should-error (setq vertical-scroll-bar 'foo))
+      (should (equal vertical-scroll-bar 'right)))
+    ;; per buffer variable with 'overwrite-mode predicate
+    (progn
+      (dolist (v (get 'overwrite-mode 'choice))
+        (setq overwrite-mode v)
+        (should (equal overwrite-mode v)))
+      (should-error (setq overwrite-mode 'foo))
+      (should (equal overwrite-mode 'overwrite-mode-binary)))))
+
 ;;; data-tests.el ends here