This commit was manufactured by cvs2svn to create tagnew-calendar-branch-merge-end

'new-calendar-branch-merge-end'.

svn path=/tags/new-calendar-branch-merge-end/; revision=22718

4 files changed, 61 insertions, 444 deletions

diff --git a/libical/test-data/calendar.ics b/libical/test-data/calendar.ics
index 417ce5079b..63b0a93838 100644
--- a/libical/test-data/calendar.ics
+++ b/libical/test-data/calendar.ics
@@ -1,7 +1,7 @@
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:CREATE
-X-LIC-NOTE: #C1. Rescheduled by #I2\ and updated by #I3
+X-LIC-NOTE: #C1. Rescheduled by #I1\ and updated by #I2
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:B@example.com
@@ -13,7 +13,7 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19970611T190000Z
 DTSTART:19970701T190000Z
-DTEND:19970701T193000Z
+DTEND:19970701T1930000Z
 SUMMARY:Conference
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:1
@@ -45,19 +45,3 @@ STATUS:CONFIRMED
 END:VEVENT
 END:VCALENDAR
 
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CREATED
-X-LIC-NOTE: #C3. Publish 
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-DTSTAMP:19970610T190000Z
-DTSTART:19970701T100000Z
-DTEND:19970701T1100000Z
-SUMMARY:Conference
-UID:calsrv.example.com-1002@example.com
-STATUS:CONFIRMED
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/test-data/incoming.ics b/libical/test-data/incoming.ics
index dd77861ad4..c598dfa6bf 100644
--- a/libical/test-data/incoming.ics
+++ b/libical/test-data/incoming.ics
@@ -1,32 +1,7 @@
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REQUEST
-X-LIC-NOTE:#I1. New Request
-X-LIC-EXPECT:REQUEST-NEW
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970610T190000Z
-DTSTART:19970701T100000Z
-DTEND:19970701T10300Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738776@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE:#I2. Reschedules C1
-X-LIC-EXPECT:REQUEST-RESCHEDULE
+X-LIC-NOTE: #I1. Reschedules C1
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:B@example.com
@@ -38,7 +13,7 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19970611T190000Z
 DTSTART:19970701T200000Z
-DTEND:19970701T200000Z
+DTEND:19970701T2000000Z
 SUMMARY:Conference
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:2
@@ -49,8 +24,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REQUEST
-X-LIC-NOTE:#I3. Updates C1
-X-LIC-EXPECT:REQUEST-UPDATE
+X-LIC-NOTE: #I2. Updates C1
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:B@example.com
@@ -62,7 +36,7 @@ ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
 ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
 DTSTAMP:19970611T193000Z
 DTSTART:19970701T190000Z
-DTEND:19970701T193000Z
+DTEND:19970701T1930000Z
 SUMMARY: Pool party
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:2
@@ -73,8 +47,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REQUEST
-X-LIC-NOTE:#I4: This is an obsolete request\, otherwise identical to #I1
-X-LIC-EXPECT:OBSOLETE
+X-LIC-NOTE: #I2: This is an obsolete request\, otherwise identical to #I1
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:B@example.com
@@ -98,8 +71,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REPLY
-X-LIC-NOTE:#I5: User B is accepting A's request\, #C2
-X-LIC-EXPECT:REPLY-ACCEPT
+X-LIC-NOTE: #I3: User B is accepting A's request\, #C2
 VERSION:2.0
 BEGIN:VEVENT
 ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
@@ -114,47 +86,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REPLY
-X-LIC-NOTE:#I6: User B's reply delegating to C\, #C2
-X-LIC-EXPECT:REPLY-DELEGATE
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-TO="Mailto:C@example.com"
- :Mailto:B@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738785@example.com
-SEQUENCE:1
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-X-LIC-NOTE:#I7: User C's delegation to A\, new event
-X-LIC-EXPECT:REQUEST-DELEGATE
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C;DELEGATED-TO="Mailto:A@example.com"
- :Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=A;DELEGATED-FROM="Mailto:C@example.com"
- :Mailto:A@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T190000Z
-DTEND:19970701T193000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738779@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-X-LIC-NOTE:#I8: User C is rejecting A's request\, #C2
-X-LIC-EXPECT:REPLY-DECLINE
+X-LIC-NOTE: #I4: User C is rejecting A's request\, #C2
 VERSION:2.0
 BEGIN:VEVENT
 ATTENDEE;PARTSTAT=DECLINED:Mailto:C@example.com
