[CalendarServer-changes] [10949] CalDAVTester/branches/users/gaya/sharedgroupstester

source_changes at macosforge.org source_changes at macosforge.org
Mon Mar 18 22:22:24 PDT 2013


Revision: 10949
          http://trac.calendarserver.org//changeset/10949
Author:   gaya at apple.com
Date:     2013-03-18 22:22:24 -0700 (Mon, 18 Mar 2013)
Log Message:
-----------
combine sharing addressbook main and read-write tests.  Move group sharing tests to it's own xml file and resource folders.

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/1.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-addressbooks.xml

Added Paths:
-----------
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/1.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/10.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/11.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/12.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/13.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/14.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15a.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/16.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/2.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/3.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/4.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/5.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/6.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/7.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/8.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/9.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-groups.xml

Removed Paths:
-------------
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/group/
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/main/

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/1.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/1.xml	2013-03-19 02:38:28 UTC (rev 10948)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/1.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -2,7 +2,7 @@
 <CS:share xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
     <CS:set>
         <D:href>$cuaddr2:</D:href>
-        <CS:summary>My Shared Address Book</CS:summary>
+        <CS:summary>My Main Shared Address Book</CS:summary>
         <CS:read-write/>
     </CS:set>
 </CS:share>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml	2013-03-19 02:38:28 UTC (rev 10948)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/2.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -14,6 +14,6 @@
       <href xmlns='DAV:'>$principaluri1:</href>
       <common-name>User 01</common-name>
     </organizer>
-    <summary>My Shared Address Book</summary>
+    <summary>My Main Shared Address Book</summary>
   </invite-notification>
 </notification>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	2013-03-19 02:38:28 UTC (rev 10948)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -1,10 +1,12 @@
 BEGIN:VCARD
 VERSION:3.0
 PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
-UID:f5c48e9d-17bd-47cc-b35d-4c328d807a63
-FN:shared
-N:shared;;;;
+UID:8ec61992-d3f4-45cc-b64a-b683c3ba3eff
+FN:user01
+N:user01;;;;
 X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-1
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:A
+ BPerson-1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:A
+ BPerson-2
 END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/1.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/1.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/1.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -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-555-555-5555
+item1.ADR;type=WORK;type=pref:;;2 Lag;Elk Forest;California;99999;USA
+item1.X-ABADR:us
+UID:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/10.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/10.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/10.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,8 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/11.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/11.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/11.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Shared Group
+N:Shared Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ef5516c6-0efd-4626-98b4-5cd2868f3971
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/12.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/12.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/12.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:New Group
+N:New Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/13.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/13.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/13.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/14.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/14.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/14.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:8aa9ed15-5619-44d7-b061-51976dd5a174
+FN:Sub Group
+N:Sub Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15a.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15a.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/15a.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -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>

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/16.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/16.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/16.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='group'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn2:</href>
+    <invite-deleted/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>Group Address Book</summary>
+  </invite-notification>
+</notification>

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/2.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/2.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/2.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Kawado;Saeko;;;
+FN:Snow Leopard
+ORG:Snow Leopard;
+EMAIL;type=INTERNET;type=WORK;type=pref:snowleopard_apple at example.com
+TEL;type=WORK;type=pref:555-555-5555
+item1.ADR;type=WORK;type=pref:;;2 Fidel Ave. Suite 1;Mountain Top;CA;99999;USA
+item1.X-ABADR:us
+X-ABShowAs:COMPANY
+UID:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/3.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/3.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/3.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Shared Group
+N:Shared Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8aa9ed15-5619-44d7-b061-51976dd5a174
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/4.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/4.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/4.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -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>Group Address Book</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>
\ No newline at end of file

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/5.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/5.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/5.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+  <dtstamp></dtstamp>
+  <invite-notification shared-type='group'>
+    <uid></uid>
+    <href xmlns='DAV:'>$cuaddrurn2:</href>
+    <invite-noresponse/>
+    <access>
+      <read-write/>
+    </access>
+    <hosturl>
+      <href xmlns='DAV:'>$addressbookpath1:/3.vcf</href>
+    </hosturl>
+    <organizer>
+      <href xmlns='DAV:'>$principaluri1:</href>
+      <common-name>User 01</common-name>
+    </organizer>
+    <summary>Group Address Book</summary>
+  </invite-notification>
+</notification>

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/6.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/6.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/6.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -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:/3.vcf</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>Group 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/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/7.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/7.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/7.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -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/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/8.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/8.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/8.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson-2
+END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/9.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/9.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/groups/read-write/9.vcf	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,9 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:ef5516c6-0efd-4626-98b4-5cd2868f3971
+FN:Subsub Group
+N:Subsub Group;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+END:VCARD

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-03-19 02:38:28 UTC (rev 10948)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -41,10 +41,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Read-write addressbooks' ignore='no'>
+	<test-suite name='Read-write address book' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -56,13 +56,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2'>
+		<test name='2' ignore='no'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -82,20 +82,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'>
+		<test name='3' ignore='no'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data substitutions="yes">
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/3.xml</filepath>
 				</data>
