[CalendarServer-changes] [11565] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jul 29 20:15:54 PDT 2013


Revision: 11565
          http://trac.calendarserver.org//changeset/11565
Author:   gaya at apple.com
Date:     2013-07-29 20:15:54 -0700 (Mon, 29 Jul 2013)
Log Message:
-----------
Shared groups: test shared group membership after PUT

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/2.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/5.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g345.vcf
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/6.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/7.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g1236.vcf
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g136.vcf
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g3456.vcf
    CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/2.xml	2013-07-30 00:15:55 UTC (rev 11564)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/2.xml	2013-07-30 03:15:54 UTC (rev 11565)
@@ -6,7 +6,7 @@
     <href xmlns='DAV:'>$addressbookpath2:/g123.vcf</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>Shared Group345</summary>
+  <summary>Read-Write Group123</summary>
   <common-name>$username1:</common-name>
   <first-name>$firstname1:</first-name>
   <last-name>$lastname1:</last-name>

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/5.xml	2013-07-30 00:15:55 UTC (rev 11564)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/5.xml	2013-07-30 03:15:54 UTC (rev 11565)
@@ -6,7 +6,7 @@
     <href xmlns='DAV:'>$addressbookpath2:/g345.vcf</href>
   </hosturl>
   <in-reply-to>$inviteuid:</in-reply-to>
-  <summary>Shared Group345</summary>
+  <summary>Read-Only Group345</summary>
   <common-name>$username1:</common-name>
   <first-name>$firstname1:</first-name>
   <last-name>$lastname1:</last-name>

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/6.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/6.xml	2013-07-30 03:15:54 UTC (rev 11565)
@@ -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>$cuaddrurn1:</D:href>
+        <CS:summary>Read-Write Group345</CS:summary>
+        <CS:read-write/>
+    </CS:set>
+</CS:share>

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/7.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/groups/7.xml	2013-07-30 03:15:54 UTC (rev 11565)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<invite-reply xmlns='http://calendarserver.org/ns/'>
+  <href xmlns='DAV:'>$cuaddrurn1:</href>
+  <invite-accepted/>
+  <hosturl>
+    <href xmlns='DAV:'>$addressbookpath2:/g345.vcf</href>
+  </hosturl>
+  <in-reply-to>$inviteuid:</in-reply-to>
+  <summary>Read-Write Group345</summary>
+  <common-name>$username1:</common-name>
+  <first-name>$firstname1:</first-name>
+  <last-name>$lastname1:</last-name>
+</invite-reply>

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g1236.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g1236.vcf	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g1236.vcf	2013-07-30 03:15:54 UTC (rev 11565)
@@ -0,0 +1,13 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Group 123
+N:Group123;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E2
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+END:VCARD

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g136.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g136.vcf	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g136.vcf	2013-07-30 03:15:54 UTC (rev 11565)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa3
+FN:Group 123
+N:Group123;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+END:VCARD

Modified: CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g345.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g345.vcf	2013-07-30 00:15:55 UTC (rev 11564)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g345.vcf	2013-07-30 03:15:54 UTC (rev 11565)
@@ -6,7 +6,7 @@
 N:Group345;;;;
 REV:20120503T194243Z
 X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A
 X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD
 END:VCARD

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g3456.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g3456.vcf	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/g3456.vcf	2013-07-30 03:15:54 UTC (rev 11565)
@@ -0,0 +1,13 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6688fa4
+FN:Group 345
+N:Group345;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+END:VCARD

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf	2013-07-30 03:15:54 UTC (rev 11565)
@@ -0,0 +1,16 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+UID:78b64b6b-80b9-4b8a-bd81-8f36645d8bbf
+FN:user02
+N:user02;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:760d9b28-5a13-4880-b7eb-5769e6688fa3
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:760d9b28-5a13-4880-b7eb-5769e6688fa4
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E2
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+END:VCARD

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml	2013-07-30 00:15:55 UTC (rev 11564)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml	2013-07-30 03:15:54 UTC (rev 11565)
@@ -98,7 +98,7 @@
 
 	<test-suite name='fully-shared read-write addressbook' ignore='no'>
 		<test name='0' ignore='no'>
-			<description>reset user1 home and share user2 addressbook read-write with user1</description>
+			<description>reset user1 home and share user2 addressbook read-write</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -261,25 +261,43 @@
 			</request>
 		</test>
 		<test name='5' ignore='no'>
-			<description>vCard in shared address book can be deleted</description>
+			<description>add vCard</description>
 			<request>
-				<method>DELETE</method>
-				<ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
+				<method>PUT</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='6' ignore='no'>
-			<description>vCard in shared address book can be added</description>
+			<description>New vCard is member of addressbook group</description>
 			<request>
-				<method>PUT</method>
-				<ruri>$addressbookhome1:/$userid2:/2.vcf</ruri>
-				<data>
-					<content-type>text/vcard; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/sharing/access/setup/2.vcf</filepath>
-				</data>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
 				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>UID</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
@@ -287,7 +305,7 @@
 	</test-suite>
 	<test-suite name='fully-shared read-only addressbook' ignore='no'>
 		<test name='0' ignore='no'>
