<!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>[14083] 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/14083">14083</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-10-16 09:09:16 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes for cross-pod proxy support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodsharingproxiessetupproxies5ics">CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/5.ics</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVcalendaruserproxyxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVsharingproxiesxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVpodsharingproxiessetupproxies6ics">CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVpodsharingproxiessetupproxies5ics"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/5.ics (14082 => 14083)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/5.ics        2014-10-14 17:53:19 UTC (rev 14082)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/5.ics        2014-10-16 16:09:16 UTC (rev 14083)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> SUMMARY:event 1
</span><del>-UID:54E181BC7CCC373042B28842@ninevah.local
</del><ins>+UID:$uid1:
</ins><span class="cx"> CATEGORIES:cool
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVpodsharingproxiessetupproxies6ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics (0 => 14083)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics         (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics        2014-10-16 16:09:16 UTC (rev 14083)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+CATEGORIES:cool
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Alarm for sharee!
+TRIGGER;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVcalendaruserproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml (14082 => 14083)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml        2014-10-14 17:53:19 UTC (rev 14082)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml        2014-10-16 16:09:16 UTC (rev 14083)
</span><span class="lines">@@ -71,6 +71,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -94,6 +114,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='3'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -146,6 +186,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value><![CDATA[{DAV:}group-member-set$<href xmlns="DAV:">$pprincipaluri1:</href>]]></value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='5'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -169,6 +229,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='6'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><span class="lines">@@ -192,6 +272,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='7'>
</span><span class="cx">                         <description>Verify access to resource</description>
</span><span class="lines">@@ -262,6 +362,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='10'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -285,6 +405,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='11'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -308,6 +448,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='12'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -360,6 +520,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$pprincipaluri1:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='14'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -383,6 +563,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='15'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><span class="lines">@@ -406,6 +606,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-write/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='16'>
</span><span class="cx">                         <description>Verify access to resource</description>
</span><span class="lines">@@ -448,6 +668,13 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>DELETE</method>
+                                <ruri>$calendarpath1:/2.ics</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='19'>
</span><span class="cx">                         <description>Clear podB user as read-write proxy for podA user01</description>
</span><span class="lines">@@ -486,6 +713,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='20'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -509,6 +756,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='21'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -532,6 +799,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='22'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -552,6 +839,26 @@
</span><span class="cx">         <test-suite name='Proxy on podB - requests from podB'>
</span><span class="cx">                 <test name='1'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -575,6 +882,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal2:</ruri>
</span><span class="lines">@@ -627,6 +954,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value><![CDATA[{DAV:}group-member-set$<href xmlns="DAV:">$pprincipaluri1:</href>]]></value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -650,6 +997,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='5'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -673,6 +1040,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='6'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -743,6 +1130,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -766,6 +1173,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='10'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -789,6 +1216,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='11'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -841,6 +1288,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$pprincipaluri1:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="lines">@@ -864,6 +1331,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='14'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -887,6 +1374,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='15'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-write/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -949,6 +1456,13 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+                                <method>DELETE</method>
+                                <ruri>$calendarpath1:/2.ics</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='19'>
</span><span class="cx">                         <description>Clear podB user as read-write proxy for podA user01</description>
</span><span class="lines">@@ -967,6 +1481,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="lines">@@ -990,6 +1524,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='20'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -1013,6 +1567,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='21'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes'>
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -1073,6 +1647,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1096,6 +1690,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='3'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -1148,6 +1762,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='5'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1171,6 +1805,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='6'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><span class="lines">@@ -1194,6 +1848,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$pprincipaluri1:calendar-proxy-read/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='7'>
</span><span class="cx">                         <description>Verify access to resource</description>
</span><span class="lines">@@ -1264,6 +1938,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='10'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1287,6 +1981,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='11'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1310,6 +2024,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='12'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -1362,6 +2096,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='14'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1385,6 +2139,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='15'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><span class="lines">@@ -1408,6 +2182,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$pprincipaluri1:calendar-proxy-write/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='16'>
</span><span class="cx">                         <description>Verify access to resource</description>
</span><span class="lines">@@ -1450,6 +2244,13 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$userid2:" pswd="$pswd2:">
+                                <method>DELETE</method>
+                                <ruri>$pcalendarpath1:/2.ics</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='19'>
</span><span class="cx">                         <description>Clear podA user02 as read-write proxy for podB user</description>
</span><span class="lines">@@ -1488,6 +2289,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='20'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1511,6 +2332,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='21'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><span class="lines">@@ -1534,6 +2375,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:" host2='yes'>
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='22'>
</span><span class="cx">                         <description>Verify no access to resource</description>
</span><span class="lines">@@ -1554,6 +2415,26 @@
</span><span class="cx">         <test-suite name='Proxy on podA - requests from podB'>
</span><span class="cx">                 <test name='1'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -1577,6 +2458,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal2:</ruri>
</span><span class="lines">@@ -1629,6 +2530,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -1652,6 +2573,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='5'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -1675,6 +2616,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='6'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$pprincipaluri1:calendar-proxy-read/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal2:</ruri>
</span><span class="lines">@@ -1745,6 +2706,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-read/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -1768,6 +2749,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='10'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -1791,6 +2792,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='11'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$principal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal1:</ruri>
</span><span class="lines">@@ -1843,6 +2864,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="lines">@@ -1866,6 +2907,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='14'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -1889,6 +2950,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='15'>
</span><span class="cx">                         <description>Verify single group membership</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>xmlElementMatch</callback>
+                                        <arg>
+                                                <name>exists</name>
+                                                <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+                                                <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$pprincipaluri1:calendar-proxy-write/]</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal2:</ruri>
</span><span class="lines">@@ -1951,6 +3032,13 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request host2='yes' user="$userid2:" pswd="$pswd2:">
+                                <method>DELETE</method>
+                                <ruri>$pcalendarpath1:/2.ics</ruri>
+                                <verify>
+                                        <callback>statusCode</callback>
+                                </verify>
+                        </request>
</ins><span class="cx">                 </test>
</span><span class="cx">                 <test name='19'>
</span><span class="cx">                         <description>Clear podA user02 as read-write proxy for podB user</description>
</span><span class="lines">@@ -1969,6 +3057,26 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:calendar-proxy-write/</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:calendar-proxy-write/</ruri>
</span><span class="lines">@@ -1992,6 +3100,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='20'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$pprincipal1:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$pprincipal1:</ruri>
</span><span class="lines">@@ -2015,6 +3143,26 @@
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='21'>
</span><span class="cx">                         <description>Verify no group memberships right now</description>
</span><ins>+                        <request user="$puserid1:" pswd="$ppswd1:">
+                                <method>PROPFIND</method>
+                                <ruri>$principal2:</ruri>
+                                <header>
+                                        <name>Depth</name>
+                                        <value>0</value>
+                                </header>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
+                                </data>
+                                <verify>
+                                        <callback>propfindItems</callback>
+                                        <arg>
+                                                <name>okprops</name>
+                                                <value>{DAV:}group-member-set$</value>
+                                                <value>{DAV:}group-membership$</value>
+                                        </arg>
+                                </verify>
+                        </request>
</ins><span class="cx">                         <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
</span><span class="cx">                                 <method>PROPFIND</method>
</span><span class="cx">                                 <ruri>$principal2:</ruri>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVsharingproxiesxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml (14082 => 14083)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml        2014-10-14 17:53:19 UTC (rev 14082)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml        2014-10-16 16:09:16 UTC (rev 14083)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">         
</span><span class="cx">         <test-suite name='Setup proxies'>
</span><span class="cx">                 <test name='1'>
</span><del>-                        <description>Add user03 as read proxy for user02</description>
</del><ins>+                        <description>Add puser03 as read proxy for puser02</description>
</ins><span class="cx">                         <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
</span><span class="cx">                                 <method>PROPPATCH</method>
</span><span class="cx">                                 <ruri>$pprincipal2:calendar-proxy-read/</ruri>
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><del>-                        <description>Add user04 as write proxy for user02</description>
</del><ins>+                        <description>Add puser04 as write proxy for puser02</description>
</ins><span class="cx">                         <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
</span><span class="cx">                                 <method>PROPPATCH</method>
</span><span class="cx">                                 <ruri>$pprincipal2:calendar-proxy-write/</ruri>
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">                                 <ruri>$shareecalendar:/1.ics</ruri>
</span><span class="cx">                                 <data>
</span><span class="cx">                                         <content-type>text/calendar; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CalDAV/sharing/proxies/put/2.ics</filepath>
</del><ins>+                                        <filepath>Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/sharing/proxies/put/3.ics</value>
</del><ins>+                                                <value>Resource/CalDAV-pod/sharing/proxies/setupproxies/5.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">                                         <callback>calendarDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CalDAV/sharing/proxies/put/2.ics</value>
</del><ins>+                                                <value>Resource/CalDAV-pod/sharing/proxies/setupproxies/6.ics</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx">
</span><span class="cx">         <test-suite name='Proxy property changes'>
</span><span class="cx">                 <test name='1'>
</span><del>-                        <description>Read proxy cannot write properties</description>
</del><ins>+                        <description>Read proxy can write properties</description>
</ins><span class="cx">                         <request host2="yes" user="$puserid3:" pswd="$ppswd3:">
</span><span class="cx">                                 <method>PROPPATCH</method>
</span><span class="cx">                                 <ruri>$shareecalendar:/</ruri>
</span><span class="lines">@@ -465,10 +465,10 @@
</span><span class="cx">                                         <filepath>Resource/CalDAV/sharing/proxies/properties/1.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><del>-                                        <callback>statusCode</callback>
</del><ins>+                                        <callback>propfindItems</callback>
</ins><span class="cx">                                         <arg>
</span><del>-                                                <name>status</name>
-                                                <value>403</value>
</del><ins>+                                                <name>okprops</name>
+                                                <value>{DAV:}displayname</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span></span></pre>
</div>
</div>
</body>
</html>