nightly testing: UNTIL clause fix for Apple Calendar Server

Apple Calendar server complains that the UNTIL clause in one test case had a DATE value whereas the DTSTART/DTEND had UTC DATE-TIME. Not sure what the standard says, so let's believe Apple and fix the test case to have consistent DATE-TIME values. In fact, a lot of SyncML peers already turned the DATE UNTIL clause into something with DATE-TIME. Removed all patches which added these times to the peer-specific test cases.
2011-04-12 17:46:14 +02:00 · 2011-04-12 17:46:14 +02:00 · 0e999e3551
commit 0e999e3551
parent 6ad8835cd5
6 changed files with 14 additions and 179 deletions
--- a/test/testcases/ical20.ics
+++ b/test/testcases/ical20.ics
@ -53,7 +53,7 @@ DESCRIPTION:recurrs four times due its end date
 CLASS:PUBLIC
 CREATED:20060416T203724Z
 LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427;INTERVAL=1;BYDAY=TH
+RRULE:FREQ=WEEKLY;UNTIL=20060427T173000Z;INTERVAL=1;BYDAY=TH
 END:VEVENT
 END:VCALENDAR

--- a/test/testcases/ical20.ics.Ovi.tem.patch
+++ b/test/testcases/ical20.ics.Ovi.tem.patch
@ -45,15 +45,6 @@
 BEGIN:VEVENT
 UID:20060416T203656Z-4272-727-1-241@gollum
 DTSTAMP:20060416T203656Z
-@@ -53,7 +13,7 @@
- CLASS:PUBLIC
- CREATED:20060416T203724Z
- LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427;INTERVAL=1;BYDAY=TH
-+RRULE:FREQ=WEEKLY;UNTIL=20060427T000000Z;INTERVAL=1;BYDAY=TH
- END:VEVENT
- END:VCALENDAR
- 
@@ -79,77 +39,6 @@
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
@ -143,7 +134,7 @@
 CREATED:20060416T205003Z
 LAST-MODIFIED:20060416T205003Z
 END:VEVENT
-@@ -263,37 +148,3 @@
+@@ -261,37 +146,3 @@
 DESCRIPTION:second instance modified
 END:VEVENT
 END:VCALENDAR
--- a/test/testcases/ical20.ics.funambol.tem.patch
+++ b/test/testcases/ical20.ics.funambol.tem.patch
@ -27,7 +27,7 @@
 END:VALARM
 END:VEVENT
 END:VCALENDAR
-@@ -268,7 +268,7 @@
+@@ -266,7 +266,7 @@
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
@ -36,7 +36,7 @@
 BEGIN:STANDARD
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
-@@ -287,8 +287,8 @@
+@@ -285,8 +285,8 @@
 BEGIN:VEVENT
 UID:20060416T205224Z-4272-727-1-251@gollum
 DTSTAMP:20060416T205224Z
--- a/test/testcases/ical20.ics.memotoo.tem.patch
+++ b/test/testcases/ical20.ics.memotoo.tem.patch
@ -44,15 +44,6 @@
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence weekly\, limited
-@@ -53,7 +33,7 @@
- CLASS:PUBLIC
- CREATED:20060416T203724Z
- LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427;INTERVAL=1;BYDAY=TH
-+RRULE:FREQ=WEEKLY;UNTIL=20060427T190000;INTERVAL=1;BYDAY=TH
- END:VEVENT
- END:VCALENDAR
- 
@@ -63,8 +43,8 @@
 BEGIN:VEVENT
 UID:20060416T203551Z-4272-727-1-240@gollum
@ -138,7 +129,7 @@
 SUMMARY:meeting invitation
 CLASS:PUBLIC
 ORGANIZER;CN=Patrick Ohly:MAILTO:Patrick.Ohly@gmx.de
-@@ -231,14 +211,14 @@
+@@ -230,14 +210,14 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50@gollum
 DTSTAMP:20080407T193125Z
@ -156,16 +147,16 @@
 CREATED:20080407T193241
 LAST-MODIFIED:20080407T193241
 END:VEVENT
-@@ -249,7 +229,7 @@
+@@ -247,7 +227,7 @@
+ PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
- METHOD:PUBLISH
 BEGIN:VEVENT
 -UID:20080407T193125Z-19554-727-1-50@gollum
 +UID:20080407T193125Z-19554-727-1-50@gollum-mod
 DTSTAMP:20080407T193125Z
 DTSTART:20080413T090000Z
 DTEND:20080413T093000Z
-@@ -259,7 +239,6 @@
+@@ -257,7 +237,6 @@
 CLASS:PUBLIC
 CREATED:20080407T193241
 LAST-MODIFIED:20080407T193647
@ -173,7 +164,7 @@
 DESCRIPTION:second instance modified
 END:VEVENT
 END:VCALENDAR
-@@ -267,28 +246,11 @@
+@@ -265,28 +244,11 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
--- a/test/testcases/ical20.ics.mobical.tem.patch
+++ b/test/testcases/ical20.ics.mobical.tem.patch
@ -33,15 +33,6 @@
 UID:20060406T211449Z-4562-727-1-63@gollum
 DTSTAMP:20060406T211449Z
 LAST-MODIFIED:20060416T203532Z
-@@ -53,7 +33,7 @@
- CLASS:PUBLIC
- CREATED:20060416T203724Z
- LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427;INTERVAL=1;BYDAY=TH
-+RRULE:FREQ=WEEKLY;UNTIL=20060427T173000Z;INTERVAL=1;BYDAY=TH
- END:VEVENT
- END:VCALENDAR
- 
@@ -90,25 +70,7 @@
 CLASS:PUBLIC
 CREATED:20060416T203924Z