-			<description>reset user1 home and share user2 addressbook read-only with user1</description>
+			<description>reset user1 home and share user2 addressbook read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -469,7 +487,7 @@
 
 	<test-suite name='read-write shared group' ignore='no'>
 		<test name='0' ignore='no'>
-			<description>reset user1 home and share user2 group read-write with user1</description>
+			<description>reset user1 home and share user2 group read-write</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -674,6 +692,20 @@
 			</request>
 		</test>
 		<test name='8' ignore='no'>
+			<description>New vCard is member of shared group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g136.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
 			<description>restore group membership</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -686,13 +718,33 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
+			<description>delete added vCard</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>DELETE</method>
+				<ruri>$addressbookpath2:/6.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<description>add back removed vCard</description>
+			<request user="$userid2:" pswd="$pswd2:">
+				<method>PUT</method>
+				<ruri>$addressbookpath2:/2.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/setup/2.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
 		</test>
 	</test-suite>
 
 
 	<test-suite name='read-only shared group' ignore='no'>
 		<test name='0' ignore='no'>
-			<description>reset user1 home and share user2 group 345 read-only with user1</description>
+			<description>reset user1 home and share user2 group 345 read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -868,9 +920,9 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='overlapping read-only, read-write shared groups, addressbooks' ignore='no'>
+	<test-suite name='overlapping read-only, read-write shared group' ignore='no'>
 		<test name='0' ignore='no'>
-			<description>reset user1 home and share user2 group g123 read-write, group 345 read-only with user1</description>
+			<description>reset user1 home and share user2 group g123 read-write, group 345 read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$addressbookhome1:/</ruri>
@@ -1144,7 +1196,62 @@
 			</request>
 		</test>
 		<test name='7' ignore='no'>
-			<description>share user2 addressbook read-write with user1</description>
+			<description>add vCard</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='8' ignore='no'>
+			<description>New vCard is member of shared read-write group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g1236.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='9' ignore='no'>
+			<description>New vCard is not member of read-only group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g345.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='overlapping read-only, read-write shared groups, read-write addressbook' ignore='no'>
+		<test name='0' ignore='no'>
+			<description>share user2 addressbook read-write</description>
 			<description>user2 POSTs invitation</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
@@ -1181,7 +1288,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='1' ignore='no'>
 			<description>vCard in read-only group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1212,8 +1319,81 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
-			<description>share user2 addressbook read-only with user1</description>
+		<test name='2' ignore='no'>
+			<description>add vCard</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>New vCard is NOT member of shared read-write group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g123.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>New vCard is not member of read-only group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g345.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='5' ignore='no'>
+			<description>New vCard is member of addressbook group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/addressbook.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/gAddressBook6.vcf</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>UID</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='-1' ignore='no'>
+			<description>Clean up</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='overlapping read-only, read-write shared groups, read-only addressbook' ignore='no'>
+		<test name='0' ignore='no'>
+			<description>share user2 addressbook read-only</description>
 			<description>user2 POSTs invitation</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response="no">
 				<method>POST</method>
@@ -1250,7 +1430,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='1' ignore='no'>
 			<description>shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1284,7 +1464,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='2' ignore='no'>
 			<description>vCard in shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1317,6 +1497,99 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='add to ab with two read-write shared groups' ignore='no'>
+		<test name='0' ignore='no'>
+			<description>unshare address book, share 345 read-write</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookhome1:/$userid2:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<description>user2 POSTs invitation read-write to group 345</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+				<method>POST</method>
+				<ruri>$addressbookpath2:/g345.vcf</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/groups/6.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<description>Check user1 notification collection and get invite uid</description>
+			<request print-response="no">
+				<method>WAITCOUNT 1</method>
+				<ruri>$notificationpath1:/</ruri>
+			</request>
+			<request print-response="no">
+				<method>GETNEW</method>
+				<ruri>$notificationpath1:/</ruri>
+				<grabelement>
+					<name>{http://calendarserver.org/ns/}invite-notification/{http://calendarserver.org/ns/}uid</name>
+					<variable>$inviteuid:</variable>
+				</grabelement>
+			</request>
+			<description>user1 replies ACCEPTED and deletes notification</description>
+			<request print-response="no">
+				<method>POST</method>
+				<ruri>$addressbookhome1:/</ruri>
+				<data substitutions="yes">
+					<content-type>application/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/groups/7.xml</filepath>
+				</data>
+			</request>
+			<request>
+				<method>DELETE</method>
+				<ruri>$notificationpath1:/$inviteuid:</ruri>
+			</request>
+		</test>
+		<test name='1' ignore='no'>
+			<description>vCard with new UID shared read-write group can be added</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$addressbookhome1:/$userid2:/6.vcf</ruri>
+				<data>
+					<content-type>text/vcard; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/sharing/access/setup/6.vcf</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>New vCard is member of shared group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g123.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g1236.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>New vCard is member of shared group</description>
+			<request>
+				<method>GET</method>
+				<ruri>$addressbookhome1:/$userid2:/g345.vcf</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/access/setup/g3456.vcf</value>
+					</arg>
+				</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/20130729/ee828594/attachment-0001.html>


More information about the calendarserver-changes mailing list