<!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>[13897] 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/13897">13897</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:43:21 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>add unshare-groups uninvite tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharinggroupsxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharingunsharegroupsxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete2xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite1xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite2xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite3xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/3.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite4xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/4.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite5xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/5.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite6xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/6.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite7xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/7.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite8xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/8.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite9xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/9.xml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete2xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete3xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete2xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml (13896 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml 2014-08-19 21:25:04 UTC (rev 13896)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:resourcetype/>
-<D:owner/>
-<D:current-user-privilege-set/>
-</D:prop>
-</D:propfind>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete2xmlfromrev13882CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete3xml"></a>
<div class="copfile"><h4>Copied: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml (from rev 13882, CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml) (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$cuaddr8:</D:href>
+ <CS:summary>My Shared Calendar</CS:summary>
+ <CS:read-write/>
+ </CS:remove>
+</CS:share>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete3xml"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml (13896 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml 2014-08-19 21:25:04 UTC (rev 13896)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8" ?>
-<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
- <CS:remove>
- <D:href>$cuaddr8:</D:href>
- <CS:summary>My Shared Calendar</CS:summary>
- <CS:read-write/>
- </CS:remove>
-</CS:share>
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/1.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/1.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$gcuaddrurn2:</D:href>
+ </CS:remove>
+</CS:share>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite2xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/2.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/2.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$cuaddrurn6:</D:href>
+ </CS:remove>
+</CS:share>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite3xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/3.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/3.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$gcuaddrurn4:</D:href>
+ </CS:remove>
+</CS:share>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite4xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/4.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/4.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn6:</href>
+ <invite-deleted/>
+ <access>
+ <read/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite5xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/5.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/5.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn7:</href>
+ <invite-deleted/>
+ <access>
+ <read/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite6xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/6.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/6.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/6.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn10:</href>
+ <invite-deleted/>
+ <access>
+ <read/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT"/>
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite7xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/7.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/7.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/7.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$gcuaddrurn3:</D:href>
+ </CS:remove>
+</CS:share>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite8xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/8.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/8.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/8.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn8:</href>
+ <invite-deleted/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsuninvite9xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/9.xml (0 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/9.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/uninvite/9.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<?xml version='1.0' encoding='UTF-8'?>
+<notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='calendar'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn9:</href>
+ <invite-deleted/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$calendarhome1:/shared</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Calendar</summary>
+ <supported-calendar-component-set xmlns='urn:ietf:params:xml:ns:caldav'>
+ <comp name="VEVENT" />
+ </supported-calendar-component-set>
+ </invite-notification>
+</notification>
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsharinggroupsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml (13896 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-19 21:25:04 UTC (rev 13896)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-groups.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -1050,6 +1050,60 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Check Sharee notification collection</description>
</span><ins>+ <request user="$userid6:" pswd="$pswd6:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath6:/</ruri>
+ </request>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath6:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/groups/ro-group-rw-member/2.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid6:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath7:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath7:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/groups/read-only/3.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid7:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Check Sharee notification collection</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath8:/</ruri>
</span><span class="lines">@@ -1075,7 +1129,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>Check Sharee notification collection</description>
</span><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="lines">@@ -1102,7 +1156,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>Check Sharee notification collection</description>
</span><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="lines">@@ -1129,8 +1183,44 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <description>Sharee replies ACCEPTED</description>
</span><ins>+ <request user="$userid6:" pswd="$pswd6:">
+ <method>POST</method>
+ <ruri>$calendarhome6:/</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/read-only/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$shareecalendar6:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Sharee replies ACCEPTED</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>POST</method>
+ <ruri>$calendarhome7:/</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/read-only/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$shareecalendar7:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Sharee replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome8:/</ruri>
</span><span class="lines">@@ -1147,7 +1237,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6'>
</del><ins>+ <test name='10'>
</ins><span class="cx"> <description>Sharee replies ACCEPTED</description>
</span><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -1165,7 +1255,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <description>Sharee replies ACCEPTED</description>
</span><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -1183,7 +1273,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='8' ignore="no">
</del><ins>+ <test name='12' ignore="no">
</ins><span class="cx"> <description>user6 shared calendar exists read-write</description>
</span><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1217,7 +1307,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9'>
</del><ins>+ <test name='13'>
</ins><span class="cx"> <description>user7 shared calendar exists read-only</description>
</span><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1249,7 +1339,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='10'>
</del><ins>+ <test name='14'>
</ins><span class="cx"> <description>user8 shared calendar exists read-write read-only</description>
</span><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1281,7 +1371,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11'>
</del><ins>+ <test name='15'>
</ins><span class="cx"> <description>user9 shared calendar exists read-write read-only</description>
</span><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1313,7 +1403,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12'>
</del><ins>+ <test name='16'>
</ins><span class="cx"> <description>user10 shared calendar exists read-only</description>
</span><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1347,7 +1437,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Add share to sub read-write' ignore="no">
</del><ins>+ <test-suite name='Share to subgroup read-write' ignore="no">
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -1620,7 +1710,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Add direct share to subgroup' ignore="no">
</del><ins>+ <test-suite name='Share direct to subgroup member' ignore="no">
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Add user8 as read for user1</description>
</span><span class="cx"> <request>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsharingunsharegroupsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml (13896 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-19 21:25:04 UTC (rev 13896)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='21'>
</span><del>- <description>Add user08 as read for user01</description>
</del><ins>+ <description>Add user8 as read for user1</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='22' ignore="no">
</span><del>- <description>user08 does direct share</description>
</del><ins>+ <description>user8 does direct share</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/?action=share</ruri>
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='23' ignore="no">
</span><del>- <description>user06 shared calendar exists read-write</description>
</del><ins>+ <description>user6 shared calendar exists read-write</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar6:/</ruri>
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='24'>
</span><del>- <description>user07 shared calendar exists read-only</description>
</del><ins>+ <description>user7 shared calendar exists read-only</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar7:/</ruri>
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='25'>
</span><del>- <description>user08 shared calendar exists read-only</description>
</del><ins>+ <description>user8 shared calendar exists read-only</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar8:/</ruri>
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='26'>
</span><del>- <description>user09 shared calendar exists read-write</description>
</del><ins>+ <description>user9 shared calendar exists read-write</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar9:/</ruri>
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>user06 deletes shared calendar</description>
</del><ins>+ <description>user6 deletes shared calendar</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$shareecalendar6:/</ruri>
</span><span class="lines">@@ -691,13 +691,13 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>user06 shared calendar nonextant</description>
</del><ins>+ <description>user6 shared calendar nonextant</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar6:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4' ignore="no">
</span><del>- <description>user07 deletes shared calendar</description>
</del><ins>+ <description>user7 deletes shared calendar</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$shareecalendar7:/</ruri>
</span><span class="lines">@@ -723,13 +723,13 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><del>- <description>user07 shared calendar nonextant</description>
</del><ins>+ <description>user7 shared calendar nonextant</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar7:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6' ignore="no">
</span><del>- <description>user08 deletes shared calendar</description>
</del><ins>+ <description>user8 deletes shared calendar</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$shareecalendar8:/</ruri>
</span><span class="lines">@@ -755,13 +755,13 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><del>- <description>user09 shared calendar nonextant</description>
</del><ins>+ <description>user8 shared calendar nonextant</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar8:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -773,7 +773,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><del>- <description>user09 deletes shared calendar</description>
</del><ins>+ <description>user9 deletes shared calendar</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$shareecalendar9:/</ruri>
</span><span class="lines">@@ -787,13 +787,13 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='9'>
</span><del>- <description>user09 shared calendar nonextant</description>
</del><ins>+ <description>user9 shared calendar nonextant</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar9:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -825,7 +825,7 @@
</span><span class="cx"> <ruri>$shareecalendar10:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare-groups/shareedelete/2.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='-1' ignore="no">
</span><del>- <description>Clear user08 as proxy for user01</description>
</del><ins>+ <description>Clear user8 as proxy for user1</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Reshare' ignore="no">
</span><del>- <test name='0'>
</del><ins>+ <test name='0' ignore="no">
</ins><span class="cx"> <description>clean up old notifications</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="lines">@@ -891,7 +891,6 @@
</span><span class="cx"> <ruri>$notificationpath10:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>-
</del><span class="cx"> <test name='1'>
</span><span class="cx"> <description>POST invitation to group4 read-only</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -1132,7 +1131,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12' ignore="no">
</span><del>- <description>user06 shared calendar exists read-write</description>
</del><ins>+ <description>user6 shared calendar exists read-write</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar6:/</ruri>
</span><span class="lines">@@ -1166,7 +1165,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='13'>
</span><del>- <description>user07 shared calendar exists read-only</description>
</del><ins>+ <description>user7 shared calendar exists read-only</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar7:/</ruri>
</span><span class="lines">@@ -1198,7 +1197,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='14' ignore="no">
</span><del>- <description>user09 shared calendar exists read-write</description>
</del><ins>+ <description>user8 shared calendar exists read-write</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar8:/</ruri>
</span><span class="lines">@@ -1232,7 +1231,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='15'>
</span><del>- <description>user09 shared calendar exists read-write</description>
</del><ins>+ <description>user9 shared calendar exists read-write</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar9:/</ruri>
</span><span class="lines">@@ -1299,15 +1298,15 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Uninvite' ignore="yes">
</del><ins>+ <test-suite name='Uninvite'>
</ins><span class="cx"> <test name='1'>
</span><del>- <description>POST invitation</description>
</del><ins>+ <description>uninvite subgroup 2</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/unshare-groups/uninvite/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1315,19 +1314,19 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>Check user3 notification collection</description>
- <request user="$userid3:" pswd="$pswd3:">
</del><ins>+ <description>Check user6 notification collection</description>
+ <request user="$userid6:" pswd="$pswd6:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><del>- <ruri>$notificationpath3:/</ruri>
</del><ins>+ <ruri>$notificationpath6:/</ruri>
</ins><span class="cx"> </request>
</span><del>- <request user="$userid3:" pswd="$pswd3:">
</del><ins>+ <request user="$userid6:" pswd="$pswd6:">
</ins><span class="cx"> <method>GETNEW</method>
</span><del>- <ruri>$notificationpath3:/</ruri>
</del><ins>+ <ruri>$notificationpath6:/</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/sharing/unshare/shareruninvite/2.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/groups/ro-group-rw-member/2.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><span class="lines">@@ -1335,84 +1334,426 @@
</span><span class="cx"> <value>{http://calendarserver.org/ns/}uid</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid:</variable>
- </grabelement>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>user3 replies ACCEPTED</description>
- <request user="$userid3:" pswd="$pswd3:">
</del><ins>+ <description>Check user7 notification collection</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath7:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath7:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/groups/read-only/3.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore="no">
+ <description>user6 shared calendar exists read-write</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar6:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>user7 shared calendar exists read-only</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar7:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore="no">
+ <description>user8 shared calendar exists read-write</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar8:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>user9 shared calendar exists read-write</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar9:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>user10 shared calendar exists read-only</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar10:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>uninvite user6</description>
+ <request>
</ins><span class="cx"> <method>POST</method>
</span><del>- <ruri>$calendarhome3:/</ruri>
</del><ins>+ <ruri>$calendarhome1:/shared/</ruri>
</ins><span class="cx"> <data>
</span><del>- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/3.xml</filepath>
</del><ins>+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare-groups/uninvite/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><ins>+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Check user6 notification collection</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath6:/</ruri>
+ </request>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath6:/</ruri>
+ <verify>
</ins><span class="cx"> <callback>xmlDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/sharing/unshare/shareruninvite/4.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/groups/read-only/2.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><del>- <value>{DAV:}href</value>
</del><ins>+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar:</variable>
- </grabelement>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
- <description>user3 changes name</description>
- <request user="$userid3:" pswd="$pswd3:">
- <method>PROPPATCH</method>
- <ruri>$shareecalendar:/</ruri>
</del><ins>+ <test name='11' ignore="no">
+ <description>user6 shared calendar exists read-write</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar6:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
</ins><span class="cx"> <data>
</span><del>- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/5.xml</filepath>
</del><ins>+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}displayname</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
</ins><span class="cx"> </arg>
</span><ins>+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
</ins><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5'>
- <description>POST uninvitation</description>
</del><ins>+ <test name='12'>
+ <description>user7 shared calendar exists read-only</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar7:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13' ignore="no">
+ <description>user8 shared calendar exists read-write</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar8:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <description>user9 shared calendar exists read-write</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar9:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='15'>
+ <description>user10 shared calendar exists read-only</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar10:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='16'>
+ <description>uninvite (super-)group 4</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/unshare/shareruninvite/6.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/unshare-groups/uninvite/3.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6'>
- <description>Check user3 notification collection</description>
- <request user="$userid3:" pswd="$pswd3:">
</del><ins>+ <test name='17'>
+ <description>Check user6 notification collection</description>
+ <request user="$userid6:" pswd="$pswd6:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><del>- <ruri>$notificationpath3:/</ruri>
</del><ins>+ <ruri>$notificationpath6:/</ruri>
</ins><span class="cx"> </request>
</span><del>- <request user="$userid3:" pswd="$pswd3:">
</del><ins>+ <request user="$userid6:" pswd="$pswd6:">
</ins><span class="cx"> <method>GETNEW</method>
</span><del>- <ruri>$notificationpath3:/</ruri>
</del><ins>+ <ruri>$notificationpath6:/</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>xmlDataMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filepath</name>
</span><del>- <value>Resource/CalDAV/sharing/unshare/shareruninvite/7.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/unshare-groups/uninvite/4.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><span class="lines">@@ -1420,12 +1761,318 @@
</span><span class="cx"> <value>{http://calendarserver.org/ns/}uid</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <grabelement>
- <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
- <variable>$inviteuid:</variable>
- </grabelement>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><ins>+ <test name='18'>
+ <description>Check user7 notification collection</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath7:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath7:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare-groups/uninvite/5.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='19'>
+ <description>Check user8 notification collection</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath8:/</ruri>
+ </request>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath8:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/2.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='20'>
+ <description>Check user9 notification collection</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath9:/</ruri>
+ </request>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath9:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/3.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='21'>
+ <description>Check user10 notification collection</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath10:/</ruri>
+ </request>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath10:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare-groups/uninvite/6.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='22' ignore="no">
+ <description>user6 shared calendar nonextant</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar6:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='23' ignore="no">
+ <description>user7 shared calendar nonextant</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar7:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='24' ignore="no">
+ <description>user8 shared calendar exists read-write</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar8:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='25'>
+ <description>user9 shared calendar exists read-write</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar9:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name="26" ignore="no">
+ <description>user10 shared calendar nonextant</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar10:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='27'>
+ <description>uninvite group 3</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/unshare-groups/uninvite/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='28'>
+ <description>Check user8 notification collection</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath8:/</ruri>
+ </request>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath8:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare-groups/uninvite/8.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='29'>
+ <description>Check user9 notification collection</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath9:/</ruri>
+ </request>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>GETNEW</method>
+ <ruri>$notificationpath9:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/unshare-groups/uninvite/9.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='30' ignore="no">
+ <description>user8 shared calendar nonextant</description>
+ <request user="$userid8:" pswd="$pswd8:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar8:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='31' ignore="no">
+ <description>user9 shared calendar nonextant</description>
+ <request user="$userid9:" pswd="$pswd9:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar9:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/common/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</ins><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end>
</span></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (13896 => 13897)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2014-08-19 21:25:04 UTC (rev 13896)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-08-19 23:43:21 UTC (rev 13897)
</span><span class="lines">@@ -301,6 +301,7 @@
</span><span class="cx">
</span><span class="cx"> def dofindnew(self, collection, label=""):
</span><span class="cx"> hresult = ""
</span><ins>+ possible_matches = set()
</ins><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "PROPFIND"
</span><span class="cx"> req.ruris.append(collection[0])
</span><span class="lines">@@ -327,7 +328,6 @@
</span><span class="cx"> except Exception:
</span><span class="cx"> return hresult
</span><span class="cx">
</span><del>- possible_matches = set()
</del><span class="cx"> latest = 0
</span><span class="cx"> request_uri = req.getURI(self.manager.server_info)
</span><span class="cx"> for response in tree.findall("{DAV:}response"):
</span></span></pre>
</div>
</div>
</body>
</html>