From be2b46ac9c8624291d4f1ec2872ebeeb77ca3a02 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 5 Oct 2011 11:30:51 +0200 Subject: [PATCH] testing: added recurring all-day with EXDATE The only other EXDATE test uses a time and thus VALUE=DATE-TIME for EXDATE. The new test cases uses VALUE=DATE for DTSTART and thus EXDATE. Probably will need adapting for various servers. --- test/testcases/eds_event.ics | 22 +++++++ test/testcases/eds_event.ics.Ovi.tem.patch | 4 +- test/testcases/eds_event.ics.apple.tem.patch | 2 +- .../eds_event.ics.googlecalendar.tem.patch | 65 ++++++++++++------- .../testcases/eds_event.ics.memotoo.tem.patch | 14 ++-- .../testcases/eds_event.ics.mobical.tem.patch | 4 +- .../eds_event.ics.nokia_7210c.tem.patch | 4 +- 7 files changed, 79 insertions(+), 36 deletions(-) diff --git a/test/testcases/eds_event.ics b/test/testcases/eds_event.ics index 1cd2d7d9..677d7165 100644 --- a/test/testcases/eds_event.ics +++ b/test/testcases/eds_event.ics @@ -168,6 +168,28 @@ LAST-MODIFIED:20060416T204808Z END:VEVENT END:VCALENDAR +BEGIN:VCALENDAR +PRODID:-//Ximian//NONSGML Evolution Calendar//EN +VERSION:2.0 +BEGIN:VEVENT +UID:20060416T204647Z-4272-727-1-248-allday@gollum +DTSTAMP:20060416T204647Z +DTSTART;VALUE=DATE:20060406 +DTEND;VALUE=DATE:20060407 +TRANSP:OPAQUE +SEQUENCE:2 +SUMMARY:all-day recurrence\, daily\, with exceptions +DESCRIPTION:recurrs seven times\, excluding (but counting) Friday and + Saturday +CLASS:PUBLIC +RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412 +EXDATE;VALUE=DATE:20060408 +EXDATE;VALUE=DATE:20060407 +CREATED:20060416T204808Z +LAST-MODIFIED:20060416T204808Z +END:VEVENT +END:VCALENDAR + BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 diff --git a/test/testcases/eds_event.ics.Ovi.tem.patch b/test/testcases/eds_event.ics.Ovi.tem.patch index 2af4ff61..bdd239fe 100644 --- a/test/testcases/eds_event.ics.Ovi.tem.patch +++ b/test/testcases/eds_event.ics.Ovi.tem.patch @@ -123,7 +123,7 @@ UID:20060416T204647Z-4272-727-1-248@gollum DTSTAMP:20060416T204647Z DTSTART:20060406T183000Z -@@ -216,10 +105,6 @@ +@@ -238,10 +127,6 @@ SUMMARY:meeting invitation CLASS:PUBLIC ORGANIZER;CN=Patrick Ohly:MAILTO:Patrick.Ohly@gmx.de @@ -134,7 +134,7 @@ CREATED:20060416T205003Z LAST-MODIFIED:20060416T205003Z END:VEVENT -@@ -357,37 +242,3 @@ +@@ -379,37 +264,3 @@ DESCRIPTION:third instance modified\, different time END:VEVENT END:VCALENDAR diff --git a/test/testcases/eds_event.ics.apple.tem.patch b/test/testcases/eds_event.ics.apple.tem.patch index c616810a..7a12e3e8 100644 --- a/test/testcases/eds_event.ics.apple.tem.patch +++ b/test/testcases/eds_event.ics.apple.tem.patch @@ -23,7 +23,7 @@ UID:20060416T203813Z-4272-727-1-242@gollum DTSTAMP:20060416T203813Z DTSTART:20060406T173000Z -@@ -215,7 +197,6 @@ +@@ -237,7 +219,6 @@ CATEGORIES:BUSINESS,MEETING SUMMARY:meeting invitation CLASS:PUBLIC diff --git a/test/testcases/eds_event.ics.googlecalendar.tem.patch b/test/testcases/eds_event.ics.googlecalendar.tem.patch index fc5f7986..212f8dd6 100644 --- a/test/testcases/eds_event.ics.googlecalendar.tem.patch +++ b/test/testcases/eds_event.ics.googlecalendar.tem.patch @@ -177,7 +177,7 @@ CREATED:20060416T204808Z LAST-MODIFIED:20060416T204808Z END:VEVENT -@@ -171,11 +261,29 @@ +@@ -193,11 +283,29 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -209,7 +209,7 @@ TRANSP:TRANSPARENT SEQUENCE:4 SUMMARY:all fields -@@ -205,34 +313,29 @@ +@@ -227,34 +335,29 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -264,7 +264,7 @@ TRANSP:OPAQUE SEQUENCE:2 SUMMARY:Recurring -@@ -247,18 +350,36 @@ +@@ -269,18 +372,36 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -304,7 +304,7 @@ DESCRIPTION:second instance modified END:VEVENT END:VCALENDAR -@@ -266,18 +387,36 @@ +@@ -288,18 +409,36 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -344,7 +344,7 @@ DESCRIPTION:third instance modified\, different time END:VEVENT END:VCALENDAR -@@ -285,11 +424,29 @@ +@@ -307,11 +446,29 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -376,7 +376,7 @@ TRANSP:OPAQUE SEQUENCE:2 SUMMARY:Recurring 2 -@@ -304,90 +461,36 @@ +@@ -326,18 +483,36 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -417,25 +417,46 @@ DESCRIPTION:second instance modified\, single detached recurrence END:VEVENT END:VCALENDAR -- --BEGIN:VCALENDAR --PRODID:-//Ximian//NONSGML Evolution Calendar//EN --VERSION:2.0 --BEGIN:VEVENT --UID:20080407T193125Z-19554-727-1-50-YY@gollum --DTSTAMP:20080407T193125Z +@@ -345,71 +520,36 @@ + BEGIN:VCALENDAR + PRODID:-//Ximian//NONSGML Evolution Calendar//EN + VERSION:2.0 ++BEGIN:VTIMEZONE ++TZID:/softwarestudio.org/Olson_20011030_5/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:20080407T193125Z-19554-727-1-50-YY@gollum + DTSTAMP:20080407T193125Z -DTSTART:20080413T090000Z -DTEND:20080413T093000Z --TRANSP:OPAQUE --SEQUENCE:7 --SUMMARY:Recurring 3: Modified --CLASS:PUBLIC --CREATED:20080407T193241Z --LAST-MODIFIED:20080407T193647 ++DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000 ++DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T113000 + TRANSP:OPAQUE + SEQUENCE:7 + SUMMARY:Recurring 3: Modified + CLASS:PUBLIC + CREATED:20080407T193241Z + LAST-MODIFIED:20080407T193647 -RECURRENCE-ID:20080413T090000Z --DESCRIPTION:second instance modified --END:VEVENT --END:VCALENDAR ++RECURRENCE-ID;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20080413T110000 + DESCRIPTION:second instance modified + END:VEVENT + END:VCALENDAR - -BEGIN:VCALENDAR -PRODID:-//Ximian//NONSGML Evolution Calendar//EN diff --git a/test/testcases/eds_event.ics.memotoo.tem.patch b/test/testcases/eds_event.ics.memotoo.tem.patch index 35cbe789..f33bb8ec 100644 --- a/test/testcases/eds_event.ics.memotoo.tem.patch +++ b/test/testcases/eds_event.ics.memotoo.tem.patch @@ -124,7 +124,7 @@ CREATED:20060416T204808Z LAST-MODIFIED:20060416T204808Z END:VEVENT -@@ -189,7 +169,7 @@ +@@ -211,7 +191,7 @@ characters:\na-umlaut รค\nexclamation mark !\nampersand disabled\nhash #\nleft angle bracket disabled\nright angle bracket disabled\nleft square bracket [\nright square bracket ]\nleft bracket (\nright bracket @@ -133,7 +133,7 @@ ^\npercent %\ntilde ~\ntick `\nbacktick `\ndouble quotation - not tested because Evolution encodes it incorrectly\nsingle quotation '\ncolon :\n semicolon \;\ncomma \,\n -@@ -212,7 +192,7 @@ +@@ -234,7 +214,7 @@ DTEND:20060406T200000Z TRANSP:OPAQUE SEQUENCE:2 @@ -142,7 +142,7 @@ SUMMARY:meeting invitation CLASS:PUBLIC ORGANIZER;CN=Patrick Ohly:MAILTO:Patrick.Ohly@gmx.de -@@ -231,14 +211,16 @@ +@@ -253,14 +233,16 @@ BEGIN:VEVENT UID:20080407T193125Z-19554-727-1-50@gollum DTSTAMP:20080407T193125Z @@ -162,7 +162,7 @@ CREATED:20080407T193241Z LAST-MODIFIED:20080407T193241 END:VEVENT -@@ -258,7 +240,7 @@ +@@ -280,7 +262,7 @@ CLASS:PUBLIC CREATED:20080407T193241Z LAST-MODIFIED:20080407T193647 @@ -171,7 +171,7 @@ DESCRIPTION:second instance modified END:VEVENT END:VCALENDAR -@@ -277,7 +259,7 @@ +@@ -299,7 +281,7 @@ CLASS:PUBLIC CREATED:20080407T193241Z LAST-MODIFIED:20080407T193647 @@ -180,7 +180,7 @@ DESCRIPTION:third instance modified\, different time END:VEVENT END:VCALENDAR -@@ -288,14 +270,15 @@ +@@ -310,14 +292,15 @@ BEGIN:VEVENT UID:20080407T193125Z-19554-727-1-50-XX@gollum DTSTAMP:20080407T193125Z @@ -199,7 +199,7 @@ CREATED:20080407T193241Z LAST-MODIFIED:20080407T193241 END:VEVENT -@@ -361,28 +344,11 @@ +@@ -383,28 +366,11 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 diff --git a/test/testcases/eds_event.ics.mobical.tem.patch b/test/testcases/eds_event.ics.mobical.tem.patch index 1b597b2f..9302960a 100644 --- a/test/testcases/eds_event.ics.mobical.tem.patch +++ b/test/testcases/eds_event.ics.mobical.tem.patch @@ -94,7 +94,7 @@ END:VEVENT END:VCALENDAR -@@ -193,12 +121,6 @@ +@@ -215,12 +143,6 @@ ^\npercent %\ntilde ~\ntick `\nbacktick `\ndouble quotation - not tested because Evolution encodes it incorrectly\nsingle quotation '\ncolon :\n semicolon \;\ncomma \,\n @@ -107,7 +107,7 @@ END:VEVENT END:VCALENDAR -@@ -361,28 +283,11 @@ +@@ -383,28 +305,11 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 diff --git a/test/testcases/eds_event.ics.nokia_7210c.tem.patch b/test/testcases/eds_event.ics.nokia_7210c.tem.patch index 5a17d479..9c22cbb1 100644 --- a/test/testcases/eds_event.ics.nokia_7210c.tem.patch +++ b/test/testcases/eds_event.ics.nokia_7210c.tem.patch @@ -163,7 +163,7 @@ CREATED:20060416T204808Z LAST-MODIFIED:20060416T204808Z END:VEVENT -@@ -171,11 +231,31 @@ +@@ -193,11 +253,31 @@ BEGIN:VCALENDAR PRODID:-//Ximian//NONSGML Evolution Calendar//EN VERSION:2.0 @@ -197,7 +197,7 @@ TRANSP:TRANSPARENT SEQUENCE:4 SUMMARY:all fields -@@ -185,41 +265,43 @@ +@@ -207,41 +287,43 @@ CREATED:20060416T204625Z LAST-MODIFIED:20060416T204833Z DESCRIPTION:this is an appointment with plenty of fields set\, and