<!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>[12019] CalDAVTester/trunk/scripts/tests/CardDAV</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/12019">12019</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 11:17:08 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks for sharing-in-the-store.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingaccessxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingputxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingunsharexml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingaccessxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml (12018 => 12019)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml        2013-12-02 22:01:35 UTC (rev 12018)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml        2013-12-03 19:17:08 UTC (rev 12019)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">         </require-feature>
</span><span class="cx">
</span><span class="cx">         <start>
</span><del>-                <description>clean up old data</description>
</del><ins>+                <!-- clean up old data -->
</ins><span class="cx">                 <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx">                         <method>DELETEALL</method>
</span><span class="cx">                         <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                         <ruri>$notificationpath2:/</ruri>
</span><span class="cx">                 </request>
</span><span class="cx">
</span><del>-                <description>add 5 persons and 2 groups to user2 address book</description>
</del><ins>+                <!-- add 5 persons and 2 groups 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">@@ -104,7 +104,7 @@
</span><span class="cx">                                 <ruri>$addressbookhome1:/</ruri>
</span><span class="cx">                                 <ruri>$notificationpath1:/</ruri>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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">@@ -113,7 +113,7 @@
</span><span class="cx">                                         <filepath>Resource/CardDAV/sharing/access/addressbook/1.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                         </request>
</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">@@ -126,7 +126,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -305,6 +305,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>
</span><ins>+
</ins><span class="cx">         <test-suite name='fully-shared read-only addressbook' ignore='no'>
</span><span class="cx">                 <test name='0' ignore='no'>
</span><span class="cx">                         <description>reset user1 home and share user2 addressbook read-only</description>
</span><span class="lines">@@ -314,7 +315,7 @@
</span><span class="cx">                                 <ruri>$notificationpath1:/</ruri>
</span><span class="cx">                                 <ruri>$notificationpath2:/</ruri>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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">@@ -323,7 +324,7 @@
</span><span class="cx">                                         <filepath>Resource/CardDAV/sharing/access/addressbook/4.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                         </request>
</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">@@ -336,7 +337,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -495,7 +496,7 @@
</span><span class="cx">                                 <ruri>$addressbookhome1:/</ruri>
</span><span class="cx">                                 <ruri>$notificationpath1:/</ruri>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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:/g123.vcf</ruri>
</span><span class="lines">@@ -507,7 +508,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</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">@@ -520,7 +521,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -695,7 +696,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><del>-                        <description>delete added vCard</description>
</del><ins>+                        <!-- delete added vCard -->
</ins><span class="cx">                         <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx">                                 <method>DELETE</method>
</span><span class="cx">                                 <ruri>$addressbookpath2:/6.vcf</ruri>
</span><span class="lines">@@ -703,7 +704,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><del>-                        <description>add back removed vCard</description>
</del><ins>+                        <!-- add back removed vCard -->
</ins><span class="cx">                         <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx">                                 <method>PUT</method>
</span><span class="cx">                                 <ruri>$addressbookpath2:/2.vcf</ruri>
</span><span class="lines">@@ -728,7 +729,7 @@
</span><span class="cx">                                 <ruri>$notificationpath1:/</ruri>
</span><span class="cx">                                 <ruri>$notificationpath2:/</ruri>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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:/g345.vcf</ruri>
</span><span class="lines">@@ -740,7 +741,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</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">@@ -753,7 +754,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -905,7 +906,7 @@
</span><span class="cx">                                 <ruri>$addressbookhome1:/</ruri>
</span><span class="cx">                                 <ruri>$notificationpath1:/</ruri>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs read-write invitation to group</description>
</del><ins>+                        <!-- user2 POSTs read-write invitation to group -->
</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:/g123.vcf</ruri>
</span><span class="lines">@@ -917,7 +918,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</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">@@ -930,7 +931,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -943,8 +944,7 @@
</span><span class="cx">                                 <method>DELETE</method>
</span><span class="cx">                                 <ruri>$notificationpath1:/$inviteuid:</ruri>
</span><span class="cx">                         </request>
</span><del>-                        
-                        <description>user2 POSTs invitation read-only to group</description>
</del><ins>+                        <!-- user2 POSTs invitation read-only to group -->
</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:/g345.vcf</ruri>
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</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">@@ -969,7 +969,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -1229,7 +1229,7 @@
</span><span class="cx">         <test-suite name='overlapping read-only, read-write shared groups, read-write addressbook' ignore='no'>
</span><span class="cx">                 <test name='0' ignore='no'>
</span><span class="cx">                         <description>share user2 addressbook read-write</description>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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">@@ -1238,7 +1238,7 @@
</span><span class="cx">                                         <filepath>Resource/CardDAV/sharing/access/addressbook/1.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                         </request>
</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">@@ -1251,7 +1251,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -1373,7 +1373,7 @@
</span><span class="cx">         <test-suite name='overlapping read-only, read-write shared groups, read-only addressbook' ignore='no'>
</span><span class="cx">                 <test name='0' ignore='no'>
</span><span class="cx">                         <description>share user2 addressbook read-only</description>
</span><del>-                        <description>user2 POSTs invitation</description>
</del><ins>+                        <!-- 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">@@ -1382,7 +1382,7 @@
</span><span class="cx">                                         <filepath>Resource/CardDAV/sharing/access/addressbook/4.xml</filepath>
</span><span class="cx">                                 </data>
</span><span class="cx">                         </request>
</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">@@ -1395,7 +1395,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</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">@@ -1486,7 +1486,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><del>-                        <description>user2 POSTs invitation read-write to group 345</description>
</del><ins>+                        <!-- user2 POSTs invitation read-write to group 345 -->
</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:/g345.vcf</ruri>
</span><span class="lines">@@ -1498,7 +1498,7 @@
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</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">@@ -1511,7 +1511,7 @@
</span><span class="cx">                                         <variable>$inviteuid:</variable>
</span><span class="cx">                                 </grabelement>
</span><span class="cx">                         </request>
</span><del>-                        <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                        <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx">                         <request print-response="no">
</span><span class="cx">                                 <method>POST</method>
</span><span class="cx">                                 <ruri>$addressbookhome1:/</ruri>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingputxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml (12018 => 12019)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml        2013-12-02 22:01:35 UTC (rev 12018)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml        2013-12-03 19:17:08 UTC (rev 12019)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">         </require-feature>
</span><span class="cx">
</span><span class="cx">         <start>
</span><del>-                <description>clean up old data</description>
</del><ins>+                <!-- clean up old data -->
</ins><span class="cx">                 <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx">                         <method>DELETEALL</method>
</span><span class="cx">                         <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">                         <ruri>$notificationpath2:/</ruri>
</span><span class="cx">                 </request>
</span><span class="cx">
</span><del>-                <description>add 1 person in two groups to user2 address book</description>
</del><ins>+                <!-- add 1 person in two groups 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">@@ -61,7 +61,7 @@
</span><span class="cx">                                 <filepath>Resource/CardDAV/sharing/put/3.vcf</filepath>
</span><span class="cx">                         </data>
</span><span class="cx">                 </request>
</span><del>-                <description>user2 POSTs invitation</description>
</del><ins>+                <!-- 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:/2.vcf</ruri>
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">                                 <callback>statusCode</callback>
</span><span class="cx">                         </verify>
</span><span class="cx">                 </request>
</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">@@ -86,7 +86,7 @@
</span><span class="cx">                                 <variable>$inviteuid:</variable>
</span><span class="cx">                         </grabelement>
</span><span class="cx">                 </request>
</span><del>-                <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+                <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx">                 <request print-response="no">
</span><span class="cx">                         <method>POST</method>
</span><span class="cx">                         <ruri>$addressbookhome1:/</ruri>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingunsharexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml (12018 => 12019)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml        2013-12-02 22:01:35 UTC (rev 12018)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml        2013-12-03 19:17:08 UTC (rev 12019)
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx">                                 <ruri>$addressbookhome2:/</ruri>
</span><span class="cx">                                 <data substitutions='yes'>
</span><span class="cx">                                         <content-type>application/xml; charset=utf-8</content-type>
</span><del>-                                        <filepath>Resource/CardDAV/sharing/unshare/shareedecline/2.xml</filepath>
</del><ins>+                                        <filepath>Resource/CardDAV/sharing/unshare/shareedecline/4.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="lines">@@ -1245,7 +1245,7 @@
</span><span class="cx">                                         <callback>xmlDataMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filepath</name>
</span><del>-                                                <value>Resource/CardDAV/sharing/unshare/shareedecline/1.xml</value>
</del><ins>+                                                <value>Resource/CardDAV/sharing/unshare/shareedecline/3.xml</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>filter</name>
</span><span class="lines">@@ -1262,6 +1262,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>        
</span><ins>+
</ins><span class="cx">         <test-suite name='reshare group, sharee delete addressbook' ignore='no'>
</span><span class="cx">                 <test name='1' ignore='no'>
</span><span class="cx">                         <description>POST invitation</description>
</span><span class="lines">@@ -1458,6 +1459,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>        
</span><ins>+
</ins><span class="cx">         <test-suite name='rehare group, sharee delete group' ignore='no'>
</span><span class="cx">                 <test name='1' ignore='no'>
</span><span class="cx">                         <description>POST invitation</description>
</span><span class="lines">@@ -1654,6 +1656,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>        
</span><ins>+
</ins><span class="cx">         <test-suite name='reshare group, sharer uninvite' ignore='no'>
</span><span class="cx">                 <test name='1' ignore='no'>
</span><span class="cx">                         <description>POST invitation</description>
</span><span class="lines">@@ -1850,6 +1853,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>        
</span><ins>+
</ins><span class="cx">         <test-suite name='reshare group, sharer delete group' ignore='no'>
</span><span class="cx">                 <test name='1' ignore='no'>
</span><span class="cx">                         <description>POST invitation</description>
</span><span class="lines">@@ -2047,6 +2051,7 @@
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">         </test-suite>        
</span><ins>+
</ins><span class="cx">         <test-suite name='recreate and share group, sharer delete addressbook' ignore='no'>
</span><span class="cx">                 <test name='0' ignore='no'>
</span><span class="cx">                         <request user="$userid1:" pswd="$pswd1:">
</span></span></pre>
</div>
</div>
</body>
</html>