[CalendarServer-changes] [11867] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:20:30 PDT 2014
Revision: 11867
http://trac.calendarserver.org//changeset/11867
Author: cdaboo at apple.com
Date: 2013-11-01 11:01:40 -0700 (Fri, 01 Nov 2013)
Log Message:
-----------
No longer preserve attendee private comments.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics
CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics
CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics
CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics 2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/32.ics 2013-11-01 18:01:40 UTC (rev 11867)
@@ -1,7 +1,7 @@
BEGIN:VCALENDAR
VERSION:2.0
CALSCALE:GREGORIAN
-PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+PRODID:-//Example Inc.//Example Calendar//EN
BEGIN:VTIMEZONE
TZID:US/Eastern
LAST-MODIFIED:20040110T032845Z
@@ -25,11 +25,10 @@
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
CREATED:20060101T150000Z
DTSTAMP:20051222T205953Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 3
-X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted.
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics 2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/35.ics 2013-11-01 18:01:40 UTC (rev 11867)
@@ -31,6 +31,6 @@
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 3
X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
- ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted.
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics 2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/Resource/CalDAV/privatecomments/37.ics 2013-11-01 18:01:40 UTC (rev 11867)
@@ -31,6 +31,6 @@
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
SUMMARY:event 3
X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
- ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted.
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml 2013-11-01 01:17:25 UTC (rev 11866)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml 2013-11-01 18:01:40 UTC (rev 11867)
@@ -1006,55 +1006,34 @@
</request>
</test>
<test name='8'>
- <description>Attendee removes comment property entirely</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
</request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PUT</method>
- <ruri>$</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privatecomments/31.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
</test>
<test name='9'>
- <description>Attendee has data with comment preserved</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/3.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/privatecomments/32.ics</value>
+ <value>Resource/CalDAV/privatecomments/35.ics</value>
</arg>
</verify>
</request>
</test>
<test name='10'>
- <description>Attendee changes comment</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <description>Organizer removes comments entirely</description>
+ <request print-response='no'>
<method>PUT</method>
- <ruri>$</ruri>
+ <ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privatecomments/33.ics</filepath>
+ <filepath>Resource/CalDAV/privatecomments/36.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1062,55 +1041,34 @@
</request>
</test>
<test name='11'>
- <description>Attendee has data with comment preserved</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/privatecomments/34.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='12'>
- <description>Organizer Inbox Items</description>
+ <description>Organizer checks data</description>
<request print-response='no'>
- <method>WAITDELETEALL 2</method>
- <ruri>$inboxpath1:/</ruri>
- </request>
- </test>
- <test name='13'>
- <description>Organizer data changed</description>
- <request print-response='no'>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/privatecomments/35.ics</value>
+ <value>Resource/CalDAV/privatecomments/37.ics</value>
</arg>
</verify>
</request>
</test>
- <test name='15'>
- <description>Organizer removes comments entirely</description>
+ <test name='12'>
+ <description>Organizer changes comment</description>
<request print-response='no'>
<method>PUT</method>
<ruri>$calendarpath1:/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privatecomments/36.ics</filepath>
+ <filepath>Resource/CalDAV/privatecomments/38.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
- <test name='16'>
+ <test name='13'>
<description>Organizer checks data</description>
<request print-response='no'>
<method>GET</method>
@@ -1119,35 +1077,49 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/privatecomments/37.ics</value>
+ <value>Resource/CalDAV/privatecomments/38.ics</value>
</arg>
</verify>
</request>
</test>
- <test name='17'>
- <description>Organizer changes comment</description>
- <request print-response='no'>
+ <test name='14'>
+ <description>Attendee removes comment property entirely</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
- <ruri>$calendarpath1:/3.ics</ruri>
+ <ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privatecomments/38.ics</filepath>
+ <filepath>Resource/CalDAV/privatecomments/31.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
</request>
</test>
- <test name='18'>
- <description>Organizer checks data</description>
+ <test name='15'>
+ <description>Organizer Inbox Item</description>
<request print-response='no'>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='16'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
<method>GET</method>
<ruri>$calendarpath1:/3.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/privatecomments/38.ics</value>
+ <value>Resource/CalDAV/privatecomments/32.ics</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/ec4ddb81/attachment.html>
More information about the calendarserver-changes
mailing list