<!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>[13619] 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/13619">13619</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-09 09:04:50 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test that read proxies can write properties (but not data). Test that proxies can override calendar color with their own value.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml">CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharingproxiesxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxy17xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/17.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxy18xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/18.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxy19xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/19.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxy20xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/20.xml</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges1xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges2xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges3xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges4xml">CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVsharingproxiesproperties2xml">CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/2.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCommonPROPPATCHmakeproxy01xml">CalDAVTester/trunk/Resource/Common/PROPPATCH/make-proxy01.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCommonPROPPATCHremoveproxiesxml">CalDAVTester/trunk/Resource/Common/PROPPATCH/remove-proxies.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxy17xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/17.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/17.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/17.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri3:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxy18xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/18.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/18.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/18.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/" xmlns:IC="http://apple.com/ns/ical/">
+<D:set>
+<D:prop>
+<CS:details>User01</CS:details>
+<IC:calendar-color>#000001</IC:calendar-color>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxy19xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/19.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/19.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/19.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/" xmlns:IC="http://apple.com/ns/ical/">
+<D:prop>
+<CS:details/>
+<IC:calendar-color/>
+</D:prop>
+</D:propfind>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxy20xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/20.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/20.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/20.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/" xmlns:IC="http://apple.com/ns/ical/">
+<D:set>
+<D:prop>
+<CS:details>User03</CS:details>
+<IC:calendar-color>#000003</IC:calendar-color>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:details>details-owner</D:details>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges2xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:details/>
+</D:prop>
+</D:propfind>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges3xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:details>details-proxy</D:details>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVcalendaruserproxyproxychanges4xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:remove>
+<D:prop>
+<D:details/>
+</D:prop>
+</D:remove>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVsharingproxiesproperties2xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/2.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/proxies/properties/2.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>Changed Name #2</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCommonPROPPATCHmakeproxy01xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/Common/PROPPATCH/make-proxy01.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/Common/PROPPATCH/make-proxy01.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPPATCH/make-proxy01.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri1:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCommonPROPPATCHremoveproxiesxml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/Common/PROPPATCH/remove-proxies.xml (0 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/Common/PROPPATCH/remove-proxies.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPPATCH/remove-proxies.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml (13618 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2014-06-09 16:03:29 UTC (rev 13618)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> <test-suite name='OPTIONS header'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Look for options header tag</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>OPTIONS</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <test-suite name='Principal resources'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Look for proxy principals</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> <test-suite name='Group membership'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Verify no group memberships right now</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -159,7 +159,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal2:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Verify no access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>Add user02 as read proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -234,7 +234,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><span class="cx"> <description>Verify single group membership</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal2:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="cx"> <description>Verify access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><span class="cx"> <description>Verify no access for scheduling</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$outboxpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='9'>
</span><span class="cx"> <description>Clear user02 as read-only proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -349,7 +349,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -372,7 +372,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal2:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><span class="cx"> <description>Verify no access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='13'>
</span><span class="cx"> <description>Add user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -447,7 +447,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='15'>
</span><span class="cx"> <description>Verify single group membership</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal2:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='16'>
</span><span class="cx"> <description>Verify access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='17'>
</span><span class="cx"> <description>Verify access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='18'>
</span><span class="cx"> <description>Verify access for scheduling</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$outboxpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='19'>
</span><span class="cx"> <description>Verify no access for scheduling</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$outboxpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='20'>
</span><span class="cx"> <description>Clear user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -591,7 +591,7 @@
</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><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='22'>
</span><span class="cx"> <description>Verify no group memberships right now</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal2:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='23'>
</span><span class="cx"> <description>Verify no access to resource</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='24'>
</span><span class="cx"> <description>Try to add user02 and a bogus user as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='25' ignore='yes'>
</span><span class="cx"> <description>Verify no change to locked membership</description>
</span><del>- <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
</del><ins>+ <request user="$useradmin:" pswd="$pswdadmin:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$rprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='26'>
</span><span class="cx"> <description>Verify group memberships</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$rprincipal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='27'>
</span><span class="cx"> <description>Verify group memberships</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='28'>
</span><span class="cx"> <description>Verify read-only group memberships</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$rprincipal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='29'>
</span><span class="cx"> <description>Verify group memberships</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal3:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -780,7 +780,7 @@
</span><span class="cx"> <test-suite name='Principal report'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Add user02 and user03 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Reset read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> <test-suite name='Proxy For properties'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Default setup</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Change proxy state and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user='$userid3:' pswd='$pswd3:' print-response="no">
</del><ins>+ <request user='$userid3:' pswd='$pswd3:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Reset proxies and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user='$userid3:' pswd='$pswd3:' print-response="no">
</del><ins>+ <request user='$userid3:' pswd='$pswd3:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -995,7 +995,7 @@
</span><span class="cx"> <test-suite name='Expand properties'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>OK property query</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Change proxy state and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1040,7 +1040,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user='$userid3:' pswd='$pswd3:' print-response="no">
</del><ins>+ <request user='$userid3:' pswd='$pswd3:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>OK property query</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1088,7 +1088,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>Reset proxies</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user='$userid3:' pswd='$pswd3:' print-response="no">
</del><ins>+ <request user='$userid3:' pswd='$pswd3:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx"> <test-suite name='Calendar Home cache invalidation'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Cannot access user2 calendar home</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Change proxy state and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1161,7 +1161,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Reset proxies and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx"> <test-suite name='Calendar Home properties'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Cannot access user2 calendar home</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1245,7 +1245,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Change proxy state and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1260,7 +1260,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1286,7 +1286,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Reset proxies and test</description>
</span><del>- <request user='$userid2:' pswd='$pswd2:' print-response="no">
</del><ins>+ <request user='$userid2:' pswd='$pswd2:'>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1301,7 +1301,7 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -1329,7 +1329,7 @@
</span><span class="cx"> </require-feature>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Add user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1347,7 +1347,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Add user04 as read proxy for user03</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response="no">
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1519,7 +1519,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><span class="cx"> <description>Clear user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1537,7 +1537,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='13'>
</span><span class="cx"> <description>Clear user04 as read-write proxy for user03</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response="no">
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal3:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1575,7 +1575,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Store in resource collections</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$rcalendarpath1:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -1588,7 +1588,807 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><ins>+
+ <test-suite name='Read proxy, write properties not data'>
+ <test name='1'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPPATCH/make-proxy01.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Owner property change</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-owner</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-owner</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Proxy property change</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-proxy</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-proxy</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Proxy property remove</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Proxy no data</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath2:/1.ics</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Reset proxies and test</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/COMMON/PROPPATCH/remove-proxies.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
</ins><span class="cx">
</span><ins>+
+ <test-suite name='Write proxy, write properties and data'>
+ <test name='1'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPPATCH/make-proxy01.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Owner property change</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-owner</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-owner</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Proxy property change</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-proxy</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details$details-proxy</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Proxy property remove</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarpath2:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Owner property</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Proxy property</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/proxy-changes/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}details</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Proxy write data</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath2:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/put/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Proxy delete data</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarpath2:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Reset proxies and test</description>
+ <request user='$userid2:' pswd='$pswd2:'>
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/COMMON/PROPPATCH/remove-proxies.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Per-proxy properties'>
+ <test name='1'>
+ <description>Add user02 as read proxy for user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <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/calendaruserproxy/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Add user03 as write proxy for user01</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/17.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <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/calendaruserproxy/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Simple MKCALENDAR</description>
+ <request end-delete='yes'>
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Change some properties</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/18.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details</value>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Properties are set for owner</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Properties are set for one proxy</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Properties are set for one proxy</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User01</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Proxy change some properties</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPPATCH</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/20.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details</value>
+ <value>{http://apple.com/ns/ical/}calendar-color</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Properties are set for owner</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Properties are set for one proxy</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000001</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Properties are set for one proxy</description>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/proxytest/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/19.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{http://calendarserver.org/ns/}details$User03</value>
+ <value>{http://apple.com/ns/ical/}calendar-color$#000003</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Reset proxies</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$principal1:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+
</ins><span class="cx"> <end>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETEALL</method>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsharingproxiesxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml (13618 => 13619)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2014-06-09 16:03:29 UTC (rev 13618)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml 2014-06-09 16:04:50 UTC (rev 13619)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><span class="cx">
</span><del>- <test-suite name='Setup proxies' ignore="no">
</del><ins>+ <test-suite name='Setup proxies'>
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Add user03 as read proxy for user02</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Add user04 as write proxy for user02</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -93,9 +93,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Set up share'>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>POST invitation</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -109,11 +109,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Check Sharee notification collection</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Sharee replies ACCEPTED</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -160,9 +160,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>Check accept status</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><span class="cx"> <description>Sharer adds event</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/1.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> <test-suite name='Proxies see calendar and contents'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Read proxy lists calendar home</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Write proxy lists calendar home</description>
</span><del>- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
</del><ins>+ <request user="$userid4:" pswd="$pswd4:">
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome2:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Read proxy lists calendar</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>Write proxy lists calendar</description>
</span><del>- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
</del><ins>+ <request user="$userid4:" pswd="$pswd4:">
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> <test-suite name='Proxy data changes'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <description>Read proxy cannot write new data</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$shareecalendar:/2.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="cx"> <description>Read proxy cannot write existing data</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$shareecalendar:/1.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Write proxy can write new data</description>
</span><del>- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
</del><ins>+ <request user="$userid4:" pswd="$pswd4:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$shareecalendar:/2.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>Sharer sees new data</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/2.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><span class="cx"> <description>Sharee sees new data</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$shareecalendar:/2.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><span class="cx"> <description>Write proxy can write existing data with per-user alarm</description>
</span><del>- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
</del><ins>+ <request user="$userid4:" pswd="$pswd4:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$shareecalendar:/1.ics</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="cx"> <description>Sharer sees new data without alarm</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><span class="cx"> <description>Sharee sees new data with alarm</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GET</method>
</span><span class="cx"> <ruri>$shareecalendar:/1.ics</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -454,10 +454,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Proxy property changes'>
</del><ins>+ <test-suite name='Read proxy property changes'>
</ins><span class="cx"> <test name='1'>
</span><del>- <description>Read proxy cannot write properties</description>
- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <description>Read proxy can write properties</description>
+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -465,22 +465,70 @@
</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 class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><ins>+ <description>Sharer sees original displayname</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/shared/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Sharee sees new displayname</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$shareecalendar:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}displayname$Changed Name #1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+
+ <test-suite name='Write proxy property changes'>
+ <test name='1'>
</ins><span class="cx"> <description>Write proxy can write properties</description>
</span><del>- <request user="$userid4:" pswd="$pswd4:" print-response='no'>
</del><ins>+ <request user="$userid4:" pswd="$pswd4:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/proxies/properties/1.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/proxies/properties/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -491,9 +539,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>Sharer sees original displayname</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$calendarhome1:/shared/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -513,9 +561,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>Sharee sees new displayname</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$shareecalendar:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -530,7 +578,7 @@
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okprops</name>
</span><del>- <value>{DAV:}displayname$Changed Name #1</value>
</del><ins>+ <value>{DAV:}displayname$Changed Name #2</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -545,7 +593,7 @@
</span><span class="cx"> <ruri>$notificationpath3:/</ruri>
</span><span class="cx"> <ruri>$notificationpath4:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -553,7 +601,7 @@
</span><span class="cx"> <filepath>Resource/CalDAV/sharing/proxies/setupproxies/3.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response="no">
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal2:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span></span></pre>
</div>
</div>
</body>
</html>