1 files changed, 12 insertions, 138 deletions
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