@@ -108,9 +101,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4'>
+		<test name='4' ignore='no'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -142,9 +135,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4a'>
+		<test name='5' ignore='no'>
 			<description>Shared address book exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<header>
@@ -179,10 +172,9 @@
 					</arg>
 				</verify>
 			</request>
-		</test>
-		<test name='5'>
+		</test><test name='6' ignore='no'>
 			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<data>
@@ -194,9 +186,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
+		<test name='7' ignore='no'>
 			<description>Sharer sees vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>GET</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<verify>
@@ -208,9 +200,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7'>
+		<test name='8' ignore='no'>
 			<description>Sharer changes vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -222,9 +214,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8'>
+		<test name='9' ignore='no'>
 			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<verify>
@@ -236,9 +228,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9'>
+		<test name='10' ignore='no'>
 			<description>Sharer creates vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<data>
@@ -250,9 +242,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
+		<test name='11' ignore='no'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<verify>
@@ -264,9 +256,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11'>
+		<test name='12' ignore='no'>
 			<description>Sharee changes vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<data>
@@ -278,9 +270,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12'>
+		<test name='13' ignore='no'>
 			<description>Sharer sees changed event</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>GET</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<verify>
@@ -292,15 +284,47 @@
 				</verify>
 			</request>
 		</test>
+		<test name='14' ignore='no'>
+			<description>Sharee sees group with shared address book members</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>GET</method>
+				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/addressbooks/read-write/9.vcf</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>UID</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='15' ignore='no'>
+			<description>Sharee cannot delete special group</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
-	<test-suite name='Default address book cannot be shared address book' ignore='no'>
+	<test-suite name='Shared address book cannot be default address' ignore='no'>
 		<require-feature>
 			<feature>default-addressbook</feature>
 		</require-feature>
 		<test name='1'>
 			<description>Set property on home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data>
@@ -343,7 +367,7 @@
 	<test-suite name='Change to read-only address book' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -357,11 +381,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -391,7 +415,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data substitutions='yes'>
@@ -409,7 +433,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -443,7 +467,7 @@
 		</test>
 		<test name='5'>
 			<description>Create vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/3.vcf</ruri>
 				<data>
@@ -461,7 +485,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer creates vcard</description>
-			<request print-response='no'>
+			<request print-response="no">
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<data>
@@ -475,7 +499,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<verify>
@@ -489,7 +513,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee cannot change vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<data>
@@ -505,890 +529,14 @@
 				</verify>
 			</request>
 		</test>
-	</test-suite><test-suite name="Share main address book" ignore="no">
-		<test name="0" ignore="no">
-			<description>clear main address book and notifications</description>
-			<request user="$userid1:" pswd="$pswd1:">
-				<method>DELETE</method>
-				<ruri>$addressbookpath1:/</ruri>
-			</request>
-			<request user="$userid1:" pswd="$pswd1:">
-				<method>DELETEALL</method>
-				<ruri>$notificationpath1:/</ruri>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:">
-				<method>DELETEALL</method>
-				<ruri>$notificationpath2:/</ruri>
-			</request>
-		</test>
-		<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-response="no">
-				<method>WAITCOUNT 1</method>
-				<ruri>$notificationpath2:/</ruri>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" 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-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/{DAV:}collection</value>
-						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</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="12.1" ignore="no">
-			<description>Sharee sees group with shared address book members</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
-				<method>GET</method>
-				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/main/11.vcf</value>
-					</arg>
-					<arg>
-						<name>filter</name>
-						<value>UID</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name="12.2" ignore="no">
-			<description>Sharee cannot delete special group</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
-				<method>DELETE</method>
-				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>403</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name="13" ignore="no">
-			<description>Unshare main address book</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/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-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>$sharedaddressbook:/</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 name='16' ignore='no'>
-			<description>Clean up main addressbook</description>
-			<request>
-				<method>DELETEALL</method>
-				<ruri>$addressbookpath1:/</ruri>
-			</request>
-		</test>
 	</test-suite>
 	