@@ -169,8 +101,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REPLY
-X-LIC-NOTE:#I9: Crasher X is accepting A's request\, #C2
-X-LIC-EXPECT:REPLY-CRASHER-ACCEPT
+X-LIC-NOTE: #I5: Crasher X is accepting A's request\, #C2
 VERSION:2.0
 BEGIN:VEVENT
 ATTENDEE;PARTSTAT=ACCEPTED:Mailto:X@example.com
@@ -185,8 +116,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:REPLY
-X-LIC-NOTE:#I10: Crasher Y is declining  A's request\, #C2
-X-LIC-EXPECT:REPLY-CRASHER-DECLINE
+X-LIC-NOTE: #I6: Crasher Y is declining  A's request\, #C2
 VERSION:2.0
 BEGIN:VEVENT
 ATTENDEE;PARTSTAT=DECLINED:Mailto:Y@example.com
@@ -201,8 +131,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:CANCEL
-X-LIC-NOTE:#I11: Cancel #c1
-X-LIC-EXPECT:CANCEL-EVENT
+X-LIC-NOTE: #I7: Cancel #c1
 VERSION:2.0
 BEGIN:VEVENT
 ORGANIZER:Mailto:B@example.com
@@ -213,6 +142,7 @@ ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
 COMMENT:Mr. B cannot attend. It's raining. Lets cancel.
 UID:calsrv.example.com-873970198738777@example.com
 SEQUENCE:1
+UID:calsrv.example.com-873970198738777@example.com
 STATUS:CANCELLED
 DTSTAMP:19970613T190000Z
 END:VEVENT
@@ -221,8 +151,7 @@ END:VCALENDAR
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 METHOD:COUNTER
-X-LIC-NOTE:#I12. Counter to #C1. Changed DTEND to DURATION.
-X-LIC-EXPECT:COUNTER
+X-LIC-NOTE: #I8. Counter to #C1. Changed DTEND to DURATION.
 VERSION:2.0
 BEGIN:VEVENT
 DTSTAMP:19970611T190000Z
