[CalendarServer-changes] [13329] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Apr 18 12:31:05 PDT 2014


Revision: 13329
          http://trac.calendarserver.org//changeset/13329
Author:   cdaboo at apple.com
Date:     2014-04-18 12:31:05 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Split related-id is now different from the event UID.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/6.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -11,7 +11,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY;COUNT=10
 SEQUENCE:1
 BEGIN:VALARM
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 SEQUENCE:1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/7.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -11,7 +11,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
 SEQUENCE:1
 BEGIN:VALARM
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 SEQUENCE:1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/8.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -11,7 +11,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY;COUNT=10
 SEQUENCE:1
 BEGIN:VALARM
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 SEQUENCE:1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/implicit/9.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -11,7 +11,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
 SEQUENCE:1
 BEGIN:VALARM
@@ -30,7 +30,7 @@
 ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
 ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 SEQUENCE:1
 BEGIN:VALARM
 ACTION:DISPLAY

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/2.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -8,7 +8,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrence-splitting/simple/3.ics	2014-04-18 19:31:05 UTC (rev 13329)
@@ -8,7 +8,7 @@
 DURATION:PT1H
 SUMMARY:event 1
 UID:$olduid:
-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$olduid:
+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:$relid:
 RRULE:FREQ=DAILY;UNTIL=$now.0:T115959Z
 END:VEVENT
 END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml	2014-04-18 19:16:12 UTC (rev 13328)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrence-splitting.xml	2014-04-18 19:31:05 UTC (rev 13329)
@@ -121,6 +121,10 @@
 					<name>VEVENT/UID</name>
 					<variable>$olduid:</variable>
 				</grabcalproperty>
+				<grabcalproperty>
+					<name>VEVENT/RELATED-TO</name>
+					<variable>$relid:</variable>
+				</grabcalproperty>
 			</request>
 		</test>
 		<test name='3'>
@@ -224,6 +228,10 @@
 					<name>VEVENT/UID</name>
 					<variable>$olduid:</variable>
 				</grabcalproperty>
+				<grabcalproperty>
+					<name>VEVENT/RELATED-TO</name>
+					<variable>$relid:</variable>
+				</grabcalproperty>
 			</request>
 		</test>
 		<test name='3'>
@@ -544,6 +552,10 @@
 					<name>VEVENT/UID</name>
 					<variable>$olduid:</variable>
 				</grabcalproperty>
+				<grabcalproperty>
+					<name>VEVENT/RELATED-TO</name>
+					<variable>$relid:</variable>
+				</grabcalproperty>
 			</request>
 		</test>
 		<test name='9'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/8b16edfe/attachment.html>


More information about the calendarserver-changes mailing list