[CalendarServer-changes] [11576] CalDAVTester/trunk/scripts/tests/CardDAV
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 1 14:21:41 PDT 2013
Revision: 11576
http://trac.calendarserver.org//changeset/11576
Author: gaya at apple.com
Date: 2013-08-01 14:21:41 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
use $userguidX: for shared addressbook path, not $useridX: ; filter N, and FN is when comparing group for addressbook
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml
CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml 2013-08-01 21:16:23 UTC (rev 11575)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml 2013-08-01 21:21:41 UTC (rev 11576)
@@ -144,7 +144,7 @@
<description>Sharee shared address book is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -178,7 +178,7 @@
<description>Group for shared address book is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/addressbook.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -212,7 +212,7 @@
<description>vCard in shared address book is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -246,7 +246,7 @@
<description>Cannot change group address book</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/addressbook.vcf</ruri>
<data substitutions="yes">
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/gAddressBook.vcf</filepath>
@@ -264,7 +264,7 @@
<description>add vCard</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -278,7 +278,7 @@
<description>New vCard is member of addressbook group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/addressbook.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -288,6 +288,8 @@
<arg>
<name>filter</name>
<value>UID</value>
+ <value>N</value>
+ <value>FN</value>
</arg>
</verify>
</request>
@@ -296,7 +298,7 @@
<description>Clean up</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -352,7 +354,7 @@
<description>shared address book is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -386,7 +388,7 @@
<description>Group for shared address book is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/addressbook.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -420,7 +422,7 @@
<description>vCard in shared address book is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -454,7 +456,7 @@
<description>vCard in shared address book cannot be deleted</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -468,7 +470,7 @@
<description>vCard in shared address book cannot be modified</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/2.vcf</filepath>
@@ -539,7 +541,7 @@
<description>Sharee shared address book is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -573,7 +575,7 @@
<description>vCard for shared group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -604,7 +606,7 @@
<description>vCard in shared group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -635,7 +637,7 @@
<description>vCard in shared group can be deleted</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -645,7 +647,7 @@
<description>adding vCard with UID in owner's address book fails</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/9.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/9.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/2.vcf</filepath>
@@ -663,7 +665,7 @@
<description>adding vCard with name in owner's address book fails</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -681,7 +683,7 @@
<description>vCard with new UID shared read-write group can be added</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -695,7 +697,7 @@
<description>New vCard is member of shared group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -794,7 +796,7 @@
<description>Sharee shared address book is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -828,7 +830,7 @@
<description>vCard for shared read-only group is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g345.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -859,7 +861,7 @@
<description>vCard in shared read-only group is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -890,7 +892,7 @@
<description>vCard in shared read-only group cannot be deleted</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -904,7 +906,7 @@
<description>vCard in shared read-only group cannot be modified</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/4.vcf</filepath>
@@ -1010,7 +1012,7 @@
<description>Sharee shared address book is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1044,7 +1046,7 @@
<description>vCard for shared read-write group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1075,7 +1077,7 @@
<description>vCard for shared read-only group is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g345.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1106,7 +1108,7 @@
<description>vCard in read-write group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/2.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1137,7 +1139,7 @@
<description>vCard in read-only and read-write group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/3.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/3.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1168,7 +1170,7 @@
<description>vCard in shared read-only group is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1199,7 +1201,7 @@
<description>add vCard</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -1213,7 +1215,7 @@
<description>New vCard is member of shared read-write group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1227,7 +1229,7 @@
<description>New vCard is not member of read-only group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g345.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1241,7 +1243,7 @@
<description>Clean up</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1292,7 +1294,7 @@
<description>vCard in read-only group is read-write</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1323,7 +1325,7 @@
<description>add vCard</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -1337,7 +1339,7 @@
<description>New vCard is NOT member of shared read-write group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1351,7 +1353,7 @@
<description>New vCard is not member of read-only group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g345.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1365,7 +1367,7 @@
<description>New vCard is member of addressbook group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/addressbook.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1375,6 +1377,8 @@
<arg>
<name>filter</name>
<value>UID</value>
+ <value>N</value>
+ <value>FN</value>
</arg>
</verify>
</request>
@@ -1383,7 +1387,7 @@
<description>Clean up</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1434,7 +1438,7 @@
<description>shared address book is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1468,7 +1472,7 @@
<description>vCard in shared read-only group is read-only</description>
<request>
<method>PROPFIND</method>
- <ruri>$addressbookhome1:/$userid2:/4.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/4.vcf</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1502,7 +1506,7 @@
<description>unshare address book, share 345 read-write</description>
<request>
<method>DELETE</method>
- <ruri>$addressbookhome1:/$userid2:/</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -1550,7 +1554,7 @@
<description>vCard with new UID shared read-write group can be added</description>
<request>
<method>PUT</method>
- <ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/6.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
@@ -1564,7 +1568,7 @@
<description>New vCard is member of shared group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g123.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -1578,7 +1582,7 @@
<description>New vCard is member of shared group</description>
<request>
<method>GET</method>
- <ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+ <ruri>$addressbookhome1:/$userguid2:/g345.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2013-08-01 21:16:23 UTC (rev 11575)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml 2013-08-01 21:21:41 UTC (rev 11576)
@@ -293,6 +293,8 @@
<arg>
<name>filter</name>
<value>UID</value>
+ <value>N</value>
+ <value>FN</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml 2013-08-01 21:16:23 UTC (rev 11575)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml 2013-08-01 21:21:41 UTC (rev 11576)
@@ -187,7 +187,7 @@
<description>Sharee sees shared address book</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -221,7 +221,7 @@
<description>Sharee sees shared address book and shared vCards</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>1</value>
@@ -268,7 +268,7 @@
<callback>xmlElementMatch</callback>
<arg>
<name>parent</name>
- <value>$multistatus-response-prefix:[^{DAV:}href=$addressbookhome2:/$userid1:/]</value>
+ <value>$multistatus-response-prefix:[^{DAV:}href=$addressbookhome2:/$userguid1:/]</value>
</arg>
<arg>
<name>exists</name>
@@ -321,7 +321,7 @@
<description>Sharee creates group vcard with unknown member UID</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
- <ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/groups/read-write/8.vcf</filepath>
@@ -339,7 +339,7 @@
<description>Sharee creates group vcard with member UID in ab but not in group</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
- <ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/groups/read-write/9.vcf</filepath>
@@ -357,7 +357,7 @@
<description>Sharee creates vcard</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
- <ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/groups/read-write/10.vcf</filepath>
@@ -424,7 +424,7 @@
<description>Sharee sees changed vcard</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GET</method>
- <ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -452,7 +452,7 @@
<description>Sharee sees new vcards</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GET</method>
- <ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/5.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -463,7 +463,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GET</method>
- <ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/2.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -474,7 +474,7 @@
</request>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GET</method>
- <ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
<verify>
<callback>addressDataMatch</callback>
<arg>
@@ -488,7 +488,7 @@
<description>Sharee removes vCard from subgroup</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PUT</method>
- <ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/5.vcf</ruri>
<data>
<content-type>text/vcard; charset=utf-8</content-type>
<filepath>Resource/CardDAV/sharing/groups/read-write/14.vcf</filepath>
@@ -502,7 +502,7 @@
<description>Sharee cannot access removed sub group member</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>GET</method>
- <ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
<verify>
<callback>statusCode</callback>
<arg>
@@ -541,7 +541,7 @@
<description>Sharee deletes vCard in subgroup</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>DELETE</method>
- <ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/2.vcf</ruri>
<verify>
<callback>statusCode</callback>
</verify>
@@ -635,7 +635,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2013-08-01 21:16:23 UTC (rev 11575)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2013-08-01 21:21:41 UTC (rev 11576)
@@ -1214,7 +1214,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1396,7 +1396,7 @@
<description>Sharee deletes shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>DELETE</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>infinity</value>
@@ -1410,7 +1410,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1606,7 +1606,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1802,7 +1802,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -1994,7 +1994,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
@@ -2202,7 +2202,7 @@
<description>No more shared addressbook</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
<method>PROPFIND</method>
- <ruri>$addressbookhome2:/$userid1:/</ruri>
+ <ruri>$addressbookhome2:/$userguid1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130801/14ac0f08/attachment-0001.html>
More information about the calendarserver-changes
mailing list