@@ -237,58 +166,3 @@ SEQUENCE:1
 END:VEVENT
 END:VCALENDAR
 
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-X-LIC-NOTE:#I13. New Publish
-X-LIC-EXPECT:PUBLISH-UPDATE
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-DTSTAMP:19970610T190000Z
-DTSTART:19970701T100000Z
-DTEND:19970701T103000Z
-SUMMARY:Conference
-UID:calsrv.example.com-1001@example.com
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-X-LIC-NOTE:#I14. Publish Update
-X-LIC-EXPECT:PUBLISH-UPDATE
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-DTSTAMP:19970610T190000Z
-DTSTART:19970701T100000Z
-DTEND:19970701T110000Z
-SUMMARY:Conference
-UID:calsrv.example.com-1002@example.com
-STATUS:CONFIRMED
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-METHOD:PUBLISH
-X-LIC-NOTE:#I15. Publish VFREEBUSY
-X-LIC-EXPECT:PUBLISH-FREEBUSY
-BEGIN:VFREEBUSY
-DTSTAMP:19980101T124100Z
-ORGANIZER:MAILTO:A@Example.com
-DTSTART:19980101T124200Z
-DTEND:19980107T124200Z
-FREEBUSY:19980101T180000Z/19980101T190000Z
-FREEBUSY:19980103T020000Z/19980103T050000Z
-FREEBUSY:19980107T020000Z/19980107T050000Z
-FREEBUSY:19980113T000000Z/19980113T010000Z
-FREEBUSY:19980115T190000Z/19980115T200000Z
-FREEBUSY:19980115T220000Z/19980115T230000Z
-FREEBUSY:19980116T013000Z/19980116T043000Z
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/libical/test-data/recur.txt b/libical/test-data/recur.txt
index e1b00a65a2..f158a2a96b 100644
--- a/libical/test-data/recur.txt
+++ b/libical/test-data/recur.txt
@@ -1,261 +1,121 @@
-BEGIN:VEVENT 
-DESCRIPTION 
- :Repeat every tuesday and wednesday starting Tue 2nd April 2002
-RRULE
- :FREQ=WEEKLY;INTERVAL=1;COUNT=6;BYDAY=TU,WE
-DTSTART
- :20020402T114500
-DTEND
- :20020402T124500
-X-EXPECT-NUMEVENTS: 6
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Repeat every thursday starting Tue 2nd April 2002 
-RRULE 
- :FREQ=WEEKLY;INTERVAL=1;COUNT=6;BYDAY=TH 
-DTSTART 
- :20020402T114500 
-DTEND 
- :20020402T124500 
-X-EXPECT-NUMEVENTS: 7 
-END:VEVENT 
-
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every year on the same day\, forever
-RRULE
- :FREQ=YEARLY;INTERVAL=1
-DTSTART
- :19990201T172000
-DTEND
- :19990201T182000
-X-EXPECT-NUMEVENTS: 39
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Monday of week number 20 (where the default start of the week is Monday)\, 
- forever:
-DTSTART
- ;TZID=America/Los_Angeles
- :19970512T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20
-X-EXPECT-NUMEVENTS: 11
-END:VEVENT
-
-
-BEGIN:VEVENT
-DESCRIPTION
- : Once a Year
-DTSTART
- ;TZID=America/Los_Angeles
- :20010205T090000
-RRULE
- :FREQ=YEARLY;INTERVAL=1
-X-EXPECT-NUMEVENTS: 37
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Recur every sunday and tuesday
-RRULE
- :FREQ=WEEKLY;COUNT=10;INTERVAL=1;BYDAY=SU,TU
-DTSTART
- :20011216T192500
-DTEND
- :20011216T202500
-X-EXPECT-NUMEVENTS: 10
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every first tuesday of the month
-RRULE
- :FREQ=MONTHLY;INTERVAL=1;COUNT=3;BYDAY=1TU
-DTSTART
- :20011204T153500
-DTEND
- :20011204T163500
-X-EXPECT-NUMEVENTS: 3
-END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Daily for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=1
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Daily until December 24\, 1997:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19971215T090000
 RRULE
  :FREQ=DAILY;UNTIL=19971224T000000Z;INTERVAL=1
-X-EXPECT-NUMEVENTS: 9
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Every other day - forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=2
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Every 10 days\, 5 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=DAILY;COUNT=5;INTERVAL=10
-X-EXPECT-NUMEVENTS: 5
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Daily for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=DAILY;COUNT=10;INTERVAL=1
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Every day in January\, for 3 years
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19980101T090000
 RRULE
  :FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=SU,MO,TU,WE,TH,FR,SA;BYMONTH=1
-X-EXPECT-NUMEVENTS: 93
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Everyday in January\, for 3 years:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19980101T090000
 RRULE
- :FREQ=DAILY;UNTIL=20000131T170000Z;INTERVAL=1;BYMONTH=1
-X-EXPECT-NUMEVENTS: 93
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Repeat every tuesday and wednesday starting Tue 2nd April 2002
-RRULE
- :FREQ=WEEKLY;INTERVAL=1;COUNT=6;BYDAY=TU,WE
-DTSTART
- :20020402T114500
-DTEND
- :20020402T124500
-X-EXPECT-NUMEVENTS: 6
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every Day start the first day in  January\, except saturday and sunday. This should be up to March.
-RRULE
- :FREQ=DAILY;COUNT=50;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR
-DTSTART
- :20020101T090000Z
-X-EXPECT-NUMEVENTS: 50 
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every Day in January\, but only in Tuesday\, Wednesday and Thursday 
-RRULE
- :FREQ=DAILY;UNTIL=20020120T090000Z;INTERVAL=1;BYDAY=TU,WE,TH
-DTSTART
- :20020101T090000Z
-X-EXPECT-NUMEVENTS: 9
+ :FREQ=DAILY;UNTIL=20000131T090000Z;INTERVAL=1;BYMONTH=1
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
- :Every Day in January\, except saturday and sunday. This is MS Outlook every weekday case.
-RRULE
- :FREQ=DAILY;UNTIL=20020120T090000Z;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;WKST=SU
-DTSTART
- :20020101T090000Z
-X-EXPECT-NUMEVENTS: 14
-END:VEVENT
-
-
-BEGIN:VEVENT
-DESCRIPTION
  :Weekly for 10 occurrences
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;COUNT=10;INTERVAL=1
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly until December 24\, 1997
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;UNTIL=19971224T000000Z;INTERVAL=1
-X-EXPECT-NUMEVENTS: 17
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
- :Every other week - 10 times:
+ :Every other week - forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;INTERVAL=2;COUNT=10
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly on Tuesday and Thursday for 5 weeks:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;UNTIL=19971007T000000Z;INTERVAL=1;BYDAY=TU,TH
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Weekly on Tuesday and Thursday for 5 weeks:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;COUNT=10;INTERVAL=1;BYDAY=TU,TH
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
@@ -263,224 +123,186 @@ DESCRIPTION
  :Every other week on Monday\, Wednesday and Friday until December 
  24\,1997\, but starting on Tuesday\, September 2\, 1997:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;BYDAY=MO,WE,FR;WKST=SU