-
-	<test-suite name='Share group' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Sharee creates 2 persons and a group</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/group/1.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<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/group/2.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request 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>
-		</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/4.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>403</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>POST invitation to group vCard</description>
-			<request print-response='no'>
-				<method>POST</method>
-				<ruri>$addressbookpath1:/3.vcf</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/4.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<value>200</value>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>WAITCOUNT 1</method>
-				<ruri>$notificationpath2:/</ruri>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GETNEW</method>
-				<ruri>$notificationpath2:/</ruri>
-				<verify>
-					<callback>xmlDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/5.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='5' 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/group/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<grabelement>
-					<name>{DAV:}href</name>
-					<variable>$sharedgroup:</variable>
-				</grabelement>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>Sharee sees shared address book</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome2:/$userid1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/7.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/{DAV:}collection</value>
-						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</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='6aa'>
-			<description>Shared address book exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome2:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/4.xml</filepath>
-				</data>
-				<verify>
-					<callback>xmlElementMatch</callback>
-					<arg>
-						<name>parent</name>
-						<value>$multistatus-response-prefix:[^{DAV:}href=$addressbookhome2:/$userid1:/]</value>
-					</arg>
-					<arg>
-						<name>exists</name>
-						<value>$verify-response-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
-						<value>$verify-response-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
-						<value>$verify-response-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
-						<value>$verify-response-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
-						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
-						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
-						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
-						<value>$verify-response-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='6a' ignore='no'>
-			<description>Sharee sees shared group vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$sharedgroup:</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/3.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6b' ignore='yes'>
-			<description>Sharee cannot delete shared group vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>DELETE</method>
-				<ruri>$sharedgroup:</ruri>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>403</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<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>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/8.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>403</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<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>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/9.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>403</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='9' ignore='no'>
-			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PUT</method>
-				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/10.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='10' ignore='no'>
-			<description>Sharer sees vcard as group member</description>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/4.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/10.vcf</value>
-					</arg>
-				</verify>
-			</request>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/3.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/11.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='11' ignore='no'>
-			<description>Sharer changes vcard</description>
-			<request 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/12.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='12' ignore='no'>
-			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/12.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='13' ignore='no'>
-			<description>Sharer creates subgroup that contains 2 already present members</description>
-			<request 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/13.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='14' ignore='no'>
-			<description>Sharee sees new vcards</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/13.vcf</value>
-					</arg>
-				</verify>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/2.vcf</value>
-					</arg>
-				</verify>
-			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/1.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='15' ignore='no'>
-			<description>Sharee removes vCard from subgroup</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PUT</method>
-				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/14.vcf</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='16' ignore='no'>
-			<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>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>404</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='17' ignore='no'>
-			<description>Sharer sees subgroup changes and removed subgroup member</description>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/5.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/14.vcf</value>
-					</arg>
-				</verify>
-			</request>
-			<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/group/1.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='18' ignore='no'>
-			<description>Sharee deletes vCard in subgroup</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>DELETE</method>
-				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='19' ignore='no'>
-			<description>Sharer sees subgroup changes and sharee-deleted subgroup member</description>
-			<request print-response='no'>
-				<method>GET</method>
-				<ruri>$addressbookpath1:/5.vcf</ruri>
-				<verify>
-					<callback>addressDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/15.vcf</value>
-					</arg>
-				</verify>
-			</request>
-			<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/group/2.vcf</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='20' ignore='no'>
-			<description>Sharer deletes shared group</description>
-			<request print-response='no'>
-				<method>DELETE</method>
-				<ruri>$addressbookpath1:/3.vcf</ruri>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>204</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name="20a" ignore="yes">
-			<description>Unshare main address book</description>
-			<request print-response="no">
-				<method>POST</method>
-				<ruri>$addressbookpath1:/3.vcf</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/addressbooks/group/15a.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>200</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='21' 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-response='no'>
-				<method>GETNEW</method>
-				<ruri>$notificationpath2:/</ruri>
-				<verify>
-					<callback>xmlDataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/CardDAV/sharing/addressbooks/group/16.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='22' ignore='no'>
-			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome2:/$userid1:/</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 name='23' ignore='no'>
-			<description>Clean up main addressbook</description>
-			<request>
-				<method>DELETEALL</method>
-				<ruri>$addressbookpath1:/</ruri>
-			</request>
-		</test>
-	</test-suite>
-
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
 			<ruri>$addressbookpath1:/</ruri>
 			<ruri>$notificationpath1:/</ruri>
 			<ruri>$notificationpath2:/</ruri>
