<!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>[14835] 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/14835">14835</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 11:24:04 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tests for trash recovery of schedule-agent=none 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/attendeenone/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashattendeenoneinviteics">CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/invite.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashattendeenonerecoveredics">CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/recovered.ics</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVtrashattendeenoneinviteics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/invite.ics (0 => 14835)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/invite.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/invite.ics 2015-05-27 18:24:04 UTC (rev 14835)
</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=$username3:;RSVP=TRUE:$cuaddralt3:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;SCHEDULE-AGENT=NONE;CN=$username1::$cuaddralt1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashattendeenonerecoveredics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/recovered.ics (0 => 14835)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/recovered.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/attendeenone/recovered.ics 2015-05-27 18:24:04 UTC (rev 14835)
</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:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username3:;EMAIL=$email3:;RSVP=TRUE:$cuaddrurn3:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-AGENT=NONE:$cuaddrurn1:
+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 (14834 => 14835)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-27 14:45:30 UTC (rev 14834)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-27 18:24:04 UTC (rev 14835)
</span><span class="lines">@@ -44,7 +44,12 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>MKCALENDAR</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><ins>+ </test>
+ <test name='2'>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
</span><span class="lines">@@ -52,11 +57,21 @@
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CalDAV/trash/1.txt</filepath>
</span><span class="cx"> </data>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><ins>+ </test>
+ <test name='3'>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><ins>+ </test>
+ <test name='4'>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
</span><span class="lines">@@ -68,10 +83,17 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><ins>+ </test>
+ <test name='5'>
</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><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><ins>+ </test>
+ <test name='6'>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><span class="lines">@@ -107,6 +129,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>MKCALENDAR</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="lines">@@ -186,6 +211,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/allday.ics</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="lines">@@ -215,6 +243,9 @@
</span><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><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='9'>
</span><span class="lines">@@ -261,6 +292,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>MKCALENDAR</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="lines">@@ -317,6 +351,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/1.ics</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="lines">@@ -356,6 +393,9 @@
</span><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><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='11'>
</span><span class="lines">@@ -413,6 +453,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>MKCALENDAR</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="lines">@@ -469,6 +512,9 @@
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="lines">@@ -497,6 +543,9 @@
</span><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome2:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><span class="lines">@@ -556,6 +605,9 @@
</span><span class="cx"> <request end-delete="yes">
</span><span class="cx"> <method>MKCALENDAR</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -575,6 +627,9 @@
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> <grabelement>
</span><span class="cx"> <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
</span><span class="cx"> <variable>$inviteuid2:</variable>
</span><span class="lines">@@ -591,6 +646,9 @@
</span><span class="cx"> <content-type>application/xml; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/Common/POST/sharingreply2.xml</filepath>
</span><span class="cx"> </data>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> <grabelement>
</span><span class="cx"> <name>{DAV:}href</name>
</span><span class="cx"> <variable>$sharedcalendar2:</variable>
</span><span class="lines">@@ -607,6 +665,9 @@
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CalDAV/sharing/peruser-data/simple-put/1.ics</filepath>
</span><span class="cx"> </data>
</span><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx">
</span><span class="lines">@@ -655,6 +716,9 @@
</span><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><ins>+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx">
</span><span class="lines">@@ -698,6 +762,76 @@
</span><span class="cx">
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <end/>
</del><span class="cx">
</span><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>
+ <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>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ </end>
+
</ins><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>