[CalendarServer-changes] [9427] CalDAVTester/branches/users/gaya/invitecleanTester
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 10 17:58:29 PDT 2012
Revision: 9427
http://trac.macosforge.org/projects/calendarserver/changeset/9427
Author: gaya at apple.com
Date: 2012-07-10 17:58:27 -0700 (Tue, 10 Jul 2012)
Log Message:
-----------
use $cuaddrurn instead of $cuaddr; add CardDAV main address book sharing tests
Modified Paths:
--------------
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-only/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-write/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/4.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/new/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/updatenew/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/13.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/6.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/5.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/decline/3.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/5.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-only/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/5.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/decline/3.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/5.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml
CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml
Added Paths:
-----------
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/1.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/10.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/2.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/3.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/4.xml
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/5.vcf
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/6.vcf
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/7.vcf
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/8.vcf
CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/9.xml
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-only/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-only/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-only/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-accepted/>
<access>
<read/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-write/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/calendars/read-write/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -3,7 +3,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/4.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/double/4.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/new/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/new/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/new/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/updatenew/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/updatenew/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/invites/updatenew/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/13.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/13.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/13.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-declined/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/6.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/6.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/notification-sync/6.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/peruser-properties/read-write/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/5.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/accept/5.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/decline/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/decline/3.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/replies/decline/3.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='calendar'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/5.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CalDAV/sharing/setup/5.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/1.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/1.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/1.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:set>
+ <D:href>$cuaddr2:</D:href>
+ <CS:summary>My Main Shared Address Book</CS:summary>
+ <CS:read-write/>
+ </CS:set>
+</CS:share>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/10.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/10.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/10.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='addressbook'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
+ <invite-deleted/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$addressbookpath1:</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>The Shared Address Book</summary>
+ </invite-notification>
+</notification>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/2.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <invite-notification shared-type='addressbook'>
+ <uid></uid>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
+ <invite-noresponse/>
+ <access>
+ <read-write/>
+ </access>
+ <hosturl>
+ <href xmlns='DAV:'>$addressbookpath1:</href>
+ </hosturl>
+ <organizer>
+ <href xmlns='DAV:'>$principaluri1:</href>
+ <common-name>User 01</common-name>
+ </organizer>
+ <summary>My Main Shared Address Book</summary>
+ </invite-notification>
+</notification>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/3.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/3.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>mailto:$email2:</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>$addressbookpath1:</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ <summary>The Shared Address Book</summary>
+ <common-name>$username2:</common-name>
+ <first-name>$firstname2:</first-name>
+ <last-name>$lastname2:</last-name>
+</invite-reply>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/4.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/4.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:owner/>
+<D:current-user-privilege-set/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/5.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/5.vcf (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/5.vcf 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-1
+END:VCARD
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/6.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/6.vcf (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/6.vcf 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-1
+END:VCARD
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/7.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/7.vcf (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/7.vcf 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/8.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/8.vcf (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/8.vcf 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default;;;
+FN:Default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD
Added: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/9.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/9.xml (rev 0)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/main/9.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+ <CS:remove>
+ <D:href>$cuaddr2:</D:href>
+ </CS:remove>
+</CS:share>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-only/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-only/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-only/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-accepted/>
<access>
<read/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/5.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/accept/5.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/decline/3.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/decline/3.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/replies/decline/3.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/2.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/2.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -2,7 +2,7 @@
<dtstamp></dtstamp>
<invite-notification shared-type='addressbook'>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<invite-noresponse/>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/5.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/Resource/CardDAV/sharing/setup/5.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -6,7 +6,7 @@
<invite xmlns='http://calendarserver.org/ns/'>
<user>
<uid></uid>
- <href xmlns='DAV:'>$cuaddr2:</href>
+ <href xmlns='DAV:'>$cuaddrurn2:</href>
<common-name>User 02</common-name>
<access>
<read-write/>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CalDAV/sharing-calendars.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -178,7 +178,7 @@
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}organizer/{DAV:}href[=$principaluri1:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}organizer/{http://calendarserver.org/ns/}common-name[=$username1:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user</value>
- <value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{DAV:}href[=$cuaddr2:]</value>
+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{DAV:}href[=$cuaddrurn2:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{http://calendarserver.org/ns/}access/{http://calendarserver.org/ns/}read-write</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}invite/{http://calendarserver.org/ns/}user/{http://calendarserver.org/ns/}invite-accepted</value>
</arg>
Modified: CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-07-11 00:25:42 UTC (rev 9426)
+++ CalDAVTester/branches/users/gaya/invitecleanTester/scripts/tests/CardDAV/sharing-addressbooks.xml 2012-07-11 00:58:27 UTC (rev 9427)
@@ -89,6 +89,13 @@
<variable>$inviteuid:</variable>
</grabelement>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$notificationpath2:/$inviteuid:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
</test>
<test name='3'>
<description>Sharee replies ACCEPTED</description>
@@ -341,6 +348,13 @@
<variable>$inviteuid:</variable>
</grabelement>
</request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$notificationpath2:/$inviteuid:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
</test>
<test name='3'>
<description>Sharee replies ACCEPTED</description>
@@ -457,7 +471,450 @@
</request>
</test>
</test-suite>
-
+ <test-suite name='Share main address book' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>POST invitation</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid2:" pswd="$pswd2:" print-request='no' print-response='no'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-request='no' print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/2.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>Sharee replies ACCEPTED</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookhome2:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedaddressbook:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Shared address book exists</description>
+ <request user="$userid2:" pswd="$pswd2:" print-request='no' print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$sharedaddressbook:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+ <value>$verify-property-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}unbind</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}admin</value>
+ <value>$verify-property-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}all</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>Sharee creates vcard</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$sharedaddressbook:/1.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/5.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>Sharer sees vcard</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$addressbookpath1:/1.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/5.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>Sharer changes vcard</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/1.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/6.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>Sharee sees changed vcard</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GET</method>
+ <ruri>$sharedaddressbook:/1.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/6.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
+ <description>Sharer creates vcard</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/2.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/7.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='10' ignore='no'>
+ <description>Sharee sees new vcard</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>GET</method>
+ <ruri>$sharedaddressbook:/2.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/7.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11' ignore='no'>
+ <description>Sharee changes vcard</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$sharedaddressbook:/2.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/8.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='12' ignore='no'>
+ <description>Sharer sees changed event</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$addressbookpath1:/2.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/8.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='13' ignore='no'>
+ <description>Unshare main address book</description>
+ <request print-request='no' print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/main/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>200</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14' ignore='no'>
+ <description>Check Sharee notification collection and delete invite-deleted</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-request='no' print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/main/10.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ </request>
+ </test>
+ <test name='15' ignore='no'>
+ <description>No more shared addressbook</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$shareeaddressbook:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourcetype.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>404</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+<!--
+ <test-suite name='Share group' ignore='yes'>
+ <test name='1' ignore='no'>
+ <description>Sharee creates groups and members</description>
+ <request print-request='no' print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/1.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/1.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-request='no' print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/2.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/2.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-request='no' print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/3.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/3.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-request='no' print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/4.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/4.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-request='no' print-response='no'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/5.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/5.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>POST invitation to user vCard</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/1.vcf</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='yes'>
+ <description>POST invitation to empty group vCard</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/5.vcf</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>POST invitation to group</description>
+ <request print-request='yes' print-response='yes'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/3.vcf</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>Check Sharee notification collection</description>
+ <request user="$userid2:" pswd="$pswd2:" print-request='yes' print-response='yes'>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" print-request='yes' print-response='yes'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath2:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/sharing/addressbooks/group/8.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ <value>{http://calendarserver.org/ns/}uid</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+ <variable>$inviteuid:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>Sharee replies ACCEPTED</description>
+ <request user="$userid2:" pswd="$pswd2:" print-request='yes' print-response='yes'>
+ <method>POST</method>
+ <ruri>$addressbookhome2:/</ruri>
+ <data substitutions='yes'>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabelement>
+ <name>{DAV:}href</name>
+ <variable>$sharedaddressbook:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>PROPFIND of basic properties depth=1 on shared address book</description>
+ <request user="$userid2:" pswd="$pswd2:" print-request='yes' print-response='yes'>
+ <method>PROPFIND</method>
+ <ruri>$sharedaddressbook:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/sharing/addressbooks/group/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+ -->
+
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120710/579652f1/attachment-0001.html>
More information about the calendarserver-changes
mailing list