<!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>[13118] CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/sharing-sync.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/13118">13118</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 11:20:25 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix sharing-sync.xml to use the right substitution for uid</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVsharingsyncxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/sharing-sync.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/sharing-sync.xml (13117 => 13118)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/sharing-sync.xml 2014-04-02 14:47:00 UTC (rev 13117)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/sharing-sync.xml 2014-04-02 18:20:25 UTC (rev 13118)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='shared addressbook'>
</span><span class="cx"> <test name='1a'>
</span><span class="lines">@@ -2231,7 +2231,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='two shared groups'>
</span><span class="cx"> <test name='0'>
</span><span class="lines">@@ -3584,9 +3584,9 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
</del><ins>+ <!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
</ins><span class="cx"> use shared address books instead of calendars -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='support-report-set/sync-token property'>
</span><span class="cx"> <test name='0'>
</span><span class="cx"> <description>clean up old data</description>
</span><span class="lines">@@ -3598,7 +3598,7 @@
</span><span class="cx"> <ruri>$addressbookhome4:/</ruri>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- add 2 vcards to user1 address book -->
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -3616,7 +3616,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/2.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user2 address book with user1 -->
</span><span class="cx"> <!-- user2 POSTs invitation -->
</span><span class="cx"> <request user="$userid2:" pswd="$pswd2:" print-response="no">
</span><span class="lines">@@ -3803,7 +3803,7 @@
</span><span class="cx"> <description>On shared addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><del>- <ruri>$addressbookhome1:/$userid2:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
</ins><span class="cx"> <header>
</span><span class="cx"> <name>Depth</name>
</span><span class="cx"> <value>0</value>
</span><span class="lines">@@ -3845,7 +3845,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - sync-level'>
</span><span class="cx"> <test name='1'>
</span><span class="cx"> <require-feature>
</span><span class="lines">@@ -3868,7 +3868,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3894,7 +3894,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3920,7 +3920,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3948,10 +3948,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3979,10 +3979,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4010,10 +4010,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4240,7 +4240,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4268,10 +4268,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4335,7 +4335,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4364,10 +4364,10 @@
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><span class="cx"> <value>$addressbook:/3.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4426,7 +4426,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4454,10 +4454,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4520,7 +4520,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid2:/</value>
</del><ins>+ <value>$userguid2:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -4548,10 +4548,10 @@
</span><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$addressbook:/1.vcf</value>
</span><span class="cx"> <value>$addressbook:/2.vcf</value>
</span><del>- <value>$userid2:/</value>
- <value>$userid2:/1.vcf</value>
- <value>$userid2:/2.vcf</value>
- <value>$userid2:/addressbook.vcf</value>
</del><ins>+ <value>$userguid2:/</value>
+ <value>$userguid2:/1.vcf</value>
+ <value>$userguid2:/2.vcf</value>
+ <value>$userguid2:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5197,7 +5197,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user4 address book with user1 -->
</span><span class="cx"> <!-- user4 POSTs invitation -->
</span><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="lines">@@ -5273,14 +5273,14 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5293,7 +5293,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
</span><span class="lines">@@ -5317,8 +5317,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5331,7 +5331,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -5351,11 +5351,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5377,11 +5377,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/3.vcf</value>
</del><ins>+ <value>$userguid3:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5394,7 +5394,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
</span><span class="lines">@@ -5418,8 +5418,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5474,14 +5474,14 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5502,7 +5502,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/12.vcf</filepath>
</span><span class="lines">@@ -5526,8 +5526,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/</value>
+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5548,7 +5548,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -5568,11 +5568,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5594,11 +5594,11 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid4:/3.vcf</value>
</del><ins>+ <value>$userguid4:/3.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5618,7 +5618,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
</span><span class="lines">@@ -5642,8 +5642,8 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
</del><ins>+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5714,12 +5714,12 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/1.vcf</value>
- <value>$userid3:/2.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/1.vcf</value>
+ <value>$userguid3:/2.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5773,7 +5773,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5837,7 +5837,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -5859,7 +5859,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -5869,7 +5869,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><del>-
</del><ins>+
</ins><span class="cx"> <test-suite name='simple reports - diff token - no props - home depth:1'>
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="lines">@@ -5941,7 +5941,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/6.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>-
</del><ins>+
</ins><span class="cx"> <!-- share user4 address book with user1 -->
</span><span class="cx"> <!-- user4 POSTs invitation -->
</span><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="lines">@@ -6017,8 +6017,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6031,7 +6031,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/9.vcf</filepath>
</span><span class="lines">@@ -6055,7 +6055,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6068,7 +6068,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6088,7 +6088,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6110,7 +6110,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6123,7 +6123,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/5.vcf</filepath>
</span><span class="lines">@@ -6147,7 +6147,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6202,8 +6202,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6224,7 +6224,7 @@
</span><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/10.vcf</filepath>
</span><span class="lines">@@ -6248,7 +6248,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6269,7 +6269,7 @@
</span><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/3.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/3.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6289,7 +6289,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6311,7 +6311,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6331,7 +6331,7 @@
</span><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><del>- <ruri>$addressbookhome1:/$userid4:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid4:/1.vcf</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/vreports/put/7.vcf</filepath>
</span><span class="lines">@@ -6355,7 +6355,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid4:/</value>
</del><ins>+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6426,8 +6426,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6440,21 +6440,21 @@
</span><span class="cx"> <description>remove resource then addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/1.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/1.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/2.vcf</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/2.vcf</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -6474,7 +6474,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6540,7 +6540,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6562,7 +6562,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -6616,12 +6616,12 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid3:/addressbook.vcf</value>
- <value>$userid4:/</value>
- <value>$userid4:/1.vcf</value>
- <value>$userid4:/2.vcf</value>
- <value>$userid4:/addressbook.vcf</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid3:/addressbook.vcf</value>
+ <value>$userguid4:/</value>
+ <value>$userguid4:/1.vcf</value>
+ <value>$userguid4:/2.vcf</value>
+ <value>$userguid4:/addressbook.vcf</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6634,7 +6634,7 @@
</span><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
</span><span class="lines">@@ -6658,7 +6658,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6678,7 +6678,7 @@
</span><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
</span><span class="lines">@@ -6702,7 +6702,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6742,8 +6742,8 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><span class="cx"> <value>$addressbook:/</value>
</span><del>- <value>$userid3:/</value>
- <value>$userid4:/</value>
</del><ins>+ <value>$userguid3:/</value>
+ <value>$userguid4:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -6756,7 +6756,7 @@
</span><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/37.xml</filepath>
</span><span class="lines">@@ -6780,7 +6780,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6800,7 +6800,7 @@
</span><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><del>- <ruri>$addressbookhome1:/$userid3:/</ruri>
</del><ins>+ <ruri>$addressbookhome1:/$userguid3:/</ruri>
</ins><span class="cx"> <data>
</span><span class="cx"> <content-type>text/vcard; charset=utf-8</content-type>
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/sync/addressbook/38.xml</filepath>
</span><span class="lines">@@ -6824,7 +6824,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$userid3:/</value>
</del><ins>+ <value>$userguid3:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -6855,5 +6855,5 @@
</span><span class="cx"> <ruri>$notificationpath4:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </end>
</span><del>-
</del><ins>+
</ins><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>