<!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>[14814] CalDAVTester/trunk</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/14814">14814</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 17:07:05 -0700 (Thu, 21 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Added test for organizer-trashed event</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVtrashxml">CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashorganizertrashcancelledics">CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/cancelled.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashorganizertrashinviteics">CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/invite.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashorganizertrashrecoveredics">CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashorganizertrashreplyics">CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/reply.ics</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVtrashorganizertrashcancelledics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/cancelled.ics (0 => 14814)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/cancelled.ics                                (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/cancelled.ics        2015-05-22 00:07:05 UTC (rev 14814)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+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:
+SEQUENCE:2
+STATUS:CANCELLED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashorganizertrashinviteics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/invite.ics (0 => 14814)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/invite.ics                                (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/invite.ics        2015-05-22 00:07:05 UTC (rev 14814)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+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
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashorganizertrashrecoveredics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics (0 => 14814)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics                                (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics        2015-05-22 00:07:05 UTC (rev 14814)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+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=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn1:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn2:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashorganizertrashreplyics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/reply.ics (0 => 14814)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/reply.ics                                (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/reply.ics        2015-05-22 00:07:05 UTC (rev 14814)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+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
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVtrashxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml (14813 => 14814)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml        2015-05-21 17:41:54 UTC (rev 14813)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml        2015-05-22 00:07:05 UTC (rev 14814)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> 
</span><span class="cx">         &lt;test-suite name='Trashed events do not show up in freebusy'&gt;
</span><span class="cx">                 &lt;test name='1'&gt;
</span><del>-                        &lt;description&gt;PUT an event&lt;/description&gt;
</del><ins>+                        &lt;description&gt;Create a calendar&lt;/description&gt;
</ins><span class="cx">                 &lt;request&gt;
</span><span class="cx">                     &lt;method&gt;MKCALENDAR&lt;/method&gt;
</span><span class="cx">                     &lt;ruri&gt;$calendarhome1:/tobedeleted/&lt;/ruri&gt;
</span><span class="lines">@@ -244,6 +244,147 @@
</span><span class="cx">                 &lt;/test&gt;
</span><span class="cx">         &lt;/test-suite&gt;
</span><span class="cx"> 
</span><ins>+    &lt;test-suite name='Organizer trashes event'&gt;
+        &lt;test name='1'&gt;
+            &lt;description&gt;Create a calendar&lt;/description&gt;
+            &lt;request&gt;
+                &lt;method&gt;MKCALENDAR&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/tobedeleted/&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='2'&gt;
+            &lt;description&gt;PUT scheduled event&lt;/description&gt;
+            &lt;request&gt;
+                &lt;method&gt;PUT&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/tobedeleted/1.ics&lt;/ruri&gt;
+                &lt;data&gt;
+                    &lt;content-type&gt;text/calendar; charset=utf-8&lt;/content-type&gt;
+                    &lt;filepath&gt;Resource/CalDAV/trash/organizertrash/invite.ics&lt;/filepath&gt;
+                &lt;/data&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;statusCode&lt;/callback&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='3'&gt;
+            &lt;description&gt;One item in user02 Inbox&lt;/description&gt;
+            &lt;request user=&quot;$useradmin:&quot; pswd=&quot;$pswdadmin:&quot;&gt;
+                &lt;method&gt;WAITDELETEALL 1&lt;/method&gt;
+                &lt;ruri&gt;$inboxpath2:/&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='4'&gt;
+            &lt;description&gt;Attendee -&gt; Accepted&lt;/description&gt;
+            &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot;&gt;
+                &lt;method&gt;GETNEW&lt;/method&gt;
+                &lt;ruri&gt;$calendarpath2:/&lt;/ruri&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;statusCode&lt;/callback&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+            &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot;&gt;
+                &lt;method&gt;PUT&lt;/method&gt;
+                &lt;ruri&gt;$&lt;/ruri&gt;
+                &lt;data&gt;
+                    &lt;content-type&gt;text/calendar; charset=utf-8&lt;/content-type&gt;
+                    &lt;filepath&gt;Resource/CalDAV/trash/organizertrash/reply.ics&lt;/filepath&gt;
+                &lt;/data&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;statusCode&lt;/callback&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='5'&gt;
+            &lt;description&gt;One item in user01 Inbox&lt;/description&gt;
+            &lt;request user=&quot;$useradmin:&quot; pswd=&quot;$pswdadmin:&quot;&gt;
+                &lt;method&gt;WAITDELETEALL 1&lt;/method&gt;
+                &lt;ruri&gt;$inboxpath1:/&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='6'&gt;
+            &lt;description&gt;Organizer trashes event&lt;/description&gt;
+            &lt;request&gt;
+                &lt;method&gt;DELETE&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/tobedeleted/1.ics&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='7'&gt;
+            &lt;description&gt;One item in user02 Inbox&lt;/description&gt;
+            &lt;request user=&quot;$useradmin:&quot; pswd=&quot;$pswdadmin:&quot;&gt;
+                &lt;method&gt;WAITDELETEALL 1&lt;/method&gt;
+                &lt;ruri&gt;$inboxpath2:/&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='8'&gt;
+            &lt;description&gt;Attendee sees cancellation&lt;/description&gt;
+            &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot;&gt;
+                &lt;method&gt;GETNEW&lt;/method&gt;
+                &lt;ruri&gt;$calendarpath2:/&lt;/ruri&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;calendarDataMatch&lt;/callback&gt;
+                    &lt;arg&gt;
+                        &lt;name&gt;filepath&lt;/name&gt;
+                        &lt;value&gt;Resource/CalDAV/trash/organizertrash/cancelled.ics&lt;/value&gt;
+                    &lt;/arg&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='9'&gt;
+            &lt;description&gt;Attendee deletes cancellation&lt;/description&gt;
+            &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot;&gt;
+                &lt;method&gt;DELETE&lt;/method&gt;
+                &lt;ruri&gt;$&lt;/ruri&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;statusCode&lt;/callback&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+
+        &lt;test name='10'&gt;
+            &lt;description&gt;Recover trash&lt;/description&gt;
+            &lt;request&gt;
+                &lt;method&gt;POST&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/?action=recovertrash&amp;amp;mode=event&amp;amp;id=all&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='11'&gt;
+            &lt;description&gt;One item in user02 Inbox&lt;/description&gt;
+            &lt;request user=&quot;$useradmin:&quot; pswd=&quot;$pswdadmin:&quot;&gt;
+                &lt;method&gt;WAITDELETEALL 1&lt;/method&gt;
+                &lt;ruri&gt;$inboxpath2:/&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='12'&gt;
+            &lt;description&gt;Attendee sees re-invite&lt;/description&gt;
+            &lt;request user=&quot;$userid2:&quot; pswd=&quot;$pswd2:&quot;&gt;
+                &lt;method&gt;GETNEW&lt;/method&gt;
+                &lt;ruri&gt;$calendarpath2:/&lt;/ruri&gt;
+                &lt;verify&gt;
+                    &lt;callback&gt;calendarDataMatch&lt;/callback&gt;
+                    &lt;arg&gt;
+                        &lt;name&gt;filepath&lt;/name&gt;
+                        &lt;value&gt;Resource/CalDAV/trash/organizertrash/recovered.ics&lt;/value&gt;
+                    &lt;/arg&gt;
+                &lt;/verify&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+        &lt;test name='13'&gt;
+            &lt;description&gt;Clean up&lt;/description&gt;
+            &lt;request&gt;
+                &lt;method&gt;DELETEALL&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/tobedeleted/&lt;/ruri&gt;
+            &lt;/request&gt;
+            &lt;request&gt;
+                &lt;method&gt;DELETE&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/tobedeleted/&lt;/ruri&gt;
+            &lt;/request&gt;
+            &lt;request&gt;
+                &lt;method&gt;POST&lt;/method&gt;
+                &lt;ruri&gt;$calendarhome1:/?action=emptytrash&lt;/ruri&gt;
+            &lt;/request&gt;
+        &lt;/test&gt;
+    &lt;/test-suite&gt;
+
</ins><span class="cx">         &lt;end/&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;/caldavtest&gt;
</span></span></pre>
</div>
</div>

</body>
</html>