<!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>[14406] CalDAVTester/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14406">14406</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 13:26:30 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Provide substitution variables for home collection default child items for use in sync REPORTs which in the future will return the request-URI resource too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsharingnotificationsyncxml">CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVsyncreportxml">CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml</a></li>
<li><a href="#CalDAVTestertrunkverifiersmultistatusItemspy">CalDAVTester/trunk/verifiers/multistatusItems.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrcutilspy">CalDAVTester/trunk/src/utils.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -303,6 +303,18 @@
</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>
+
</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="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -301,6 +301,18 @@
</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>
+
</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="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -301,6 +301,18 @@
</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>
+
</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="CalDAVTestertrunkscriptstestsCalDAVsharingnotificationsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -461,44 +461,17 @@
</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><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>$sharedcalendarbasename:/</value>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</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>$sharedcalendarbasename:/</value>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</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>$synctoken2:</variable>
</span><span class="lines">@@ -711,44 +684,17 @@
</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><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>$sharedcalendarbasename:/</value>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</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>$sharedcalendarbasename:/</value>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</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>$synctoken2:</variable>
</span><span class="lines">@@ -999,46 +945,18 @@
</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><span class="cx"> <name>okhrefs</name>
</span><ins>+ <value>$calendar_home_items_initial_sync:</value>
</ins><span class="cx"> <value>$sharedcalendarbasename:/</value>
</span><span class="cx"> <value>$sharedcalendarbasename:/1.ics</value>
</span><del>- <value>$calendar:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</value>
</del><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>badhrefs</name>
</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>$sharedcalendarbasename:/</value>
- <value>$sharedcalendarbasename:/1.ics</value>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</value>
- <value>$freebusy:</value>
- <value>$notification:/</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>$synctoken2:</variable>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVsyncreportxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -260,18 +260,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -280,28 +272,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -321,18 +291,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -341,28 +303,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -382,18 +322,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -402,28 +334,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -443,18 +353,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><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>
</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">@@ -467,32 +369,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -512,18 +388,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><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>
</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">@@ -536,32 +404,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -581,18 +423,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><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>
</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">@@ -605,32 +439,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -650,6 +458,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">@@ -676,6 +485,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">@@ -702,6 +512,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">@@ -728,6 +539,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">@@ -754,6 +566,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">@@ -780,6 +593,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">@@ -828,6 +642,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">@@ -851,18 +666,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -871,28 +678,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -912,18 +697,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><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>
</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">@@ -936,32 +713,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -995,6 +746,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">@@ -1019,18 +771,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1039,28 +783,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -1080,18 +802,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><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>
</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">@@ -1105,33 +819,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -1161,6 +848,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">@@ -1184,18 +872,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1204,28 +884,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -1245,18 +903,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><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>
</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">@@ -1269,32 +919,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -1328,6 +952,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">@@ -1351,18 +976,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><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>
</ins><span class="cx"> <value>synccalendar1/</value>
</span><span class="cx"> <value>synccalendar2/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -1371,28 +988,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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'>
</span><span class="lines">@@ -1412,18 +1007,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><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>
</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">@@ -1436,32 +1023,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -1484,6 +1045,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">@@ -1665,6 +1227,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">@@ -1707,6 +1270,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">@@ -1746,6 +1310,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">@@ -1788,6 +1353,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">@@ -1822,6 +1388,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">@@ -2089,18 +1656,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><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>
</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">@@ -2113,32 +1672,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -2326,18 +1859,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><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>
</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">@@ -2351,32 +1876,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>
- <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">@@ -2609,18 +2108,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><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>
</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">@@ -2633,32 +2124,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -2827,18 +2292,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><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>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -2847,28 +2304,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -3046,18 +2481,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><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>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3067,28 +2494,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>
- <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">@@ -3311,18 +2716,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><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>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3331,28 +2728,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -3519,18 +2894,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><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>
</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">@@ -3541,30 +2908,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -3679,18 +3022,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><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>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3699,28 +3034,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -3836,18 +3149,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><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>
</ins><span class="cx"> <value>synccalendar3/</value>
</span><span class="cx"> <value>synccalendar4/</value>
</span><span class="cx"> </arg>
</span><span class="lines">@@ -3856,28 +3161,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>ignoremissing</name>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value>$calendar:/</value>
- <value>$tasks:/</value>
- <value>$inbox:/</value>
- <value>$outbox:/</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">@@ -4001,18 +3284,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">@@ -4020,26 +3297,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="CalDAVTestertrunksrcutilspy"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/src/utils.py (0 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/utils.py (rev 0)
+++ CalDAVTester/trunk/src/utils.py 2015-02-12 21:26:30 UTC (rev 14406)
</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="CalDAVTestertrunkverifiersmultistatusItemspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/multistatusItems.py (14405 => 14406)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-12 20:39:35 UTC (rev 14405)
+++ CalDAVTester/trunk/verifiers/multistatusItems.py 2015-02-12 21:26:30 UTC (rev 14406)
</span><span class="lines">@@ -19,6 +19,7 @@
</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.cElementTree import ElementTree
</span><span class="cx"> from StringIO import StringIO
</span><span class="cx"> import urllib
</span><span class="lines">@@ -47,9 +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).rstrip("/") for i in okhrefs]
- nohrefs = [(prefix + i).rstrip("/") for i in nohrefs]
- badhrefs = [(prefix + i).rstrip("/") for i in badhrefs]
</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></pre>
</div>
</div>
</body>
</html>