-			<ruri>$notificationpath3:/</ruri>
-			<ruri>$notificationpath4:/</ruri>
 		</request>
 	</end>
 

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-groups.xml	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-groups.xml	2013-03-19 05:22:24 UTC (rev 10949)
@@ -0,0 +1,602 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test sharing address books</description>
+
+	<require-feature>
+		<feature>carddav</feature>
+		<feature>shared-addressbooks</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETE</method>
+			<ruri>$addressbookpath1:/</ruri>
+		</request>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$notificationpath2:/</ruri>
+		</request>
+	</start>
+	
+
+	<test-suite name='read-write' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>Sharee creates 2 persons and a group</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/groups/read-write/1.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<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/groups/read-write/2.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request 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/groups/read-write/3.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/groups/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>POST invitation to group vCard</description>
+			<request print-response='no'>
+				<method>POST</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<value>200</value>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Check Sharee notification collection</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath2:/</ruri>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/5.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='5' 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/groups/read-write/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$sharedgroup:</variable>
+				</grabelement>
+			</request>
+		</test>
+		<test name='6' ignore='no'>
+			<description>Sharee sees shared address book</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/$userid1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/7.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/{DAV:}collection</value>
+						<value>$verify-property-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</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='7'>
+			<description>Shared address book exists Depth:1</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/addressbooks/read-write/4.xml</filepath>
+				</data>
+				<verify>
+					<callback>xmlElementMatch</callback>
+					<arg>
+						<name>parent</name>
+						<value>$multistatus-response-prefix:[^{DAV:}href=$addressbookhome2:/$userid1:/]</value>
+					</arg>
+					<arg>
+						<name>exists</name>
+						<value>$verify-response-prefix:/{DAV:}owner/{DAV:}href[=$principaluri1:]</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{DAV:}collection</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{urn:ietf:params:xml:ns:carddav}addressbook</value>
+						<value>$verify-response-prefix:/{DAV:}resourcetype/{http://calendarserver.org/ns/}shared</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}read</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}write</value>
+						<value>$verify-response-prefix:/{DAV:}current-user-privilege-set/{DAV:}privilege/{DAV:}bind</value>
+						<value>$verify-response-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='8' ignore='no'>
+			<description>Sharee sees shared group vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedgroup:</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/3.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>Sharee cannot delete shared group vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedgroup:</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='10' ignore='no'>
+			<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>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/8.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='11' ignore='no'>
+			<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>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/9.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>403</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12' ignore='no'>
+			<description>Sharee creates vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/10.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='13' ignore='no'>
+			<description>Sharer sees vcard as group member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/4.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/10.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/11.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='14' ignore='no'>
+			<description>Sharer changes vcard</description>
+			<request 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/groups/read-write/12.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='15' ignore='no'>
+			<description>Sharee sees changed vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/4.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/12.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='16' ignore='no'>
+			<description>Sharer creates subgroup that contains 2 already present members</description>
+			<request 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/groups/read-write/13.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='17' ignore='no'>
+			<description>Sharee sees new vcards</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/13.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/2.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookhome2:/$userid1:/1.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/1.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='18' ignore='no'>
+			<description>Sharee removes vCard from subgroup</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PUT</method>
+				<ruri>$addressbookhome2:/$userid1:/5.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/14.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='19' ignore='no'>
+			<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>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='20' ignore='no'>
+			<description>Sharer sees subgroup changes and removed subgroup member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/14.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/1.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='21' ignore='no'>
+			<description>Sharee deletes vCard in subgroup</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$addressbookhome2:/$userid1:/2.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='22' ignore='no'>
+			<description>Sharer sees subgroup changes and sharee-deleted subgroup member</description>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/5.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/15.vcf</value>
+					</arg>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>GET</method>
+				<ruri>$addressbookpath1:/2.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/2.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='23' ignore='no'>
+			<description>Sharer deletes shared group</description>
+			<request print-response='no'>
+				<method>DELETE</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='23a' ignore='yes'>
+			<description>Unshare main address book</description>
+			<request print-response="no">
+				<method>POST</method>
+				<ruri>$addressbookpath1:/3.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/groups/read-write/15a.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>200</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='24' 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-response='no'>
+				<method>GETNEW</method>
+				<ruri>$notificationpath2:/</ruri>
+				<verify>
+					<callback>xmlDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/groups/read-write/16.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='25' ignore='no'>
+			<description>No more shared addressbook</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$addressbookhome2:/$userid1:/</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 name='26' ignore='no'>
+			<description>Clean up main addressbook</description>
+			<request>
+				<method>DELETEALL</method>
+				<ruri>$addressbookpath1:/</ruri>
+			</request>
+		</test>
+	</test-suite>
+
+	<end>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>DELETEALL</method>
+			<ruri>$addressbookpath1:/</ruri>
+			<ruri>$notificationpath1:/</ruri>
+			<ruri>$notificationpath2:/</ruri>
+			<ruri>$notificationpath3:/</ruri>
+			<ruri>$notificationpath4:/</ruri>
+		</request>
+	</end>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130318/5be41cec/attachment-0001.html>


More information about the calendarserver-changes mailing list