-X-EXPECT-NUMEVENTS: 25
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Every other week on Tuesday and Thursday\, for 8 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;COUNT=8;INTERVAL=2;BYDAY=TU,TH
-X-EXPECT-NUMEVENTS: 8
 END:VEVENT
-
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the 1st Friday for ten occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970905T090000
 RRULE
  :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYDAY=FR
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the 1st Friday until December 24\, 1997:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970905T090000
 RRULE
  :FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=1FR
-X-EXPECT-NUMEVENTS: 4
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every other month on the 1st and last Sunday of the month for 10 occurrences
  :
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970907T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the second to last Monday of the month for 6 months:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970922T090000
 RRULE
  :FREQ=MONTHLY;COUNT=6;INTERVAL=1;BYDAY=-2MO
-X-EXPECT-NUMEVENTS: 6
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the third to the last day of the month\, forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970928T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYMONTHDAY=-3
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the 2nd and 15th of the month for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYMONTHDAY=2,15
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monthly on the first and last day of the month for 10 occurrences:\n
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970930T090000
 RRULE
  :FREQ=MONTHLY;COUNT=10;INTERVAL=1;BYMONTHDAY=1,-1
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 18 months on the 10th thru 15th of the month for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970910T090000
 RRULE
  :FREQ=MONTHLY;COUNT=10;INTERVAL=18;BYMONTHDAY=10,11,12,13,14,15
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every Tuesday\, every other month:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=TU
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Yearly in June and July for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970610T090000
 RRULE
  :FREQ=YEARLY;COUNT=10;INTERVAL=1;BYMONTH=6,7
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every other year on January\, February\, and March for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970310T090000
 RRULE
  :FREQ=YEARLY;COUNT=10;INTERVAL=2;BYMONTH=1,2,3
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 3rd year on the 1st\, 100th and 200th day for 10 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970101T090000
 RRULE
  :FREQ=YEARLY;COUNT=10;INTERVAL=3;BYYEARDAY=1,100,200
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 20th Monday of the year\, forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970519T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=20MO
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Monday of week number 20 (where the default start of the week is Monday)\, 
  forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970512T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20
-X-EXPECT-NUMEVENTS: 11
 END:VEVENT
-
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every Thursday in March\, forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970313T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=TH;BYMONTH=3
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every Thursday\, but only during June\, July\, and August\, forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970605T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=TH;BYMONTH=6,7,8
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :Every Friday the 13th\, forever:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=FR;BYMONTHDAY=13
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :The first Saturday that follows the first Sunday of the month\,
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970913T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
@@ -488,11 +310,10 @@ DESCRIPTION
  :Every four years\, the first Tuesday after a Monday in November\, 
  forever (U.S. Presidential Election day):
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19961105T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=4;COUNT=10;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 BEGIN:VEVENT
@@ -500,145 +321,84 @@ DESCRIPTION
  :The 3rd instance into the month of one of Tuesday\, Wednesday or 
  Thursday\, for the next 3 months:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970904T090000
 RRULE
  :FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=TU,WE,TH;BYSETPOS=3
-X-EXPECT-NUMEVENTS: 3
 END:VEVENT
 
 BEGIN:VEVENT
 DESCRIPTION
  :The 2nd to last weekday of the month:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970929T090000
 RRULE
  :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2
