<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14840] CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14840">14840</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-28 08:28:02 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test that only the owner of a home can use POST for trash manipulation. Plus some XML tweaks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVtrashxml">CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCalDAVtrashxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml (14839 => 14840)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-27 19:02:04 UTC (rev 14839)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-28 15:28:02 UTC (rev 14840)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>caldav</feature>
</span><span class="cx"> <feature>trash-collection</feature>
</span><del>- <feature>shared-calendars</feature>
</del><ins>+ <feature>shared-calendars</feature>
</ins><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start>
</span><span class="lines">@@ -32,999 +32,1006 @@
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/?action=emptytrash</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/?action=emptytrash</ruri>
- </request>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
</ins><span class="cx"> </start>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Simple trashed event recovery'>
</span><span class="cx"> <test name='1'>
</span><ins>+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
</ins><span class="cx"> <description>PUT an event</description>
</span><del>- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2'>
- <request>
- <method>PUT</method>
- <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/1.txt</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> <test name='3'>
</span><del>- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> <test name='4'>
</span><del>- <request>
- <method>GET</method>
- <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <request>
+ <method>GET</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> <test name='5'>
</span><ins>+ <description>Other user cannot recover trash</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
</span><del>- <verify>
- <callback>statusCode</callback>
- </verify>
</del><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><del>- </test>
- <test name='6'>
- <request>
- <method>GETNEW</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/trash/1.txt</value>
- </arg>
- </verify>
- </request>
</del><span class="cx"> </test>
</span><del>- <test name='clean up'>
- <request>
- <method>DELETEALL</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=emptytrash</ruri>
- </request>
- </test>
</del><ins>+ <test name='7'>
+ <request>
+ <method>GETNEW</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/1.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='clean up'>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <test-suite name='Trashed events do not show up in freebusy'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Create a calendar</description>
</span><del>- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>PUT timed event</description>
- <request>
- <method>PUT</method>
- <ruri>$calendarhome1:/tobedeleted/timed.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/timed.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Freebusy matches timed event</description>
- <request print-response="yes">
- <method>POST</method>
- <ruri>$outboxpath1:/</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/fb.ics</filepath>
- </data>
- <verify>
- <callback>postFreeBusy</callback>
- <arg>
- <name>attendee</name>
- <value>$cuaddr1:</value>
- </arg>
- <arg>
- <name>busy</name>
- <value>$now.0:T130000Z/$now.0:T140000Z</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='4'>
- <description>PUT all-day event</description>
- <request>
- <method>PUT</method>
- <ruri>$calendarhome1:/tobedeleted/allday.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/allday.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='5'>
- <description>Freebusy matches all-day event</description>
- <request print-response="yes">
- <method>POST</method>
- <ruri>$outboxpath1:/</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/fb.ics</filepath>
- </data>
- <verify>
- <callback>postFreeBusy</callback>
- <arg>
- <name>attendee</name>
- <value>$cuaddr1:</value>
- </arg>
- <arg>
- <name>busy</name>
- <value>$now.0:T000000Z/$now.1:T000000Z</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='6'>
- <description>Delete all-day event</description>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/allday.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='7'>
- <description>Freebusy matches timed event</description>
- <request print-response="yes">
- <method>POST</method>
- <ruri>$outboxpath1:/</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/fb.ics</filepath>
- </data>
- <verify>
- <callback>postFreeBusy</callback>
- <arg>
- <name>attendee</name>
- <value>$cuaddr1:</value>
- </arg>
- <arg>
- <name>busy</name>
- <value>$now.0:T130000Z/$now.0:T140000Z</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='8'>
- <description>Recover trashed all-day event</description>
</del><span class="cx"> <request>
</span><ins>+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT timed event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/tobedeleted/timed.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/timed.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Freebusy matches timed event</description>
+ <request>
</ins><span class="cx"> <method>POST</method>
</span><ins>+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/fb.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.0:T130000Z/$now.0:T140000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PUT all-day event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/tobedeleted/allday.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/allday.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Freebusy matches all-day event</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/fb.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.0:T000000Z/$now.1:T000000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Delete all-day event</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/allday.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Freebusy matches timed event</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/fb.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.0:T130000Z/$now.0:T140000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Recover trashed all-day event</description>
+ <request>
+ <method>POST</method>
</ins><span class="cx"> <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
</span><del>- <verify>
- <callback>statusCode</callback>
- </verify>
</del><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><del>- </test>
- <test name='9'>
- <description>Freebusy matches all-day event once more</description>
- <request print-response="yes">
- <method>POST</method>
- <ruri>$outboxpath1:/</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/fb.ics</filepath>
- </data>
- <verify>
- <callback>postFreeBusy</callback>
- <arg>
- <name>attendee</name>
- <value>$cuaddr1:</value>
- </arg>
- <arg>
- <name>busy</name>
- <value>$now.0:T000000Z/$now.1:T000000Z</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='clean up'>
- <request>
- <method>DELETEALL</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=emptytrash</ruri>
- </request>
- </test>
</del><ins>+ </test>
+ <test name='9'>
+ <description>Freebusy matches all-day event once more</description>
+ <request>
+ <method>POST</method>
+ <ruri>$outboxpath1:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/fb.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddr1:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.0:T000000Z/$now.1:T000000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='clean up'>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Organizer trashes event'>
- <test name='1'>
- <description>Create a calendar</description>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </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/organizertrash/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 with 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/organizertrash/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>Organizer trashes event</description>
- <request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='7'>
- <description>One item in user02 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITDELETEALL 1</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
- </test>
- <test name='8'>
- <description>Attendee sees cancellation</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/trash/organizertrash/cancelled.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='9'>
- <description>Attendee deletes cancellation</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETE</method>
- <ruri>$</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test-suite name='Organizer trashes event'>
+ <test name='1'>
+ <description>Create a calendar</description>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </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/organizertrash/invite.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>One item in user02 Inbox</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee replies with 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/organizertrash/reply.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer trashes event</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>One item in user02 Inbox</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Attendee sees cancellation</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/organizertrash/cancelled.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Attendee deletes cancellation</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='10'>
- <description>Recover trash</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='11'>
- <description>One item in user02 Inbox</description>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>WAITDELETEALL 1</method>
- <ruri>$inboxpath2:/</ruri>
- </request>
- </test>
- <test name='12'>
- <description>Attendee sees re-invite</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/trash/organizertrash/recovered.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='clean up'>
- <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>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/?action=emptytrash</ruri>
- </request>
- </test>
- </test-suite>
</del><ins>+ <test name='10'>
+ <description>Recover trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>One item in user02 Inbox</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Attendee sees re-invite</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/organizertrash/recovered.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='clean up'>
+ <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>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><del>- <test-suite name='Attendee trashes event'>
- <test name='1'>
- <description>Create a calendar</description>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/tobedeleted/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </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>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </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&amp;mode=event&amp;id=all</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </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='11'>
- <description>Organizer sees tentative</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/recovered.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='clean up'>
- <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>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/?action=emptytrash</ruri>
- </request>
- </test>
</del><ins>+ <test-suite name='Attendee trashes event'>
+ <test name='1'>
+ <description>Create a calendar</description>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </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="$userid2:" pswd="$pswd2:">
+ <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>
+ <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>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer sees declined</description>
+ <request>
+ <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 user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer sees tentative</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/attendeetrash/recovered.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='clean up'>
+ <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>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><del>- </test-suite>
</del><span class="cx">
</span><ins>+ <test-suite name='Sharer trashes event'>
</ins><span class="cx">
</span><del>- <test-suite name='Sharer trashes event'>
</del><ins>+ <test name='Setup'>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid2:</variable>
+ </grabelement>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}hosturl/{DAV:}href</name>
+ <variable>$hosturl2:</variable>
+ </grabelement>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar2:</variable>
+ </grabelement>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='Setup'>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
- <ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$notificationpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid2:</variable>
- </grabelement>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}hosturl/{DAV:}href</name>
- <variable>$hosturl2:</variable>
- </grabelement>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$sharedcalendar2:</variable>
- </grabelement>
- </request>
- </test>
</del><ins>+ <test name='1'>
+ <description>User01 adds event</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>PUT</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='1'>
- <description>User01 adds event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>PUT</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='2'>
+ <description>User02 sees event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$sharedcalendar2:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='2'>
- <description>User02 sees event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GET</method>
- <ruri>$sharedcalendar2:/1.ics</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='3'>
+ <description>User01 trashes event</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='3'>
- <description>User01 trashes event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>DELETE</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='4'>
+ <description>User02 no longer sees event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$sharedcalendar2:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='4'>
- <description>User02 no longer sees event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GET</method>
- <ruri>$sharedcalendar2:/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='5'>
+ <description>User01 recovers trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='5'>
- <description>User01 recovers trash</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='6'>
+ <description>User01 sees event</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>GETNEW</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='6'>
- <description>User01 sees event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>GETNEW</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='7'>
+ <description>User02 sees event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='7'>
- <description>User02 sees event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$sharedcalendar2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='clean up'>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ <ruri>$calendarhome1:/shared/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><del>- <test name='clean up'>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- <ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$sharedcalendar2:/</ruri>
- <ruri>$calendarhome1:/shared/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETE</method>
- <ruri>$sharedcalendar2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETE</method>
- <ruri>$calendarhome1:/shared/</ruri>
- </request>
- </test>
</del><span class="cx">
</span><ins>+ <test-suite name='Sharee trashes event'>
+ <test name='Setup'>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid2:</variable>
+ </grabelement>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}hosturl/{DAV:}href</name>
+ <variable>$hosturl2:</variable>
+ </grabelement>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedcalendar2:</variable>
+ </grabelement>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- </test-suite>
</del><ins>+ <test name='1'>
+ <description>User01 adds event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><ins>+ <test name='2'>
+ <description>User02 sees event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$sharedcalendar2:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test-suite name='Sharee trashes event'>
</del><ins>+ <test name='3'>
+ <description>User02 trashes event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar2:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='Setup'>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharinginvite23.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>WAITCOUNT 1</method>
- <ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$notificationpath2:/</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid2:</variable>
- </grabelement>
- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}hosturl/{DAV:}href</name>
- <variable>$hosturl2:</variable>
- </grabelement>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$sharedcalendar2:</variable>
- </grabelement>
- </request>
- </test>
</del><ins>+ <test name='4'>
+ <description>User01 no longer sees event</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarhome1:/shared/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='1'>
- <description>User01 adds event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>PUT</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='5'>
+ <description>User01 recovers trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='2'>
- <description>User02 sees event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GET</method>
- <ruri>$sharedcalendar2:/1.ics</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='6'>
+ <description>User01 sees event</description>
+ <request>
+ <method>GETNEW</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='3'>
- <description>User02 trashes event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETE</method>
- <ruri>$sharedcalendar2:/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='7'>
+ <description>User02 sees event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx">
</span><del>- <test name='4'>
- <description>User01 no longer sees event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>GET</method>
- <ruri>$calendarhome1:/shared/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test name='clean up'>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ <ruri>$calendarhome1:/shared/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$sharedcalendar2:/</ruri>
+ </request>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><del>- <test name='5'>
- <description>User01 recovers trash</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
</del><span class="cx">
</span><del>- <test name='6'>
- <description>User01 sees event</description>
- <request user="$userid1:" pswd="$pswd1:">
- <method>GETNEW</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><ins>+ <test-suite name='Attendee trashes SCHEDULE-AGENT=NONE event'>
+ <test name='1'>
+ <description>PUT scheduled event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$calendarpath2:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/attendeenone/invite.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Attendee trashes event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$calendarpath2:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee recovers trash</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has event</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/attendeenone/recovered.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='clean up'>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><del>- <test name='7'>
- <description>User02 sees event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$sharedcalendar2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/sharing/peruser-data/simple-put/2.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><span class="cx">
</span><del>- <test name='clean up'>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- <ruri>$notificationpath2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$sharedcalendar2:/</ruri>
- <ruri>$calendarhome1:/shared/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETE</method>
- <ruri>$sharedcalendar2:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETE</method>
- <ruri>$calendarhome1:/shared/</ruri>
- </request>
- </test>
-
-
- </test-suite>
-
-
- <test-suite name='Attendee trashes SCHEDULE-AGENT=NONE event'>
- <test name='1'>
- <description>PUT scheduled event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>PUT</method>
- <ruri>$calendarpath2:/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/trash/attendeenone/invite.ics</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Attendee trashes event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETE</method>
- <ruri>$calendarpath2:/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Attendee recovers trash</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome2:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4'>
- <description>Attendee has event</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>GETNEW</method>
- <ruri>$calendarpath2:/</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/trash/attendeenone/recovered.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='clean up'>
- <request user="$userid2:" pswd="$pswd2:">
- <method>DELETEALL</method>
- <ruri>$calendarpath2:/</ruri>
- </request>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$calendarhome2:/?action=emptytrash</ruri>
- </request>
- </test>
-
- </test-suite>
-
-
- <end>
</del><ins>+ <end>
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><del>- <method>DELETEALL</method>
- <ruri>$notificationpath1:/</ruri>
- <ruri>$notificationpath2:/</ruri>
</del><ins>+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
</ins><span class="cx"> </request>
</span><span class="cx"> </end>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>