<!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>[15176] CalDAVTester/branches/release/CalDAVTester-5.3-dev</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/15176">15176</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-13 08:58:37 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjust tests for change to sync token.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptsserverserverinfotemplatexml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptsserverserverinfoxml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCalDAVsharingnotificationsyncxml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sharing-notification-sync.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCalDAVsyncreportxml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sync-report.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCardDAVsharingsyncxml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sharing-sync.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCardDAVsyncreportxml">CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sync-report.xml</a></li>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devverifiersmultistatusItemspy">CalDAVTester/branches/release/CalDAVTester-5.3-dev/verifiers/multistatusItems.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTesterbranchesreleaseCalDAVTester53devsrcutilspy">CalDAVTester/branches/release/CalDAVTester-5.3-dev/src/utils.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo-template.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo-template.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo-template.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -286,6 +286,24 @@
</span><span class="cx"> <value>freebusy</value>
</span><span class="cx"> </substitution>
</span><span class="cx">
</span><ins>+ <!-- Sync home collection items - use "-" to include the home resource-->
+ <substitution>
+ <key>$calendar_home_items_initial_sync:</key>
+ <value>[-,$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
+ </substitution>
+
+ <!-- Sync collection extra items - use "-" to include the collection-->
+ <substitution>
+ <key>$calendar_sync_extra_items:</key>
+ <value>[-]</value>
+ </substitution>
+
+ <!-- Sync collection extra count - gets added to the totalcount value-->
+ <substitution>
+ <key>$calendar_sync_extra_count:</key>
+ <value>1</value> <!-- the request-uri resource is returned when no token passed-->
+ </substitution>
+
</ins><span class="cx"> <!-- server-to-server inbox-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$servertoserver:</key>
</span></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/server/serverinfo.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -286,6 +286,24 @@
</span><span class="cx"> <value>freebusy</value>
</span><span class="cx"> </substitution>
</span><span class="cx">
</span><ins>+ <!-- Sync home collection items - use "-" to include the home resource-->
+ <substitution>
+ <key>$calendar_home_items_initial_sync:</key>
+ <value>[-,$calendar:/,$tasks:/,$inbox:/,$outbox:/,$freebusy:,$notification:/]</value>
+ </substitution>
+
+ <!-- Sync collection extra items - use "-" to include the collection-->
+ <substitution>
+ <key>$calendar_sync_extra_items:</key>
+ <value>[-]</value>
+ </substitution>
+
+ <!-- Sync collection extra count - gets added to the totalcount value-->
+ <substitution>
+ <key>$calendar_sync_extra_count:</key>
+ <value>1</value> <!-- the request-uri resource is returned when no token passed-->
+ </substitution>
+
</ins><span class="cx"> <!-- server-to-server inbox-->
</span><span class="cx"> <substitution>
</span><span class="cx"> <key>$servertoserver:</key>
</span></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCalDAVsharingnotificationsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sharing-notification-sync.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><span class="cx"> <value>0</value>
</span><ins>+ <value>$calendar_sync_extra_count:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -123,6 +124,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>totalcount</name>
</span><span class="cx"> <value>0</value>
</span><ins>+ <value>$calendar_sync_extra_count:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -239,36 +241,12 @@
</span><span class="cx"> <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>shared/</value>
</del><ins>+ <name>ignoremissing</name>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
</del><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
</del><span class="cx"> <value>$notification:/</value>
</span><span class="cx"> <value>shared/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -300,35 +278,12 @@
</span><span class="cx"> <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <name>ignoremissing</name>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
</del><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
</del><span class="cx"> <value>$notification:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -466,6 +421,10 @@
</span><span class="cx"> <name>{DAV:}href</name>
</span><span class="cx"> <variable>$sharedcalendar:</variable>
</span><span class="cx"> </grabelement>
</span><ins>+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>basename($sharedcalendarbasename:)</variable>
+ </grabelement>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6' ignore='no'>
</span><span class="lines">@@ -479,17 +438,18 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>prefix</name>
- <value/>
</del><ins>+ <name>okhrefs</name>
+ <value>$calendar_home_items_initial_sync:</value>
+ <value>$sharedcalendarbasename:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>okhrefs</name>
- <value>$sharedcalendar:/</value>
</del><ins>+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -662,6 +622,10 @@
</span><span class="cx"> <name>{DAV:}href</name>
</span><span class="cx"> <variable>$sharedcalendar:</variable>
</span><span class="cx"> </grabelement>
</span><ins>+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>basename($sharedcalendarbasename:)</variable>
+ </grabelement>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6' ignore='no'>
</span><span class="lines">@@ -675,17 +639,18 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>prefix</name>
- <value/>
</del><ins>+ <name>okhrefs</name>
+ <value>$calendar_home_items_initial_sync:</value>
+ <value>$sharedcalendarbasename:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>okhrefs</name>
- <value>$sharedcalendar:/</value>
</del><ins>+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -896,6 +861,10 @@
</span><span class="cx"> <name>{DAV:}href</name>
</span><span class="cx"> <variable>$sharedcalendar:</variable>
</span><span class="cx"> </grabelement>
</span><ins>+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>basename($sharedcalendarbasename:)</variable>
+ </grabelement>
</ins><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6' ignore='no'>
</span><span class="lines">@@ -909,18 +878,19 @@
</span><span class="cx"> </header>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>prefix</name>
- <value/>
</del><ins>+ <name>okhrefs</name>
+ <value>$calendar_home_items_initial_sync:</value>
+ <value>$sharedcalendarbasename:/</value>
+ <value>$sharedcalendarbasename:/1.ics</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>okhrefs</name>
- <value>$sharedcalendar:/</value>
- <value>$sharedcalendar:/1.ics</value>
</del><ins>+ <name>badhrefs</name>
+ <value>$dropbox:/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <grabelement>
</span></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCalDAVsyncreportxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sync-report.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sync-report.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CalDAV/sync-report.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -257,17 +257,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -276,27 +269,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2' ignore='no'>
</span><span class="lines">@@ -316,17 +288,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -335,27 +300,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3' ignore='no'>
</span><span class="lines">@@ -375,17 +319,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -394,27 +331,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4' ignore='no'>
</span><span class="lines">@@ -434,17 +350,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -457,31 +366,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5' ignore='no'>
</span><span class="lines">@@ -501,17 +385,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -524,31 +401,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6' ignore='no'>
</span><span class="lines">@@ -568,17 +420,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -591,31 +436,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7' ignore='no'>
</span><span class="lines">@@ -635,6 +455,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -661,6 +482,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -687,6 +509,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -713,6 +536,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -739,6 +563,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -765,6 +590,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -813,6 +639,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -836,17 +663,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -855,27 +675,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3' ignore='no'>
</span><span class="lines">@@ -895,17 +694,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -918,31 +710,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4' ignore='no'>
</span><span class="lines">@@ -976,6 +743,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> <value>3.ics</value>
</span><span class="lines">@@ -1000,17 +768,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1019,27 +780,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7' ignore='no'>
</span><span class="lines">@@ -1059,17 +799,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -1083,32 +816,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar1/3.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8' ignore='no'>
</span><span class="lines">@@ -1138,6 +845,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1161,17 +869,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1180,27 +881,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='11' ignore='no'>
</span><span class="lines">@@ -1220,17 +900,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -1243,31 +916,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12' ignore='no'>
</span><span class="lines">@@ -1301,6 +949,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1324,17 +973,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1343,27 +985,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar2/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='15' ignore='no'>
</span><span class="lines">@@ -1383,17 +1004,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar1/1.ics</value>
</span><span class="cx"> <value>synccalendar1/2.ics</value>
</span><span class="lines">@@ -1406,31 +1020,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar1/</value>
- <value>synccalendar1/1.ics</value>
- <value>synccalendar1/2.ics</value>
- <value>synccalendar2/</value>
- <value>synccalendar2/1.ics</value>
- <value>synccalendar2/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="lines">@@ -1453,6 +1042,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1634,6 +1224,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1676,6 +1267,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> <value>3.ics</value>
</span><span class="lines">@@ -1715,6 +1307,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1757,6 +1350,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1791,6 +1385,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.ics</value>
</span><span class="cx"> <value>2.ics</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2058,17 +1653,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar3/1.ics</value>
</span><span class="cx"> <value>synccalendar3/2.ics</value>
</span><span class="lines">@@ -2081,31 +1669,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar3/1.ics</value>
- <value>synccalendar3/2.ics</value>
- <value>synccalendar4/</value>
- <value>synccalendar4/1.ics</value>
- <value>synccalendar4/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -2293,17 +1856,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/5.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar3/1.ics</value>
</span><span class="cx"> <value>synccalendar3/2.ics</value>
</span><span class="lines">@@ -2317,31 +1873,6 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><del>- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar3/1.ics</value>
- <value>synccalendar3/2.ics</value>
- <value>synccalendar4/</value>
- <value>synccalendar4/1.ics</value>
- <value>synccalendar4/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
- <verify>
</del><span class="cx"> <callback>propfindItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>ignore</name>
</span><span class="lines">@@ -2574,17 +2105,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar3/1.ics</value>
</span><span class="cx"> <value>synccalendar3/2.ics</value>
</span><span class="lines">@@ -2597,31 +2121,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar3/1.ics</value>
- <value>synccalendar3/2.ics</value>
- <value>synccalendar4/</value>
- <value>synccalendar4/1.ics</value>
- <value>synccalendar4/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -2790,17 +2289,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2809,27 +2301,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -3007,17 +2478,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/14.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3027,27 +2491,6 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><del>- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
- <verify>
</del><span class="cx"> <callback>propfindItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>ignore</name>
</span><span class="lines">@@ -3270,17 +2713,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3289,27 +2725,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -3427,6 +2842,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -3476,17 +2892,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/2.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> <value>synccalendar4/1.ics</value>
</span><span class="lines">@@ -3497,29 +2906,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- <value>synccalendar4/1.ics</value>
- <value>synccalendar4/2.ics</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -3634,17 +3020,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3653,27 +3032,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -3789,17 +3147,10 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/8.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3808,27 +3159,6 @@
</span><span class="cx"> <value>$dropbox:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><del>- <verify>
- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
- <value>synccalendar3/</value>
- <value>synccalendar4/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
</del><span class="cx"> <grabelement>
</span><span class="cx"> <name>/{DAV:}multistatus/{DAV:}sync-token</name>
</span><span class="cx"> <variable>$synctoken1:</variable>
</span><span class="lines">@@ -3951,18 +3281,12 @@
</span><span class="cx"> <filepath>Resource/CalDAV/reports/sync/22.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><del>- <exclude-feature>
- <feature>split-calendars</feature>
- </exclude-feature>
</del><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><del>- <name>ignoremissing</name>
- </arg>
- <arg>
</del><span class="cx"> <name>okhrefs</name>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
</del><ins>+ <value>$calendar_home_items_initial_sync:</value>
+ <value>synccalendar3/</value>
+ <value>synccalendar4/</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</span><span class="lines">@@ -3970,26 +3294,6 @@
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> <verify>
</span><del>- <require-feature>
- <feature>split-calendars</feature>
- </require-feature>
- <callback>multistatusItems</callback>
- <arg>
- <name>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- </arg>
- <arg>
- <name>badhrefs</name>
- <value>$dropbox:/</value>
- </arg>
- </verify>
- <verify>
</del><span class="cx"> <callback>dataString</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>contains</name>
</span></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sharing-sync.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sharing-sync.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sharing-sync.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -1102,6 +1102,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1128,6 +1129,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1154,6 +1156,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1180,6 +1183,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1210,6 +1214,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1240,6 +1245,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1267,6 +1273,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1293,6 +1300,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1319,6 +1327,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1345,6 +1354,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1371,6 +1381,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1397,6 +1408,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1445,6 +1457,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1471,6 +1484,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1497,6 +1511,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1538,6 +1553,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -1565,6 +1581,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1591,6 +1608,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1629,6 +1647,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1655,6 +1674,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1681,6 +1701,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1722,6 +1743,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1748,6 +1770,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid2:/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1774,6 +1797,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1804,6 +1828,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1985,6 +2010,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2027,6 +2053,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -2066,6 +2093,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2108,6 +2136,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2142,6 +2171,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2500,6 +2530,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid3:/1.vcf</value>
</span><span class="lines">@@ -2699,6 +2730,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid3:/1.vcf</value>
</span><span class="lines">@@ -2937,6 +2969,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid3:/1.vcf</value>
</span><span class="lines">@@ -3226,6 +3259,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid4:/</value>
</span><span class="lines">@@ -3411,6 +3445,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid4:/</value>
</span><span class="lines">@@ -3635,6 +3670,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid4:/</value>
</span><span class="lines">@@ -3847,6 +3883,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid4:/</value>
</span><span class="lines">@@ -3971,6 +4008,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> <value>$userid3:/</value>
</span><span class="cx"> <value>$userid4:/</value>
</span></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devscriptstestsCardDAVsyncreportxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sync-report.xml (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sync-report.xml 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/scripts/tests/CardDAV/sync-report.xml 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -219,6 +220,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -244,6 +246,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -282,6 +285,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -309,6 +313,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -334,6 +339,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -369,6 +375,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -395,6 +402,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -420,6 +428,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -458,6 +467,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -484,6 +494,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>$addressbook:/</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -509,6 +520,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -536,6 +548,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -717,6 +730,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -759,6 +773,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> <value>3.vcf</value>
</span><span class="lines">@@ -798,6 +813,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -840,6 +856,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -874,6 +891,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><span class="cx"> <value>1.vcf</value>
</span><span class="cx"> <value>2.vcf</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1116,6 +1134,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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><span class="lines">@@ -1311,6 +1330,7 @@
</span><span class="cx"> <callback>multistatusItems</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_sync_extra_items:</value>
</ins><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></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devsrcutilspy"></a>
<div class="addfile"><h4>Added: CalDAVTester/branches/release/CalDAVTester-5.3-dev/src/utils.py (0 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/src/utils.py (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/src/utils.py 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+def processHrefSubstitutions(hrefs, prefix):
+ """
+ Process the list of hrefs by prepending the supplied prefix. If the href is a
+ list of hrefs, then prefix each item in the list and expand into the results. The
+ empty string is represented by a single "-" in an href list.
+
+ @param hrefs: list of URIs to process
+ @type hrefs: L{list} of L{str}
+ @param prefix: prefix to apply to each URI
+ @type prefix: L{str}
+
+ @return: resulting list of URIs
+ @rtype: L{list} of L{str}
+ """
+
+ results = []
+ for href in hrefs:
+ if href.startswith("["):
+ children = href[1:-1].split(",")
+ results.extend([(prefix + (i if i != "-" else "")).rstrip("/") for i in children if i])
+ else:
+ results.append((prefix + href).rstrip("/"))
+
+ return results
</ins></span></pre></div>
<a id="CalDAVTesterbranchesreleaseCalDAVTester53devverifiersmultistatusItemspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/branches/release/CalDAVTester-5.3-dev/verifiers/multistatusItems.py (15175 => 15176)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/branches/release/CalDAVTester-5.3-dev/verifiers/multistatusItems.py 2015-10-09 03:18:36 UTC (rev 15175)
+++ CalDAVTester/branches/release/CalDAVTester-5.3-dev/verifiers/multistatusItems.py 2015-10-13 15:58:37 UTC (rev 15176)
</span><span class="lines">@@ -13,15 +13,16 @@
</span><span class="cx"> # See the License for the specific language governing permissions and
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><del>-import urllib
</del><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> Verifier that checks a multistatus response to make sure that the specified hrefs
</span><span class="cx"> are returned with appropriate status codes.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+from src.utils import processHrefSubstitutions
</ins><span class="cx"> from xml.etree.ElementTree import ElementTree
</span><span class="cx"> from StringIO import StringIO
</span><ins>+import urllib
</ins><span class="cx">
</span><span class="cx"> class Verifier(object):
</span><span class="cx">
</span><span class="lines">@@ -47,12 +48,9 @@
</span><span class="cx"> prefix = prefix[0] if prefix[0] != "-" else ""
</span><span class="cx"> else:
</span><span class="cx"> prefix = uri
</span><del>- okhrefs = [prefix + i for i in okhrefs]
- nohrefs = [prefix + i for i in nohrefs]
- badhrefs = [prefix + i for i in badhrefs]
- for k, v in args.items():
- v = [prefix + i for i in v]
- args[k] = v
</del><ins>+ okhrefs = processHrefSubstitutions(okhrefs, prefix)
+ nohrefs = processHrefSubstitutions(nohrefs, prefix)
+ badhrefs = processHrefSubstitutions(badhrefs, prefix)
</ins><span class="cx"> count = [int(eval(i)) for i in count]
</span><span class="cx"> totalcount = [int(eval(i)) for i in totalcount]
</span><span class="cx"> responsecount = [int(eval(i)) for i in responsecount]
</span><span class="lines">@@ -86,7 +84,7 @@
</span><span class="cx"> href = response.findall("{DAV:}href")
</span><span class="cx"> if href is None or len(href) != 1:
</span><span class="cx"> return False, " Incorrect/missing DAV:Href element in response"
</span><del>- href = urllib.unquote(href[0].text)
</del><ins>+ href = urllib.unquote(href[0].text).rstrip("/")
</ins><span class="cx">
</span><span class="cx"> # Verify status
</span><span class="cx"> status = response.findall("{DAV:}status")
</span><span class="lines">@@ -130,7 +128,10 @@
</span><span class="cx"> return result, resulttxt
</span><span class="cx">
</span><span class="cx"> # Check for total count
</span><del>- if len(totalcount) == 1:
</del><ins>+ if len(totalcount) > 0:
+ # Add the 2nd value to the 1st if it exists
+ if len(totalcount) == 2:
+ totalcount[0] += totalcount[1]
</ins><span class="cx"> if len(ok_result_set) != totalcount[0]:
</span><span class="cx"> result = False
</span><span class="cx"> resulttxt += " %d items returned, but %d items expected" % (len(ok_result_set), totalcount[0],)
</span></span></pre>
</div>
</div>
</body>
</html>