[CalendarServer-changes] [14822] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 22 17:19:12 PDT 2015
Revision: 14822
http://trac.calendarserver.org//changeset/14822
Author: sagen at apple.com
Date: 2015-05-22 17:19:11 -0700 (Fri, 22 May 2015)
Log Message:
-----------
Adds test for attendee trash and recover
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/
CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/declined.ics
CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/invite.ics
CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics
CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/reply.ics
Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/declined.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/declined.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/declined.ics 2015-05-23 00:19:11 UTC (rev 14822)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART:$now.8:T200000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=DECLINED;SCHEDULE-ST
+ ATUS=2.0:$cuaddrurn2:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/invite.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/invite.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/invite.ics 2015-05-23 00:19:11 UTC (rev 14822)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART:$now.8:T200000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;RSVP=TRUE:$cuaddralt2:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddralt1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/recovered.ics 2015-05-23 00:19:11 UTC (rev 14822)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART:$now.8:T200000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=TENTATIVE:$cuaddrurn2:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/reply.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/reply.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeetrash/reply.ics 2015-05-23 00:19:11 UTC (rev 14822)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART:$now.8:T200000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$username2:;PARTSTAT=TENTATIVE:$cuaddralt2:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddralt1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-22 21:40:28 UTC (rev 14821)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-23 00:19:11 UTC (rev 14822)
@@ -279,7 +279,7 @@
</request>
</test>
<test name='4'>
- <description>Attendee -> Accepted</description>
+ <description>Attendee replies with Tentative</description>
<request user="$userid2:" pswd="$pswd2:">
<method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
@@ -398,6 +398,145 @@
</test>
</test-suite>
+ <test-suite name='Attendee trashes event'>
+ <test name='1'>
+ <description>Create a calendar</description>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT scheduled event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/attendeetrash/invite.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>One item in user02 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee replies Tentative</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/attendeetrash/reply.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>One item in user01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee trashes event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ </request>
+ </test>
+ <test name='7'>
+ <description>One item in user01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer sees declined</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GET</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/attendeetrash/declined.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+
+ <test name='9'>
+ <description>Attendee recovers trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=recovertrash&mode=event&id=all</ruri>
+ </request>
+ </test>
+ <test name='10'>
+ <description>One item in user01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Organizer sees tentative</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/attendeetrash/recovered.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Clean up</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150522/470d137e/attachment-0001.html>
More information about the calendarserver-changes
mailing list