[CalendarServer-changes] [3955] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Apr 7 10:10:00 PDT 2009
Revision: 3955
http://trac.macosforge.org/projects/calendarserver/changeset/3955
Author: cdaboo at apple.com
Date: 2009-04-07 10:09:44 -0700 (Tue, 07 Apr 2009)
Log Message:
-----------
Check that schedule-changes only reports one instance as changed.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/privatecomments.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/privatecomments/40.ics
CalDAVTester/trunk/Resource/privatecomments/41.ics
CalDAVTester/trunk/Resource/privatecomments/42.xml
Added: CalDAVTester/trunk/Resource/privatecomments/40.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/40.ics (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/40.ics 2009-04-07 17:09:44 UTC (rev 3955)
@@ -0,0 +1,49 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 2
+RRULE:FREQ=DAILY;COUNT=10
+X-CALENDARSERVER-PRIVATE-COMMENT:I have accepted all these.
+END:VEVENT
+BEGIN:VEVENT
+UID:event2 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED:$cuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 2
+X-CALENDARSERVER-PRIVATE-COMMENT:I have declined this one - no reason.
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/privatecomments/41.ics
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/41.ics (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/41.ics 2009-04-07 17:09:44 UTC (rev 3955)
@@ -0,0 +1,53 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event2 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 2
+RRULE:FREQ=DAILY;COUNT=10
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have accepted all these.
+END:VEVENT
+BEGIN:VEVENT
+UID:event2 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS="2.0;Succe
+ ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 2
+X-CALENDARSERVER-ATTENDEE-COMMENT;X-CALENDARSERVER-ATTENDEE-REF="$cuaddrurn2:
+ ";X-CALENDARSERVER-DTSTAMP=20080827T171052Z:I have declined this one - no reason.
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/privatecomments/42.xml
===================================================================
--- CalDAVTester/trunk/Resource/privatecomments/42.xml (rev 0)
+++ CalDAVTester/trunk/Resource/privatecomments/42.xml 2009-04-07 17:09:44 UTC (rev 3955)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:schedule-changes/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/trunk/scripts/tests/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/privatecomments.xml 2009-04-06 21:45:44 UTC (rev 3954)
+++ CalDAVTester/trunk/scripts/tests/privatecomments.xml 2009-04-07 17:09:44 UTC (rev 3955)
@@ -1073,6 +1073,32 @@
</arg>
</verify>
</request>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='yes'>
+ <method>PROPFIND</method>
+ <ruri>$</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/privatecomments/42.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddrurn2:</attendee><partstat/><private-comment/><recurrences><master/><recurrenceid>20060102T150000Z</recurrenceid></recurrences></reply></action>]]></value>
+ </arg>
+ </verify>
+ </request>
</test>
<test name='8'>
<description>Organizer data changed</description>
@@ -1110,6 +1136,114 @@
</request>
</test>
<test name='10'>
+ <description>Attendee 1 -> Changes one comment</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELAY</method>
+ <ruri>2</ruri>
+ </request>
+ <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>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privatecomments/40.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privatecomments/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='yes'>
+ <method>PROPFIND</method>
+ <ruri>$</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/privatecomments/42.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value><![CDATA[http://calendarserver.org/ns/schedule-changes$<dtstamp>.*</dtstamp><action><reply><attendee>$cuaddrurn2:</attendee><private-comment/><recurrences><recurrenceid>20060102T150000Z</recurrenceid></recurrences></reply></action>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/privatecomments/41.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Organizer deletes Inbox Item</description>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
<description>Clean-up</description>
<request user="$userid1:" pswd="$pswd1:">
<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090407/5d86b7ee/attachment.html>
More information about the calendarserver-changes
mailing list