-X-EXPECT-NUMEVENTS: 10
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 3 hours from 9:00 AM to 5:00 PM on a specific day:
 DTSTART
- :19970902T090000Z
+ ;TZID=US-Eastern
+ :19970902T090000
 RRULE
  :FREQ=HOURLY;UNTIL=19970902T170000Z;INTERVAL=3
-X-EXPECT-NUMEVENTS: 3
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 15 minutes for 6 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MINUTELY;COUNT=6;INTERVAL=15
-X-EXPECT-NUMEVENTS: 6
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every hour and a half for 4 occurrences:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MINUTELY;COUNT=4;INTERVAL=90
-X-EXPECT-NUMEVENTS: 4
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 20 minutes from 9:00 AM to 4:40 PM every day:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=DAILY;COUNT=20;INTERVAL=1;BYMINUTE=0,20,40;BYHOUR=9,10,11,12,13,14,15,16
-X-EXPECT-NUMEVENTS: 20
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :Every 20 minutes from 9:00 AM to 4:40 PM every day:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970902T090000
 RRULE
  :FREQ=MINUTELY;COUNT=20;INTERVAL=20;BYHOUR=9,10,11,12,13,14,15,16
-X-EXPECT-NUMEVENTS: 20
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :An example where the days generated makes a difference because of 
  WKST:
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970805T090000
 RRULE
  :FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU
-X-EXPECT-NUMEVENTS: 4
 END:VEVENT
-
 BEGIN:VEVENT
 DESCRIPTION
  :An example where the days generated makes a difference because of 
  WKST. Changing only WKST from MO to SU yields different results...  
 DTSTART
- ;TZID=America/Los_Angeles
+ ;TZID=US-Eastern
  :19970805T090000
 RRULE
  :FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU
-X-EXPECT-NUMEVENTS: 4
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Repeat every tuesday and wednesday starting 2 April 2002
-RRULE
- :FREQ=WEEKLY;INTERVAL=1;COUNT=6;BYDAY=TU,WE
-DTSTART
- :20020402T114500
-X-EXPECT-NUMEVENTS: 6
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Use count=1 to repeat zero times.
-RRULE
- :FREQ=DAILY;COUNT=1
-DTSTART
- :20020402T114500
-X-EXPECT-NUMEVENTS: 1
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Use EXDATE to eliminate the base event
-RRULE
- :FREQ=DAILY;COUNT=1
-DTSTART
- :20020402T114500Z
-EXDATE
- :20020402T114500Z
-X-EXPECT-NUMEVENTS: 0
-END:VEVENT
-
-BEGIN:VEVENT
-DESCRIPTION
- :Every Day in January\, except saturday and sunday\, using 2 EXRULEs. (NOT IMPLEMENTED)
-RRULE
- :FREQ=DAILY;INTERVAL=1;UNTIL=20020201T000000Z
-EXRULE
- :FREQ=WEEKLY;INTERVAL=1;UNTIL=20020201T000000Z;BYDAY=SU
-EXRULE
- :FREQ=WEEKLY;INTERVAL=1;UNTIL=20020201T000000Z;BYDAY=SA
-DTSTART
- :20020101T090000Z
-X-EXPECT-NUMEVENTS: 23
 END:VEVENT
 
diff --git a/libical/test-data/simple-mime.txt b/libical/test-data/simple-mime.txt
index db7f8a6c39..aa7113a82f 100644
--- a/libical/test-data/simple-mime.txt
+++ b/libical/test-data/simple-mime.txt
@@ -10,15 +10,14 @@ Content-Disposition: attachment; filename="event.vcs"
 BEGIN:VCALENDAR
 PRODID:-//ACME/DesktopCalendar//EN
 VERSION:2.0
-METHOD:REQUEST
 BEGIN:VEVENT
 ORGANIZER:foo1@example.com
 ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
 ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@agony.busboom.org
+ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com
 DTSTAMP:19970611T190000Z
 DTSTART:19970621T170000Z
-DTEND:19970621T173000Z
+DTEND:199706211T173000Z
 SUMMARY:Let's discuss the attached document
 UID:calsvr.example.com-873970198738777-8aa
 SEQUENCE:0