From 382e60ba692fa8877cfa2ea531b56baa9cf2e6b7 Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Thu, 28 May 2020 14:45:00 +0200 Subject: Extend import of recurrence rules Support has been implemented for recurrence rule parts BYMONTH, BYMONTHDAY and BYDAY. A new test has been added. Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- test/ical-003.sh | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'test/ical-003.sh') diff --git a/test/ical-003.sh b/test/ical-003.sh index 69cb4c3..cff65c0 100755 --- a/test/ical-003.sh +++ b/test/ical-003.sh @@ -8,13 +8,13 @@ if [ "$1" = 'actual' ]; then cp "$DATA_DIR/conf" .calcurse || exit 1 "$CALCURSE" -D "$PWD/.calcurse" -i "$DATA_DIR/ical-003.ical" "$CALCURSE" -D "$PWD/.calcurse" -s01/01/2000 -r365 - "$CALCURSE" -D "$PWD/.calcurse" -s05/01/2020 --to 01/01/2022 + "$CALCURSE" -D "$PWD/.calcurse" -s05/01/2020 --to 01/01/2023 cat "$PWD/.calcurse/notes"/* rm -rf .calcurse || exit 1 elif [ "$1" = 'expected' ]; then cat < 01:30 Recurring appointment @@ -136,9 +136,14 @@ Import process report: 0052 lines read Recurring appointment 05/02/20: * First weekend in May + * First weekend in May + - 00:00 -> ..:.. + First weekend in May 05/03/20: * First weekend in May + - ..:.. -> 00:00 + First weekend in May 05/26/20: - 12:00 -> 13:17 @@ -182,6 +187,15 @@ Import process report: 0052 lines read - 21:45 -> 22:00 monthly on 31th, count 10, exceptions 31/7/2020 and 31/1/2021 +05/01/21: + * First weekend in May + - 00:00 -> ..:.. + First weekend in May + +05/02/21: + - ..:.. -> 00:00 + First weekend in May + 05/31/21: - 21:45 -> 22:00 monthly on 31th, count 10, exceptions 31/7/2020 and 31/1/2021 @@ -201,7 +215,23 @@ Import process report: 0052 lines read 12/31/21: - 21:45 -> 22:00 monthly on 31th, count 10, exceptions 31/7/2020 and 31/1/2021 + +05/07/22: + * First weekend in May + - 00:00 -> ..:.. + First weekend in May + +05/08/22: + - ..:.. -> 00:00 + First weekend in May +First weekend in May is a two-day event! +Repeating appointment. The first weekend in May is a two-day event. +Non-repeating event. +-- +Import: multi-day event changed to one-day event +First weekend in May is a two-day event! +Repeating event, three years. -- Import: multi-day event changed to one-day event EOD -- cgit v1.2.3-54-g00ecf