testing: be strict about DTSTART + EXDATE matching

Although IMHO it is not explicitly specified by iCalendar 2.0, it is
good practice and in fact expected by at least two servers (Apple
Calendar Server, Oracle Communication Calendar Server) that DTSTART
and EXDATE are using the same time format. If DTSTART is UTC, so
should be EXDATE, same for TZID and DATE-TIME/DATE.
This commit is contained in:
Patrick Ohly 2011-10-05 10:48:45 +02:00
parent 0e15962bb9
commit 65b731f45f
8 changed files with 33 additions and 56 deletions

View File

@ -161,8 +161,8 @@ DESCRIPTION:recurrs seven times\, excluding (but counting) Friday and
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
EXDATE;VALUE=DATE:20060408
EXDATE;VALUE=DATE:20060407
EXDATE:20060408T183000Z
EXDATE:20060407T183000Z
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT

View File

@ -23,17 +23,6 @@
UID:20060416T203813Z-4272-727-1-242@gollum
DTSTAMP:20060416T203813Z
DTSTART:20060406T173000Z
@@ -161,8 +143,8 @@
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE;VALUE=DATE:20060408
-EXDATE;VALUE=DATE:20060407
+EXDATE:20060408T183000Z
+EXDATE:20060407T183000Z
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -215,7 +197,6 @@
CATEGORIES:BUSINESS,MEETING
SUMMARY:meeting invitation

View File

@ -66,18 +66,7 @@
CREATED:20060416T204021Z
LAST-MODIFIED:20060416T204021Z
END:VEVENT
@@ -161,8 +159,8 @@
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE;VALUE=DATE:20060408
-EXDATE;VALUE=DATE:20060407
+EXDATE:20060408T183000Z
+EXDATE:20060407T183000Z
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -196,7 +194,7 @@
@@ -218,7 +216,7 @@
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20060416T204833Z-4250-727-1-85@gollum
ACTION:DISPLAY
@ -86,7 +75,7 @@
TRIGGER;VALUE=DURATION;RELATED=START:-PT1H
END:VALARM
END:VEVENT
@@ -206,29 +204,6 @@
@@ -228,29 +226,6 @@
PRODID:-//Ximian//NONSGML Evolution Calendar//EN
VERSION:2.0
BEGIN:VEVENT
@ -116,7 +105,7 @@
UID:20080407T193125Z-19554-727-1-50@gollum
DTSTAMP:20080407T193125Z
DTSTART:20080406T090000Z
@@ -238,7 +213,7 @@
@@ -260,7 +235,7 @@
SUMMARY:Recurring
DESCRIPTION:recurs each Sonday\, 10 times
CLASS:PUBLIC
@ -125,7 +114,7 @@
CREATED:20080407T193241Z
LAST-MODIFIED:20080407T193241
END:VEVENT
@@ -357,37 +332,3 @@
@@ -379,37 +354,3 @@
DESCRIPTION:third instance modified\, different time
END:VEVENT
END:VCALENDAR

View File

@ -7,17 +7,6 @@
END:VEVENT
END:VCALENDAR
@@ -161,8 +161,8 @@
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE;VALUE=DATE:20060408
-EXDATE;VALUE=DATE:20060407
+EXDATE:20060408T000000Z
+EXDATE:20060407T000000Z
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -196,8 +196,7 @@
BEGIN:VALARM
X-EVOLUTION-ALARM-UID:20060416T204833Z-4250-727-1-85@gollum

View File

@ -166,6 +166,17 @@
TRANSP:OPAQUE
SEQUENCE:2
SUMMARY:recurrence\, daily\, with exceptions
@@ -161,8 +251,8 @@
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE:20060408T183000Z
-EXDATE:20060407T183000Z
+EXDATE;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20060408T203000
+EXDATE;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:20060407T203000
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -171,11 +261,29 @@
BEGIN:VCALENDAR
PRODID:-//Ximian//NONSGML Evolution Calendar//EN

View File

@ -101,7 +101,7 @@
CREATED:20060416T204021Z
LAST-MODIFIED:20060416T204021Z
END:VEVENT
@@ -152,15 +132,15 @@
@@ -152,17 +132,17 @@
BEGIN:VEVENT
UID:20060416T204647Z-4272-727-1-248@gollum
DTSTAMP:20060416T204647Z
@ -116,10 +116,14 @@
Saturday
CLASS:PUBLIC
-RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE:20060408T183000Z
-EXDATE:20060407T183000Z
+RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T203000
EXDATE;VALUE=DATE:20060408
EXDATE;VALUE=DATE:20060407
+EXDATE:20060408T203000
+EXDATE:20060407T203000
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -189,7 +169,7 @@
characters:\na-umlaut ä\nexclamation mark !\nampersand disabled\nhash
#\nleft angle bracket disabled\nright angle bracket disabled\nleft square

View File

@ -94,16 +94,7 @@
END:VEVENT
END:VCALENDAR
@@ -161,8 +89,6 @@
Saturday
CLASS:PUBLIC
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE;VALUE=DATE:20060408
-EXDATE;VALUE=DATE:20060407
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -193,12 +119,6 @@
@@ -193,12 +121,6 @@
^\npercent %\ntilde ~\ntick `\nbacktick `\ndouble quotation - not tested
because Evolution encodes it incorrectly\nsingle quotation '\ncolon :\n
semicolon \;\ncomma \,\n
@ -116,7 +107,7 @@
END:VEVENT
END:VCALENDAR
@@ -361,28 +281,11 @@
@@ -361,28 +283,11 @@
BEGIN:VCALENDAR
PRODID:-//Ximian//NONSGML Evolution Calendar//EN
VERSION:2.0

View File

@ -117,7 +117,7 @@
TRANSP:OPAQUE
SEQUENCE:3
SUMMARY:recurrence monthly\, 6th day\, limited
@@ -149,18 +189,38 @@
@@ -149,20 +189,40 @@
BEGIN:VCALENDAR
PRODID:-//Ximian//NONSGML Evolution Calendar//EN
VERSION:2.0
@ -155,10 +155,14 @@
Saturday
CLASS:PUBLIC
-RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE:20060408T183000Z
-EXDATE:20060407T183000Z
+RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000
EXDATE;VALUE=DATE:20060408
EXDATE;VALUE=DATE:20060407
+EXDATE;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai:20060408T183000
+EXDATE;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai:20060407T183000
CREATED:20060416T204808Z
LAST-MODIFIED:20060416T204808Z
END:VEVENT
@@ -171,11 +231,31 @@
BEGIN:VCALENDAR
PRODID:-//Ximian//NONSGML Evolution Calendar//EN