<!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>[14862] 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/14862">14862</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-29 13:19:32 -0700 (Fri, 29 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trash+group attendee expansion tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashorganizertrashrecoveredics">CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/</li>
<li>CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee1ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee2ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee3ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee4ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee5ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer1ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer2ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer3ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer4ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer5ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer6ics">CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCommonPOSTcontrolschedulingdonejson">CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVtrashimplicitgroupxml">CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee1ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,34 @@
</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:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$groupname20:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$gcuaddrurn20:
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgroupattendee5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer1ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,34 @@
</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:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$groupname20:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$gcuaddrurn20:
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:3
+STATUS:CANCELLED
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashimplicitgrouporganizer6ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVtrashorganizertrashrecoveredics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics (14861 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics        2015-05-29 20:14:28 UTC (rev 14861)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> UID:$uid1:
</span><span class="cx"> DTSTART:$now.8:T200000Z
</span><span class="cx"> DURATION:PT1H
</span><del>-ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn1:
</del><ins>+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
</ins><span class="cx"> ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn2:
</span><span class="cx"> CREATED:20060110T231240Z
</span><span class="cx"> DESCRIPTION:Call-in
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCommonPOSTcontrolschedulingdonejson"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json         (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+{
+        "action": "refreshgroups",
+        "wait": true
+}
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVtrashimplicitgroupxml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml (0 => 14862)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml         (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml        2015-05-29 20:19:32 UTC (rev 14862)
</span><span class="lines">@@ -0,0 +1,784 @@
</span><ins>+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2015 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+        <description>Test implicit scheduling with group expansion and trash collection</description>
+
+        <require-feature>
+                <feature>caldav</feature>
+                <feature>implicit-scheduling</feature>
+                <feature>group-attendee-expansion</feature>
+                <feature>trash-collection</feature>
+        </require-feature>
+
+        <start>
+                <request user="$userid1:" pswd="$pswd1:">
+                        <method>GET</method>
+                        <ruri>$calendarpath1:/</ruri>
+                </request>
+                <request user="$userid2:" pswd="$pswd2:">
+                        <method>GET</method>
+                        <ruri>$calendarpath2:/</ruri>
+                </request>
+                <request user="$userid3:" pswd="$pswd3:">
+                        <method>GET</method>
+                        <ruri>$calendarpath3:/</ruri>
+                </request>
+                <request user="$userid6:" pswd="$pswd6:">
+                        <method>GET</method>
+                        <ruri>$calendarpath6:/</ruri>
+                </request>
+                <request user="$userid7:" pswd="$pswd7:">
+                        <method>GET</method>
+                        <ruri>$calendarpath7:/</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>
+        </start>
+        
+        <test-suite name='Invite empty group, trash, then add member, recover' change-uid='yes'>
+                <require-feature>
+                        <feature>control-api</feature>
+                </require-feature>
+                <test name='1'>
+                        <description>Organizer invites Group Attendee</description>
+                        <request>
+                                <method>PUT</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV/trash/implicitgroup/organizer/1.ics</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='2'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GET</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/2.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='3'>
+                        <description>Organizer deletes data</description>
+                        <request>
+                                <method>DELETE</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='4'>
+                        <description>Organizer has no events</description>
+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='5'>
+                        <description>Add group member</description>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controladdmember.json</filepath>
+                                        <substitute>
+                                                <name>$controlgroup:</name>
+                                                <value>$groupguid20:</value>
+                                        </substitute>
+                                        <substitute>
+                                                <name>$controlmember:</name>
+                                                <value>$userguid2:</value>
+                                        </substitute>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='6'>
+                        <description>Organizer has no events</description>
+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='7'>
+                        <description>Attendee has no events</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='8'>
+                        <description>Organizer 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='9'>
+                        <description>Attendee Inbox Item</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath2:/</ruri>
+                        </request>
+                </test>
+                <test name='10'>
+                        <description>Attendee has data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/3.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='11'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/4.ics</value>
+                                        </arg>
+                                </verify>
+                                <graburi>$recovered:</graburi>
+                        </request>
+                </test>
+        </test-suite>
+
+        <test-suite name='Trash, then remove member, recover'>
+                <require-feature>
+                        <feature>control-api</feature>
+                </require-feature>
+                <test name='1'>
+                        <description>Organizer deletes data</description>
+                        <request>
+                                <method>DELETE</method>
+                                <ruri>$recovered:</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='2'>
+                        <description>Attendee Inbox Item</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath2:/</ruri>
+                        </request>
+                </test>
+                <test name='3'>
+                        <description>Attendee has data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='4'>
+                        <description>Organizer has no events</description>
+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='5'>
+                        <description>Remove group member</description>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+                                        <substitute>
+                                                <name>$controlgroup:</name>
+                                                <value>$groupguid20:</value>
+                                        </substitute>
+                                        <substitute>
+                                                <name>$controlmember:</name>
+                                                <value>$userguid2:</value>
+                                        </substitute>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='6'>
+                        <description>Organizer has no events</description>
+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='7'>
+                        <description>Attendee has data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='8'>
+                        <description>Organizer Recover trash</description>
+                        <request>
+                                <method>POST</method>
+                                <ruri>$calendarhome1:/?action=recovertrash&amp;mode=event&amp;id=all</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='9'>
+                        <description>Attendee no Inbox Item</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>PROPFIND</method>
+                                <ruri>$inboxpath2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='10'>
+                        <description>Attendee has data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='11'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/organizer/6.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='-1'>
+                        <description>Clean-up</description>
+                        <request user="$userid1:" pswd="$pswd1:">
+                                <method>DELETEALL</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <ruri>$inboxpath1:/</ruri>
+                        </request>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>DELETEALL</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <ruri>$inboxpath2:/</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>
+
+        <test-suite name='Invite empty group, trash, then add member, recover' change-uid='yes'>
+                <require-feature>
+                        <feature>control-api</feature>
+                </require-feature>
+                <test name='1'>
+                        <description>Add group member</description>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controladdmember.json</filepath>
+                                        <substitute>
+                                                <name>$controlgroup:</name>
+                                                <value>$groupguid20:</value>
+                                        </substitute>
+                                        <substitute>
+                                                <name>$controlmember:</name>
+                                                <value>$userguid2:</value>
+                                        </substitute>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='2'>
+                        <description>Organizer invites Group Attendee</description>
+                        <request>
+                                <method>PUT</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV/trash/implicitgroup/attendee/1.ics</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='3'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GET</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/attendee/2.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='4'>
+                        <description>Attendee Inbox Item</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath2:/</ruri>
+                        </request>
+                </test>
+                <test name='5'>
+                        <description>Attendee has data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/attendee/3.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='6'>
+                        <description>Attendee deletes data</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>DELETE</method>
+                                <ruri>$</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='7'>
+                        <description>Organizer Inbox Item</description>
+                        <request>
+                                <method>WAITDELETEALL 1</method>
+                                <ruri>$inboxpath1:/</ruri>
+                        </request>
+                </test>
+                <test name='8'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GET</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/attendee/4.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='9'>
+                        <description>Remove group member</description>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+                                        <substitute>
+                                                <name>$controlgroup:</name>
+                                                <value>$groupguid20:</value>
+                                        </substitute>
+                                        <substitute>
+                                                <name>$controlmember:</name>
+                                                <value>$userguid2:</value>
+                                        </substitute>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                        <request user="$useradmin:" pswd="$pswdadmin:">
+                                <method>POST</method>
+                                <ruri>/control</ruri>
+                                <data>
+                                        <content-type>application/json; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+                                </data>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
+                </test>
+                <test name='10'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GET</method>
+                                <ruri>$calendarpath1:/1.ics</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/attendee/5.ics</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='11'>
+                        <description>Attendee has no events</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='12'>
+                        <description>Attendee Recover 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='13'>
+                        <description>Attendee has no events</description>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>PROPFIND</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>1</value>
+                                </header>
+                                <data>
+                                        <content-type>text/calendar; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>multistatusItems</callback>
+                                        <arg>
+                                                <name>count</name>
+                                                <value>0</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
+                <test name='14'>
+                        <description>Organizer checks data</description>
+                        <request>
+                                <method>GETNEW</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <verify>
+                                        <callback>calendarDataMatch</callback>
+                                        <arg>
+                                                <name>filepath</name>
+                                                <value>Resource/CalDAV/trash/implicitgroup/attendee/5.ics</value>
+                                        </arg>
+                                </verify>
+                                <graburi>$recovered:</graburi>
+                        </request>
+                </test>
+                <test name='-1'>
+                        <description>Clean-up</description>
+                        <request user="$userid1:" pswd="$pswd1:">
+                                <method>DELETEALL</method>
+                                <ruri>$calendarpath1:/</ruri>
+                                <ruri>$inboxpath1:/</ruri>
+                        </request>
+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>DELETEALL</method>
+                                <ruri>$calendarpath2:/</ruri>
+                                <ruri>$inboxpath2:/</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>
+
+        <end/>
+        
+</caldavtest>
</ins></span></pre>
</div>
</div>
</body>
</html>