<!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>[14810] 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/14810">14810</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 12:54:29 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test to make sure trashed events do not show up in freebusy</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><a href="#CalDAVTestertrunkResourceCalDAVtrashalldayics">CalDAVTester/trunk/Resource/CalDAV/trash/allday.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashfbics">CalDAVTester/trunk/Resource/CalDAV/trash/fb.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashtimedics">CalDAVTester/trunk/Resource/CalDAV/trash/timed.ics</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVtrashalldayics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/allday.ics (0 => 14810)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/allday.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/allday.ics 2015-05-20 19:54:29 UTC (rev 14810)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051228T232517Z
+DTSTART;VALUE=DATE:$now.0:
+DURATION:P1D
+LOCATION:Durham
+SUMMARY:Meeting 1
+UID:$uid2:
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashfbics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/fb.ics (0 => 14810)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/fb.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/fb.ics 2015-05-20 19:54:29 UTC (rev 14810)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1::$cuaddr1:
+DTSTART:$now.0:T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:$now.1:T000000Z
+END:VFREEBUSY
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashtimedics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/timed.ics (0 => 14810)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/timed.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/timed.ics 2015-05-20 19:54:29 UTC (rev 14810)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051228T232517Z
+DTSTART;TZID=US/Eastern:$now.0:T090000
+DURATION:PT1H
+LOCATION:Durham
+SUMMARY:Meeting 1
+UID:$uid1:
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVtrashxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml (14809 => 14810)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-20 08:39:48 UTC (rev 14809)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-20 19:54:29 UTC (rev 14810)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> <start/>
</span><span class="cx">
</span><del>- <test-suite name='Trash recovery'>
</del><ins>+ <test-suite name='Simple trashed event recovery'>
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>PUT an event</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -81,9 +81,169 @@
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$calendarhome1:/tobedeleted/</ruri>
</span><span class="cx"> </request>
</span><ins>+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
</ins><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><ins>+
+ <test-suite name='Trashed events do not show up in freebusy'>
+ <test name='1'>
+ <description>PUT an event</description>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/tobedeleted/</ruri>
+ </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>
+ </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>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+ </request>
+ </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='10'>
+ <description>Clean up</description>
+ <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>
+ </test-suite>
+
</ins><span class="cx"> <end/>
</span><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>