<!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>[13882] 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/13882">13882</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-08-15 18:09:50 -0700 (Fri, 15 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>reshare to groups</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharingunsharegroupsxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare1xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare2xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare3xml">CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.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="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml (0 => 13882)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/1.xml 2014-08-16 01:09:50 UTC (rev 13882)
</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-noresponse/>
+ <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>My 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="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare2xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml (0 => 13882)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/2.xml 2014-08-16 01:09:50 UTC (rev 13882)
</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-noresponse/>
+ <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>My 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="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsreshare3xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml (0 => 13882)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/reshare/3.xml 2014-08-16 01:09:50 UTC (rev 13882)
</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-noresponse/>
+ <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>My 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="CalDAVTestertrunkResourceCalDAVsharingunsharegroupsshareedelete3xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml (0 => 13882)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/unshare-groups/shareedelete/3.xml 2014-08-16 01:09:50 UTC (rev 13882)
</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="CalDAVTestertrunkscriptstestsCalDAVsharingunsharegroupsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml (13881 => 13882)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-15 21:26:06 UTC (rev 13881)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare-groups.xml 2014-08-16 01:09:50 UTC (rev 13882)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><span class="cx">
</span><del>- <test-suite name='share to supergroup ro, subgroups ro w/rw member and rw w/ro direct member'>
</del><ins>+ <test-suite name='Share to supergroup ro, subgroups ro w/rw member and rw w/ro direct member'>
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user6 notification collection</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath6:/</ruri>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user7 notification collection</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath7:/</ruri>
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user6 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome6:/</ruri>
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user7 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome7:/</ruri>
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user6 notification collection</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath6:/</ruri>
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user6 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome6:/</ruri>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='9'>
</span><del>- <description>POST invitation</description>
</del><ins>+ <description>POST invitation to group4 read-only</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user8 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">@@ -252,7 +252,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='11'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user9 notification collection</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath9:/</ruri>
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user10 notification collection</description>
</ins><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath10:/</ruri>
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='13'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user8 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">@@ -324,7 +324,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='14'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user9 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome9:/</ruri>
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='15'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user10 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome10:/</ruri>
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='17' ignore="no">
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user8 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">@@ -401,7 +401,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='18' ignore="no">
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user9 notification collection</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath9:/</ruri>
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='19'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user8 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">@@ -446,7 +446,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='20'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user9 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome9:/</ruri>
</span><span class="lines">@@ -878,15 +878,28 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='reshare to supergroup ro, subgroups ro w/rw member and rw' ignore="yes">
</del><ins>+ <test-suite name='Reshare' ignore="no">
+ <test name='0'>
+ <description>clean up old notifications</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ <ruri>$notificationpath6:/</ruri>
+ <ruri>$notificationpath7:/</ruri>
+ <ruri>$notificationpath8:/</ruri>
+ <ruri>$notificationpath9:/</ruri>
+ <ruri>$notificationpath10:/</ruri>
+ </request>
+ </test>
+
</ins><span class="cx"> <test name='1'>
</span><del>- <description>POST invitation</description>
</del><ins>+ <description>POST invitation to group4 read-only</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/groups/read-only/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -894,7 +907,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user6 notification collection work-around</description>
</ins><span class="cx"> <request user="$userid6:" pswd="$pswd6:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath6:/</ruri>
</span><span class="lines">@@ -906,7 +919,7 @@
</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-groups/setup/1.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/1.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><span class="lines">@@ -921,7 +934,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user7 notification collection</description>
</ins><span class="cx"> <request user="$userid7:" pswd="$pswd7:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath7:/</ruri>
</span><span class="lines">@@ -947,117 +960,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
- <description>Sharee replies ACCEPTED</description>
- <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='5'>
- <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='6'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-group-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='7'>
- <description>Check Sharee 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>
- <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='8'>
- <description>Sharee replies ACCEPTED</description>
- <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/ro-group-rw-member/3.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar6:</variable>
- </grabelement>
- </request>
- </test>
- <test name='9'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='10'>
- <description>Check Sharee notification collection</description>
</del><ins>+ <test name='4' ignore="no">
+ <description>Check user8 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">@@ -1069,7 +973,7 @@
</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/groups/ro-super-rw-member/2.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/2.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><span class="lines">@@ -1083,8 +987,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11'>
- <description>Check Sharee notification collection</description>
</del><ins>+ <test name='5' ignore="no">
+ <description>Check user9 notification collection</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath9:/</ruri>
</span><span class="lines">@@ -1096,7 +1000,7 @@
</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/groups/ro-super-rw-member/3.xml</value>
</del><ins>+ <value>Resource/CalDAV/sharing/unshare-groups/reshare/3.xml</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>filter</name>
</span><span class="lines">@@ -1110,8 +1014,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12'>
- <description>Check Sharee notification collection</description>
</del><ins>+ <test name='6'>
+ <description>Check user10 notification collection</description>
</ins><span class="cx"> <request user="$userid10:" pswd="$pswd10:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath10:/</ruri>
</span><span class="lines">@@ -1137,136 +1041,50 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid8:" pswd="$pswd8:">
</del><ins>+ <test name='7'>
+ <description>user6 replies ACCEPTED</description>
+ <request user="$userid6:" pswd="$pswd6:">
</ins><span class="cx"> <method>POST</method>
</span><del>- <ruri>$calendarhome8:/</ruri>
</del><ins>+ <ruri>$calendarhome6:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>application/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3a.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/read-only/4.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"> <grabelement>
</span><span class="cx"> <name>{DAV:}href</name>
</span><del>- <variable>$shareecalendar8:</variable>
</del><ins>+ <variable>$shareecalendar6:</variable>
</ins><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid9:" pswd="$pswd9:">
</del><ins>+ <test name='8'>
+ <description>user7 replies ACCEPTED</description>
+ <request user="$userid7:" pswd="$pswd7:">
</ins><span class="cx"> <method>POST</method>
</span><del>- <ruri>$calendarhome9:/</ruri>
</del><ins>+ <ruri>$calendarhome7:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>application/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3b.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/read-only/5.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"> <grabelement>
</span><span class="cx"> <name>{DAV:}href</name>
</span><del>- <variable>$shareecalendar9:</variable>
</del><ins>+ <variable>$shareecalendar7:</variable>
</ins><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid10:" pswd="$pswd10:">
- <method>POST</method>
- <ruri>$calendarhome10:/</ruri>
- <data>
- <content-type>application/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/3c.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <grabelement>
- <name>{DAV:}href</name>
- <variable>$shareecalendar10:</variable>
- </grabelement>
- </request>
- </test>
- <test name='16'>
- <description>POST invitation</description>
- <request>
- <method>POST</method>
- <ruri>$calendarhome1:/shared/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='17' ignore="no">
- <description>Check Sharee notification collection</description>
</del><ins>+ <test name='9' ignore="no">
+ <description>user8 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid8:" pswd="$pswd8:">
</span><del>- <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/2a.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>$inviteuid8:</variable>
- </grabelement>
- </request>
- </test>
- <test name='18' ignore="no">
- <description>Check Sharee 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/2b.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>$inviteuid9:</variable>
- </grabelement>
- </request>
- </test>
- <test name='19'>
- <description>Sharee replies ACCEPTED</description>
- <request user="$userid8:" pswd="$pswd8:">
</del><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome8:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>application/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/3a.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/5.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1277,14 +1095,14 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='20'>
- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <test name='10'>
+ <description>user9 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome9:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>application/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-sub-rw-member/3b.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/6.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="lines">@@ -1295,39 +1113,25 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='21' ignore="yes">
- <description>Add user08 as read for user01</description>
- <request>
- <method>PROPPATCH</method>
- <ruri>$principal1:calendar-proxy-read/</ruri>
</del><ins>+ <test name='11'>
+ <description>user10 replies ACCEPTED</description>
+ <request user="$userid10:" pswd="$pswd10:">
+ <method>POST</method>
+ <ruri>$calendarhome10:/</ruri>
</ins><span class="cx"> <data>
</span><del>- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
</del><ins>+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/sharing/groups/ro-super-rw-member/7.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
- <arg>
- <name>okprops</name>
- <value>{DAV:}group-member-set</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='22' ignore="yes">
- <description>user08 does direct share</description>
- <request user="$userid8:" pswd="$pswd8:">
- <method>GET</method>
- <ruri>$calendarhome1:/shared/?action=share</ruri>
- <verify>
</del><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="cx"> <name>{DAV:}href</name>
</span><del>- <variable>$shareecalendar8:</variable>
</del><ins>+ <variable>$shareecalendar10:</variable>
</ins><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='23' ignore="no">
</del><ins>+ <test name='12' ignore="no">
</ins><span class="cx"> <description>user06 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">@@ -1361,7 +1165,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='24'>
</del><ins>+ <test name='13'>
</ins><span class="cx"> <description>user07 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">@@ -1393,8 +1197,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='25'>
- <description>user08 shared calendar exists read-only</description>
</del><ins>+ <test name='14' ignore="no">
+ <description>user09 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">@@ -1411,21 +1215,23 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
</span><ins>+ <value>$verify-property-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:caldav}calendar</value>
</ins><span class="cx"> <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
</span><del>- </arg>
- <arg>
- <name>notexists</name>
</del><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
</span><ins>+ </arg>
+ <arg>
+ <name>notexists</name>
</ins><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='26'>
</del><ins>+ <test name='15'>
</ins><span class="cx"> <description>user09 shared calendar exists read-write</description>
</span><span class="cx"> <request user="$userid9:" pswd="$pswd9:">
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -1459,7 +1265,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='27'>
</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">@@ -1493,7 +1299,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Invite, display name change, uninvite' ignore="yes">
</del><ins>+ <test-suite name='Uninvite' ignore="yes">
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -1509,7 +1315,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user3 notification collection</description>
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath3:/</ruri>
</span><span class="lines">@@ -1536,7 +1342,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>Sharee replies ACCEPTED</description>
</del><ins>+ <description>user3 replies ACCEPTED</description>
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome3:/</ruri>
</span><span class="lines">@@ -1562,7 +1368,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><del>- <description>Sharee changes name</description>
</del><ins>+ <description>user3 changes name</description>
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="lines">@@ -1594,7 +1400,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><del>- <description>Check Sharee notification collection</description>
</del><ins>+ <description>Check user3 notification collection</description>
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath3:/</ruri>
</span></span></pre>
</div>
</div>
</body>
</html>