[CalendarServer-changes] [11545] CalDAVTester/trunk/scripts/tests

source_changes at macosforge.org source_changes at macosforge.org
Mon Jul 22 18:11:06 PDT 2013


Revision: 11545
          http://trac.calendarserver.org//changeset/11545
Author:   gaya at apple.com
Date:     2013-07-22 18:11:06 -0700 (Mon, 22 Jul 2013)
Log Message:
-----------
add <test-suite name='Reshare after sharee DELETE shared calendar/addressbook' ignore='yes'>

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2013-07-22 19:56:16 UTC (rev 11544)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2013-07-23 01:11:06 UTC (rev 11545)
@@ -560,7 +560,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Sharee DELETE shared calender to unshare'>
+	<test-suite name='Reshare after sharee DELETE shared calendar' ignore='yes'>
 		<test name='0' ignore='no'>
 			<description>Sharee deletes calendar</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
@@ -599,7 +599,6 @@
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
-				<!--  ignore for now
 				<verify>
 					<callback>xmlDataMatch</callback>
 					<arg>
@@ -612,7 +611,6 @@
 						<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>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-07-22 19:56:16 UTC (rev 11544)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2013-07-23 01:11:06 UTC (rev 11545)
@@ -526,6 +526,115 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Reshare after sharee DELETE shared addressbook' ignore='yes'>
+		<test name='0' ignore='no'>
+			<description>Delete address book group</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>DELETE</method>
+				<ruri>$sharedaddressbook:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request user="$useradmin:" pswd="$pswdadmin:">
+				<method>DELETEALL</method>
+				<ruri>$notificationpath1:/</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/read-write/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Check sharee notification collection for and get invite uid </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/read-write/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/read-write/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/read-write/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-suite>
 	<end>
 		<request user="$useradmin:" pswd="$pswdadmin:">
 			<method>DELETEALL</method>
@@ -534,6 +643,7 @@
 			<ruri>$addressbookhome3:/</ruri>
 			<ruri>$addressbookhome4:/</ruri>
 			<ruri>$notificationpath1:/</ruri>
+			<ruri>$notificationpath2:/</ruri>
 		</request>
 	</end>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130722/14fa8a91/attachment.html>


More information about the calendarserver-changes mailing list