@ -81,7 +72,7 @@
 END:VEVENT
 END:VCALENDAR
 
-@@ -267,28 +224,11 @@
+@@ -265,28 +222,11 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
--- a/test/testcases/ical20.ics.nokia_7210c.tem.patch
+++ b/test/testcases/ical20.ics.nokia_7210c.tem.patch
@ -83,49 +83,7 @@
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence weekly\, limited
-@@ -53,18 +73,38 @@
- CLASS:PUBLIC
- CREATED:20060416T203724Z
- LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427;INTERVAL=1;BYDAY=TH
-+RRULE:FREQ=WEEKLY;UNTIL=20060427T170000;INTERVAL=1;BYDAY=TH
- END:VEVENT
- END:VCALENDAR
- 
- BEGIN:VCALENDAR
- PRODID:-//Ximian//NONSGML Evolution Calendar//EN
- VERSION:2.0
-+BEGIN:VTIMEZONE
-+TZID:Asia/Shanghai
-+BEGIN:STANDARD
-+DTSTART:19670101T000000
-+TZOFFSETFROM:+0800
-+TZOFFSETTO:+0800
-+END:STANDARD
-+END:VTIMEZONE
-+BEGIN:VTIMEZONE
-+TZID:/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+X-LIC-LOCATION:Asia/Shanghai
-+BEGIN:STANDARD
-+TZNAME:CST
-+DTSTART:19700914T230000
-+TZOFFSETFROM:+0800
-+TZOFFSETTO:+0800
-+END:STANDARD
-+END:VTIMEZONE
- BEGIN:VEVENT
- UID:20060416T203551Z-4272-727-1-240@gollum
- DTSTAMP:20060416T203551Z
-DTSTART:20060406T163000Z
-DTEND:20060406T170000Z
-+DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+ :20060406T163000
-+DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+ :20060406T170000
- TRANSP:OPAQUE
- SEQUENCE:3
- SUMMARY:recurrence daily unlimited
-@@ -78,11 +118,31 @@
+@@ -78,11 +98,31 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
@ -159,7 +117,7 @@
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence monthly\, 6th day\, limited
-@@ -149,18 +209,38 @@
+@@ -149,18 +189,38 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
@ -201,7 +159,7 @@
 EXDATE;VALUE=DATE:20060408
 EXDATE;VALUE=DATE:20060407
 CREATED:20060416T204808Z
-@@ -171,11 +251,31 @@
+@@ -171,11 +231,31 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
@ -235,7 +193,7 @@
 TRANSP:TRANSPARENT
 SEQUENCE:4
 SUMMARY:all fields
-@@ -185,40 +285,43 @@
+@@ -185,40 +265,43 @@
 CREATED:20060416T204625Z
 LAST-MODIFIED:20060416T204833Z
 DESCRIPTION:this is an appointment with plenty of fields set\, and 
@ -299,99 +257,3 @@
 CREATED:20060416T205003Z
 LAST-MODIFIED:20060416T205003Z
 END:VEVENT
-@@ -228,72 +331,38 @@
- PRODID:-//Ximian//NONSGML Evolution Calendar//EN
- VERSION:2.0
- METHOD:PUBLISH
-+BEGIN:VTIMEZONE
-+TZID:Asia/Shanghai
-+BEGIN:STANDARD
-+DTSTART:19670101T000000
-+TZOFFSETFROM:+0800
-+TZOFFSETTO:+0800
-+END:STANDARD
-+END:VTIMEZONE
-+BEGIN:VTIMEZONE
-+TZID:/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+X-LIC-LOCATION:Asia/Shanghai
-+BEGIN:STANDARD
-+TZNAME:CST
-+DTSTART:19700914T230000
-+TZOFFSETFROM:+0800
-+TZOFFSETTO:+0800
-+END:STANDARD
-+END:VTIMEZONE
- BEGIN:VEVENT
- UID:20080407T193125Z-19554-727-1-50@gollum
- DTSTAMP:20080407T193125Z
-DTSTART:20080406T090000Z
-DTEND:20080406T093000Z
-+DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+ :20080406T090000
-+DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/Asia/Shanghai
-+ :20080406T093000
- TRANSP:OPAQUE
- SEQUENCE:2
- SUMMARY:Recurring
- DESCRIPTION:recurs each Sonday\, 10 times
- CLASS:PUBLIC
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T090000Z
-+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T090000
- CREATED:20080407T193241
- LAST-MODIFIED:20080407T193241
- END:VEVENT
- END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VEVENT
-UID:20080407T193125Z-19554-727-1-50@gollum
-DTSTAMP:20080407T193125Z
-DTSTART:20080413T090000Z
-DTEND:20080413T093000Z
-TRANSP:OPAQUE
-SEQUENCE:7
-SUMMARY:Recurring: Modified
-CLASS:PUBLIC
-CREATED:20080407T193241
-LAST-MODIFIED:20080407T193647
-RECURRENCE-ID:20080413T090000Z
-DESCRIPTION:second instance modified
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:EST/EDT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19671029T020000
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=1SU
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:20060416T205224Z-4272-727-1-251@gollum
-DTSTAMP:20060416T205224Z
-DTSTART;TZID=EST/EDT:20060406T140000
-DTEND;TZID=EST/EDT:20060406T143000
-TRANSP:OPAQUE
-SEQUENCE:2
-SUMMARY:timezone New York with custom definition for 2006
-CLASS:PUBLIC
-CREATED:20060416T205301Z
-LAST-MODIFIED:20060416T205301Z
-END:VEVENT
-END:VCALENDAR