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

source_changes at macosforge.org source_changes at macosforge.org
Mon Nov 12 09:41:18 PST 2012


Revision: 10020
          http://trac.calendarserver.org//changeset/10020
Author:   gaya at apple.com
Date:     2012-11-12 09:41:18 -0800 (Mon, 12 Nov 2012)
Log Message:
-----------
Add tests for shadow group vcard in sharee address book

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

Added Paths:
-----------
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/main/11.vcf
    CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/group/9.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/group/9.vcf	2012-11-09 21:36:56 UTC (rev 10019)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/group/9.vcf	2012-11-12 17:41:18 UTC (rev 10020)
@@ -5,5 +5,5 @@
 FN:Empty Group
 N:Empty Group;;;;
 X-ADDRESSBOOKSERVER-KIND:group
-X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:760d9b28-5a13-4880-b7eb-5769e6688fa3
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
 END:VCARD

Added: CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/main/11.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/main/11.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/main/11.vcf	2012-11-12 17:41:18 UTC (rev 10020)
@@ -0,0 +1,12 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+UID:8ec61992-d3f4-45cc-b64a-b683c3ba3eff
+FN:addressbook
+N:addressbook;;;;
+X-ADDRESSBOOKSERVER-KIND:group
+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/addressbooks/read-write/9.vcf
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	                        (rev 0)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/Resource/CardDAV/sharing/addressbooks/read-write/9.vcf	2012-11-12 17:41:18 UTC (rev 10020)
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+UID:f5c48e9d-17bd-47cc-b35d-4c328d807a63
+FN:shared
+N:shared;;;;
+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
+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	2012-11-09 21:36:56 UTC (rev 10019)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-addressbooks.xml	2012-11-12 17:41:18 UTC (rev 10020)
@@ -297,6 +297,34 @@
 				</verify>
 			</request>
 		</test>
+		<test name='13' ignore='no'>
+			<description>Sharee sees shared group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedaddressbook:/shared</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/addressbooks/read-write/9.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='14' ignore='no'>
+			<description>Sharee cannot delete group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/shared</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'>
@@ -713,6 +741,34 @@
 				</verify>
 			</request>
 		</test>
+		<test name='12.1' ignore='no'>
+			<description>Sharee sees shared group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedaddressbook:/addressbook</ruri>
+				<verify>
+					<callback>addressDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CardDAV/sharing/addressbooks/main/11.vcf</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='12.2' ignore='no'>
+			<description>Sharee cannot delete group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/addressbook</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'>
@@ -905,7 +961,7 @@
 			</request>
 		</test>
 		<test name='6' ignore='no'>
-			<description>Shared address book exists</description>
+			<description>Sharee sees shared group as address book</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
@@ -936,6 +992,34 @@
 				</verify>
 			</request>
 		</test>
+		<test name='6a' ignore='no'>
+			<description>Sharee sees shared group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>GET</method>
+				<ruri>$sharedaddressbook:/3.vcf</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='no'>
+			<description>Sharee cannot delete group as vcard</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/3.vcf</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'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121112/63869b8e/attachment.html>


More information about the calendarserver-changes mailing list