[CalendarServer-changes] [7224] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 18 13:58:44 PDT 2011
Revision: 7224
http://trac.macosforge.org/projects/calendarserver/changeset/7224
Author: cdaboo at apple.com
Date: 2011-03-18 13:58:44 -0700 (Fri, 18 Mar 2011)
Log Message:
-----------
Test recovery of missing properties in VTODOs.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/5.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/6.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/7.ics
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/1.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTODO
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/2.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/3.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+X-APPLE-NEEDS-REPLY:TRUE
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/4.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,12 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+COMPLETED:20060102T150000Z
+SUMMARY:event 1
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/5.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+ATTENDEE;CN=$username1:;PARTSTAT=COMPLETED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+COMPLETED:20060102T150000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/6.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+COMPLETED:20060102T190000Z
+SUMMARY:event 1
+X-APPLE-NEEDS-REPLY:TRUE
+END:VTODO
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/todo/missing/7.ics 2011-03-18 20:58:44 UTC (rev 7224)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTODO
+UID:event1 at ninevah.local
+ATTENDEE;CN=$username1:;PARTSTAT=COMPLETED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=COMPLETED;RSVP=TRUE;EMAIL=$email2::$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+COMPLETED:20060102T190000Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:event 1
+X-APPLE-NEEDS-REPLY:TRUE
+END:VTODO
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml 2011-03-18 19:18:15 UTC (rev 7223)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittodo.xml 2011-03-18 20:58:44 UTC (rev 7224)
@@ -41,7 +41,7 @@
</request>
</start>
- <test-suite name='Simple Changes' ignore='yes'>
+ <test-suite name='Simple Changes' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -501,7 +501,7 @@
</test>
</test-suite>
- <test-suite name='Organizer Delete' ignore='yes'>
+ <test-suite name='Organizer Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -810,7 +810,7 @@
</test>
</test-suite>
- <test-suite name='Attendee Delete' ignore='yes'>
+ <test-suite name='Attendee Delete' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -1420,6 +1420,176 @@
</test>
</test-suite>
+ <test-suite name='Client removing properties fix' ignore='no'>
+ <test name='1'>
+ <description>Organizer invites Attendee</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/todo/missing/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/todo/missing/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</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/implicit/todo/missing/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee deletes Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" 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='6'>
+ <description>Organizer updates but loses properties</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/todo/missing/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer checks data - properties are back</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/todo/missing/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Attendee -> Completed and loses properties</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>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/todo/missing/6.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Attendee has data - properties are back</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/implicit/todo/missing/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110318/07aed0d3/attachment-0001.html>
More information about the calendarserver-changes
mailing list