<!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>[12207] CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12207">12207</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-23 20:09:55 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean-up test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml (12206 => 12207)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2013-12-24 01:07:06 UTC (rev 12206)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2013-12-24 04:09:55 UTC (rev 12207)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> </start>
</span><span class="cx">
</span><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><del>- <test-suite name='shared addressbook' ignore='no'>
- <test name='1a' ignore='no'>
</del><ins>+ <test-suite name='shared addressbook'>
+ <test name='1a'>
</ins><span class="cx"> <description>Initial sync tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -108,8 +108,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>POST invitation</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -141,11 +141,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Check Sharee notification collection</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>Sharee replies ACCEPTED</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5a' ignore='no'>
</del><ins>+ <test name='5a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -215,8 +215,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -256,8 +256,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -277,8 +277,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -294,8 +294,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5f-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5f-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -334,8 +334,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><span class="cx"> <description>Sharee creates vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/1.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -365,9 +365,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7a' ignore='no'>
</del><ins>+ <test name='7a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -387,8 +387,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='7b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -409,8 +409,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='7c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -430,8 +430,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -451,8 +451,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -473,8 +473,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><span class="cx"> <description>Sharer changes vcard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/1.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -508,9 +508,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9a' ignore='no'>
</del><ins>+ <test name='9a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -530,8 +530,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -552,8 +552,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -573,8 +573,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -594,8 +594,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -616,8 +616,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><span class="cx"> <description>Sharee deletes vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/1.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -647,9 +647,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11a' ignore='no'>
</del><ins>+ <test name='11a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -669,8 +669,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -694,8 +694,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -715,8 +715,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -736,8 +736,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -761,8 +761,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><span class="cx"> <description>Sharer unshares</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -796,9 +796,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13a' ignore='no'>
</del><ins>+ <test name='13a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -818,8 +818,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -839,8 +839,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -856,8 +856,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -877,8 +877,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -898,8 +898,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -918,8 +918,8 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><del>- <test-suite name='one shared group' ignore='no'>
- <test name='0' ignore='no'>
</del><ins>+ <test-suite name='one shared group'>
+ <test name='0'>
</ins><span class="cx"> <description>clean up old data</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="lines">@@ -928,7 +928,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <description>create empty group</description>
</del><ins>+ <!-- create empty group -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/3.vcf</ruri>
</span><span class="lines">@@ -938,9 +938,9 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1a' ignore='no'>
</del><ins>+ <test name='1a'>
</ins><span class="cx"> <description>Initial sync tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -956,8 +956,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -973,8 +973,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -990,8 +990,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1007,8 +1007,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>user1 POSTs invitation</description>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -1040,11 +1040,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Check user2 notification collection and get invite uid</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -1055,7 +1055,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>user2 replies ACCEPTED and deletes notification</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions="yes">
</span><span class="lines">@@ -1066,7 +1066,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$notificationpath2:/$inviteuid:</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -1074,9 +1074,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5a' ignore='no'>
</del><ins>+ <test name='5a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1096,8 +1096,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1117,8 +1117,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1137,8 +1137,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1158,8 +1158,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1175,8 +1175,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1198,8 +1198,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5f-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5f-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1215,8 +1215,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1238,7 +1238,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><span class="cx"> <description>Sharee creates vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1250,9 +1250,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7a' ignore='no'>
</del><ins>+ <test name='7a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1272,8 +1272,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='7b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1295,8 +1295,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='7c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1317,8 +1317,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1338,8 +1338,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1361,8 +1361,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='7f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1385,7 +1385,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><span class="cx"> <description>Sharer changes vcard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/1.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1397,9 +1397,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9a' ignore='no'>
</del><ins>+ <test name='9a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1419,8 +1419,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1441,8 +1441,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1462,8 +1462,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1483,8 +1483,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1505,8 +1505,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1528,7 +1528,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><span class="cx"> <description>Sharer adds unshared vCard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/2.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1540,9 +1540,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11a' ignore='no'>
</del><ins>+ <test name='11a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1562,8 +1562,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1584,8 +1584,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1605,8 +1605,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1625,8 +1625,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1645,8 +1645,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1667,7 +1667,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><span class="cx"> <description>Sharer changes unshared vCard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/2.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -1679,9 +1679,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13a' ignore='no'>
</del><ins>+ <test name='13a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1701,8 +1701,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1723,8 +1723,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1744,8 +1744,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1764,8 +1764,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1784,8 +1784,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1806,7 +1806,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='14'>
</span><span class="cx"> <description>Sharer changes unshared vCard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath1:/2.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -1814,9 +1814,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15a' ignore='no'>
</del><ins>+ <test name='15a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1836,8 +1836,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='15b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1861,8 +1861,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='15c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1882,8 +1882,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='15d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1902,8 +1902,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='15e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1922,8 +1922,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='15f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1944,7 +1944,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='16'>
</span><span class="cx"> <description>Sharee deletes vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -1952,9 +1952,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17a' ignore='no'>
</del><ins>+ <test name='17a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -1974,8 +1974,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='17b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2000,8 +2000,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='17c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2025,8 +2025,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='17d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2046,8 +2046,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='17e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2072,8 +2072,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='17f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2099,7 +2099,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='18'>
</span><span class="cx"> <description>Sharer unshares</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath1:/3.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2111,9 +2111,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19a' ignore='no'>
</del><ins>+ <test name='19a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2133,8 +2133,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='19b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2154,8 +2154,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='19c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2171,8 +2171,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='19d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2192,8 +2192,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='19e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2213,8 +2213,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='19f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='19f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2233,8 +2233,8 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><del>- <test-suite name='two shared groups' ignore='no'>
- <test name='0' ignore='no'>
</del><ins>+ <test-suite name='two shared groups'>
+ <test name='0'>
</ins><span class="cx"> <description>clean up old data</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="lines">@@ -2243,7 +2243,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <description>create users groups</description>
</del><ins>+ <!-- create users groups -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/1.vcf</ruri>
</span><span class="lines">@@ -2311,9 +2311,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1a' ignore='no'>
</del><ins>+ <test name='1a'>
</ins><span class="cx"> <description>Initial sync tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2329,8 +2329,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2346,8 +2346,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='1c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2363,8 +2363,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2380,8 +2380,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='1e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2397,7 +2397,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>user1 POSTs invitation</description>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -2413,11 +2413,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Check user2 notification collection and get invite uid</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -2428,7 +2428,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><span class="cx"> <description>user2 replies ACCEPTED and deletes notification</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions="yes">
</span><span class="lines">@@ -2439,7 +2439,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$notificationpath2:/$inviteuid:</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -2447,9 +2447,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5a' ignore='no'>
</del><ins>+ <test name='5a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2469,8 +2469,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2490,8 +2490,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='5c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2510,8 +2510,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2531,8 +2531,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2548,8 +2548,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2573,8 +2573,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='5f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2596,7 +2596,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>user1 POSTs invitation</description>
</span><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="lines">@@ -2612,11 +2612,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><span class="cx"> <description>Check user2 notification collection and get invite uid</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>GETNEW</method>
</span><span class="cx"> <ruri>$notificationpath2:/</ruri>
</span><span class="cx"> <grabelement>
</span><span class="lines">@@ -2627,7 +2627,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><span class="cx"> <description>user2 replies ACCEPTED and deletes notification</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions="yes">
</span><span class="lines">@@ -2638,7 +2638,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$notificationpath2:/$inviteuid:</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -2646,9 +2646,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9a' ignore='no'>
</del><ins>+ <test name='9a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2668,8 +2668,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2689,8 +2689,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='9c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2709,8 +2709,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2730,8 +2730,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9e-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9e-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2747,8 +2747,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2775,8 +2775,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9f-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9f-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2792,8 +2792,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='9f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2821,7 +2821,7 @@
</span><span class="cx">
</span><span class="cx"> <test name='10'>
</span><span class="cx"> <description>Sharee creates vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/3.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2833,9 +2833,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11a' ignore='no'>
</del><ins>+ <test name='11a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2855,8 +2855,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2879,8 +2879,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='11c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2902,8 +2902,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2923,8 +2923,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2947,8 +2947,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='11f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -2972,7 +2972,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='12'>
</span><span class="cx"> <description>Sharer changes vcard</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/3.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -2984,9 +2984,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13a' ignore='no'>
</del><ins>+ <test name='13a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3006,8 +3006,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3028,8 +3028,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='13c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3049,8 +3049,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3070,8 +3070,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3092,8 +3092,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='13f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3115,7 +3115,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='13'>
</span><span class="cx"> <description>Sharee deletes vcard</description>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/3.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -3123,9 +3123,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14a' ignore='no'>
</del><ins>+ <test name='14a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3145,8 +3145,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='14b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3172,8 +3172,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='14c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3198,8 +3198,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='14d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3219,8 +3219,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='14e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3246,8 +3246,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='14f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3274,7 +3274,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='15'>
</span><span class="cx"> <description>Sharer unshares first group</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath1:/6.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -3286,9 +3286,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16a' ignore='no'>
</del><ins>+ <test name='16a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3308,8 +3308,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='16b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3329,8 +3329,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='16c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3346,8 +3346,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='16d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3367,8 +3367,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16e-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='16e-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3384,8 +3384,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='16e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3409,8 +3409,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16f-' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='16f-'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3426,8 +3426,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='16f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3451,7 +3451,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='17'>
</span><span class="cx"> <description>Sharer unshares 2nd group</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath1:/7.vcf</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -3463,9 +3463,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18a' ignore='no'>
</del><ins>+ <test name='18a'>
</ins><span class="cx"> <description>Updated tokens</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3485,8 +3485,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18b' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='18b'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3506,8 +3506,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18c' ignore='no'>
- <request print-response='no'>
</del><ins>+ <test name='18c'>
+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3523,8 +3523,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18d' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='18d'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3544,8 +3544,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18e' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='18e'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3565,8 +3565,8 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18f' ignore='no'>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <test name='18f'>
+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome2:/$userguid1:/</ruri>
</span><span class="cx"> <data substitutions='yes'>
</span><span class="lines">@@ -3587,8 +3587,8 @@
</span><span class="cx"> <!-- test suites below are similar to those in ../CalDAV/sync-report.xml but
</span><span class="cx"> use shared address books instead of calendars -->
</span><span class="cx">
</span><del>- <test-suite name='support-report-set/sync-token property' ignore='no'>
- <test name='0' ignore='no'>
</del><ins>+ <test-suite name='support-report-set/sync-token property'>
+ <test name='0'>
</ins><span class="cx"> <description>clean up old data</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="lines">@@ -3599,7 +3599,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user1 address book</description>
</del><ins>+ <!-- add 2 vcards to user1 address book -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/1.vcf</ruri>
</span><span class="lines">@@ -3617,8 +3617,8 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>share user2 address book with user1</description>
- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- share user2 address book with user1 -->
+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/</ruri>
</span><span class="lines">@@ -3628,7 +3628,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -3642,7 +3642,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -3656,7 +3656,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user2 address book</description>
</del><ins>+ <!-- add 2 vcards to user2 address book -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -3674,7 +3674,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>Not on addressbooks</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -3707,7 +3707,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>On addressbook-home</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -3768,7 +3768,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>On addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -3799,7 +3799,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>On shared addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="lines">@@ -3846,13 +3846,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - sync-level' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - sync-level'>
+ <test name='1'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:1, depth:0</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -3873,12 +3873,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:1, depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -3899,12 +3899,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:1, depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -3925,12 +3925,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:0</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -3956,12 +3956,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -3987,12 +3987,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4018,9 +4018,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7' ignore='no'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <description>sync-level:1, depth:0</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4041,12 +4041,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='8' ignore='no'>
</del><ins>+ <test name='8'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:1, depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4067,12 +4067,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9' ignore='no'>
</del><ins>+ <test name='9'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:1, depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4093,12 +4093,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='10' ignore='no'>
</del><ins>+ <test name='10'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:0</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4119,12 +4119,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11' ignore='no'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4145,12 +4145,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12' ignore='no'>
</del><ins>+ <test name='12'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>sync-level:infinity, depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4171,9 +4171,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13' ignore='no'>
</del><ins>+ <test name='13'>
</ins><span class="cx"> <description>Bad sync-level</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4195,10 +4195,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - empty token - no props' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - empty token - no props'>
+ <test name='1'>
</ins><span class="cx"> <description>initial query - addressbook depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4219,12 +4219,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>initial query - home depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4245,12 +4245,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>initial query - home depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4276,7 +4276,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>add new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4290,9 +4290,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>new resource - addressbook depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4314,12 +4314,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>new resource - home depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4340,12 +4340,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7' ignore='no'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>new resource - home depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4372,7 +4372,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='8' ignore='no'>
</del><ins>+ <test name='8'>
</ins><span class="cx"> <description>remove new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -4382,9 +4382,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='9' ignore='no'>
</del><ins>+ <test name='9'>
</ins><span class="cx"> <description>remove new resource - addressbook depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4405,12 +4405,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='10' ignore='no'>
</del><ins>+ <test name='10'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>remove new resource - home depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4431,12 +4431,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11' ignore='no'>
</del><ins>+ <test name='11'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>remove new resource - home depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4462,7 +4462,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12' ignore='no'>
</del><ins>+ <test name='12'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4476,9 +4476,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='13' ignore='no'>
</del><ins>+ <test name='13'>
</ins><span class="cx"> <description>changed resource - addressbook depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4499,12 +4499,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14' ignore='no'>
</del><ins>+ <test name='14'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>changed resource - home depth:1</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4525,12 +4525,12 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15' ignore='no'>
</del><ins>+ <test name='15'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><span class="cx"> <description>changed resource - home depth:infinity</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4558,10 +4558,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - no props - addressbook depth:1' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - no props - addressbook depth:1'>
+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4586,7 +4586,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4599,7 +4599,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4623,7 +4623,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -4632,7 +4632,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4652,9 +4652,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4678,7 +4678,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4691,7 +4691,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4715,9 +4715,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4739,10 +4739,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - empty token - props' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - empty token - props'>
+ <test name='1'>
</ins><span class="cx"> <description>initial query</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4771,7 +4771,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4784,7 +4784,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4814,7 +4814,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>remove resource new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -4823,7 +4823,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4852,7 +4852,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4865,7 +4865,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4896,10 +4896,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - props' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - props'>
+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4932,7 +4932,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -4945,7 +4945,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -4977,7 +4977,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -4986,7 +4986,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5006,9 +5006,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5035,7 +5035,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -5048,7 +5048,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5080,9 +5080,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5112,13 +5112,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - no props - home depth:infinity' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - no props - home depth:infinity'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>Initialize</description>
</span><del>- <description>clear user1 address book and unshare user2 address book</description>
</del><ins>+ <!-- clear user1 address book and unshare user2 address book -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="lines">@@ -5126,7 +5126,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
</del><ins>+ <request user="$userid2:" pswd="$pswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath2:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5141,8 +5141,8 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>share user3 address book with user1</description>
- <description>user3 POSTs invitation</description>
</del><ins>+ <!-- share user3 address book with user1 -->
+ <!-- user3 POSTs invitation -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath3:/</ruri>
</span><span class="lines">@@ -5152,7 +5152,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -5166,7 +5166,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -5180,7 +5180,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user3 address book</description>
</del><ins>+ <!-- add 2 vcards to user3 address book -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath3:/1.vcf</ruri>
</span><span class="lines">@@ -5198,8 +5198,8 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>share user4 address book with user1</description>
- <description>user4 POSTs invitation</description>
</del><ins>+ <!-- share user4 address book with user1 -->
+ <!-- user4 POSTs invitation -->
</ins><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath4:/</ruri>
</span><span class="lines">@@ -5209,7 +5209,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -5223,7 +5223,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -5237,7 +5237,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user4 address book</description>
</del><ins>+ <!-- add 2 vcards to user4 address book -->
</ins><span class="cx"> <request user="$userid4:" pswd="$pswd4:">
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath4:/1.vcf</ruri>
</span><span class="lines">@@ -5255,9 +5255,9 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5289,7 +5289,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -5302,7 +5302,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5327,7 +5327,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -5336,7 +5336,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5360,9 +5360,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5390,7 +5390,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -5403,7 +5403,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5428,9 +5428,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7' ignore='no'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5452,13 +5452,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - props - home depth:infinity' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - props - home depth:infinity'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5498,7 +5498,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -5511,7 +5511,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5544,7 +5544,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -5553,7 +5553,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5577,9 +5577,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5614,7 +5614,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -5627,7 +5627,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5660,9 +5660,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5696,9 +5696,9 @@
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5728,23 +5728,23 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>remove resource then addressbook</description>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath3:/2.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath3:/1.vcf</ruri>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request user="$userid3:" pswd="$pswd3:" print-response='no'>
</del><ins>+ <request user="$userid3:" pswd="$pswd3:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$addressbookpath3:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -5758,7 +5758,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5782,10 +5782,10 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>add addressbook - test last sync</description>
</span><del>- <description>share user3 address book with user1</description>
- <description>user3 POSTs invitation</description>
</del><ins>+ <!-- share user3 address book with user1 -->
+ <!-- user3 POSTs invitation -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath3:/</ruri>
</span><span class="lines">@@ -5795,7 +5795,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -5809,7 +5809,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -5822,7 +5822,7 @@
</span><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5842,9 +5842,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>add addressbook - test previous sync</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -5870,11 +5870,11 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - no props - home depth:1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - no props - home depth:1'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>Initialize</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="lines">@@ -5885,8 +5885,8 @@
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>share user3 address book with user1</description>
- <description>user3 POSTs invitation</description>
</del><ins>+ <!-- share user3 address book with user1 -->
+ <!-- user3 POSTs invitation -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath3:/</ruri>
</span><span class="lines">@@ -5896,7 +5896,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -5910,7 +5910,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -5924,7 +5924,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user3 address book</description>
</del><ins>+ <!-- add 2 vcards to user3 address book -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:">
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath3:/1.vcf</ruri>
</span><span class="lines">@@ -5942,8 +5942,8 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>share user4 address book with user1</description>
- <description>user4 POSTs invitation</description>
</del><ins>+ <!-- share user4 address book with user1 -->
+ <!-- user4 POSTs invitation -->
</ins><span class="cx"> <request user="$userid4:" pswd="$pswd4:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath4:/</ruri>
</span><span class="lines">@@ -5953,7 +5953,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -5967,7 +5967,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -5981,7 +5981,7 @@
</span><span class="cx"> <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>add 2 vcards to user4 address book</description>
</del><ins>+ <!-- add 2 vcards to user4 address book -->
</ins><span class="cx"> <request user="$userid4:" pswd="$pswd4:">
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$addressbookpath4:/1.vcf</ruri>
</span><span class="lines">@@ -5999,9 +5999,9 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6027,7 +6027,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -6040,7 +6040,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6064,7 +6064,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -6073,7 +6073,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6093,9 +6093,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6119,7 +6119,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -6132,7 +6132,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6156,9 +6156,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7' ignore='no'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6180,13 +6180,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - props - home depth:1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - props - home depth:1'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6220,7 +6220,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>new resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -6233,7 +6233,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6265,7 +6265,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>remove resource (treated as new)</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -6274,7 +6274,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6294,9 +6294,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4' ignore='no'>
</del><ins>+ <test name='4'>
</ins><span class="cx"> <description>remove resource (treated as old)</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6327,7 +6327,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>changed resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PUT</method>
</span><span class="lines">@@ -6340,7 +6340,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6372,9 +6372,9 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>no change</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6404,13 +6404,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - diff token - delete/create addressbook - home depth:1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - diff token - delete/create addressbook - home depth:1'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6436,7 +6436,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>remove resource then addressbook</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>DELETE</method>
</span><span class="lines">@@ -6459,7 +6459,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6483,10 +6483,10 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='-3' ignore='no'>
</del><ins>+ <test name='-3'>
</ins><span class="cx"> <description>add addressbook - test last sync</description>
</span><del>- <description>share user3 address book with user1</description>
- <description>user3 POSTs invitation</description>
</del><ins>+ <!-- share user3 address book with user1 -->
+ <!-- user3 POSTs invitation -->
</ins><span class="cx"> <request user="$userid3:" pswd="$pswd3:" print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath3:/</ruri>
</span><span class="lines">@@ -6496,7 +6496,7 @@
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -6510,7 +6510,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx">
</span><del>- <description>user1 replies ACCEPTED and deletes inviteUID from notification collection</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
</ins><span class="cx"> <request print-response="no">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -6525,7 +6525,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3' ignore='yes'>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6547,7 +6547,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4' ignore='yes'>
</span><span class="cx"> <description>add addressbook - test previous sync</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6569,10 +6569,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='simple reports - valid token' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='simple reports - valid token'>
+ <test name='1'>
</ins><span class="cx"> <description>initial query</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookpath1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6594,13 +6594,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='addressbook webdav property change - home depth:infinity' ignore='no'>
</del><ins>+ <test-suite name='addressbook webdav property change - home depth:infinity'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6630,7 +6630,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="lines">@@ -6643,7 +6643,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6674,7 +6674,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="lines">@@ -6687,7 +6687,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6720,13 +6720,13 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='addressbook webdav property change - home depth:1' ignore='no'>
</del><ins>+ <test-suite name='addressbook webdav property change - home depth:1'>
</ins><span class="cx"> <require-feature>
</span><span class="cx"> <feature>sync-report-home</feature>
</span><span class="cx"> </require-feature>
</span><del>- <test name='1' ignore='no'>
</del><ins>+ <test name='1'>
</ins><span class="cx"> <description>initial query - grab token</description>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6752,7 +6752,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>Change a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="lines">@@ -6765,7 +6765,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span><span class="lines">@@ -6796,7 +6796,7 @@
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='3' ignore='no'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>Remove a property</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>PROPPATCH</method>
</span><span class="lines">@@ -6809,7 +6809,7 @@
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><del>- <request print-response='no'>
</del><ins>+ <request>
</ins><span class="cx"> <method>REPORT</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="cx"> <header>
</span></span></pre>
</div>
</div>
</body>
</html>