<!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>[12050] CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml</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/12050">12050</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 07:40:55 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve testing of xml elements by using xmlElementMatch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml">CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml (12049 => 12050)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2013-12-10 04:49:05 UTC (rev 12049)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2013-12-11 15:40:55 UTC (rev 12050)
</span><span class="lines">@@ -148,11 +148,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -171,11 +171,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -223,11 +223,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -246,11 +246,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -269,11 +269,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value><![CDATA[{DAV:}group-membership$<D:href xmlns:D="DAV:">$principaluri1:calendar-proxy-read/</D:href>]]></value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -339,11 +338,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -362,11 +361,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -385,11 +384,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -437,11 +436,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -460,11 +459,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -483,11 +482,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value><![CDATA[{DAV:}group-membership$<D:href xmlns:D="DAV:">$principaluri1:calendar-proxy-write/</D:href>]]></value>
</del><ins>+ <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>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -581,11 +580,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -604,11 +603,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -627,11 +626,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set$</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -700,11 +699,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri1:</D:href>]]></value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -723,10 +722,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>dataString</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>contains</name>
- <value>&lt;href&gt;$rprincipaluri1:calendar-proxy-write/&lt;/href&gt;</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[$rprincipaluri1:calendar-proxy-write/]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -745,11 +744,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri3:</D:href>]]></value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -768,10 +767,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>dataString</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>contains</name>
- <value>&lt;href&gt;$rprincipaluri1:calendar-proxy-read/&lt;/href&gt;</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$rprincipaluri1:calendar-proxy-read/]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -808,21 +807,14 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{DAV:}group-member-set</value>
- <value>{DAV:}group-membership$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
+ <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <callback>dataString</callback>
- <arg>
- <name>contains</name>
- <value>&lt;href&gt;$principaluri2:&lt;/href&gt;</value>
- <value>&lt;href&gt;$principaluri3:&lt;/href&gt;</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><span class="lines">@@ -873,7 +865,7 @@
</span><span class="cx"> <description>Default setup</description>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>PROPFIND</method>
</span><del>- <ruri>$principal1:/</ruri>
</del><ins>+ <ruri>$principal1:</ruri>
</ins><span class="cx"> <header>
</span><span class="cx"> <name>Depth</name>
</span><span class="cx"> <value>0</value>
</span><span class="lines">@@ -883,11 +875,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{http://calendarserver.org/ns/}calendar-proxy-read-for$</value>
- <value>{http://calendarserver.org/ns/}calendar-proxy-write-for$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -926,7 +918,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>PROPFIND</method>
</span><del>- <ruri>$principal1:/</ruri>
</del><ins>+ <ruri>$principal1:</ruri>
</ins><span class="cx"> <header>
</span><span class="cx"> <name>Depth</name>
</span><span class="cx"> <value>0</value>
</span><span class="lines">@@ -936,11 +928,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindValues</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value><![CDATA[{http://calendarserver.org/ns/}calendar-proxy-read-for$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
- <value><![CDATA[{http://calendarserver.org/ns/}calendar-proxy-write-for$<D:href xmlns:D="DAV:">$principaluri3:</D:href>]]></value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for/{DAV:}href[=$principaluri2:]</value>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for/{DAV:}href[=$principaluri3:]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -979,7 +971,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>PROPFIND</method>
</span><del>- <ruri>$principal1:/</ruri>
</del><ins>+ <ruri>$principal1:</ruri>
</ins><span class="cx"> <header>
</span><span class="cx"> <name>Depth</name>
</span><span class="cx"> <value>0</value>
</span><span class="lines">@@ -989,11 +981,11 @@
</span><span class="cx"> <filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <callback>propfindItems</callback>
</del><ins>+ <callback>xmlElementMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>okprops</name>
- <value>{http://calendarserver.org/ns/}calendar-proxy-read-for$</value>
- <value>{http://calendarserver.org/ns/}calendar-proxy-write-for$</value>
</del><ins>+ <name>exists</name>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre>
</div>
</div>
</body>
</html>