[CalendarServer-changes] [10912] CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/ CardDAV

[source_changes at macosforge.org]

Revision: 10912
          http://trac.calendarserver.org//changeset/10912
Author:   gaya at apple.com
Date:     2013-03-13 15:25:06 -0700 (Wed, 13 Mar 2013)
Log Message:
-----------
fix

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-replies.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-unshare.xml

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-replies.xml	2013-03-13 22:22:15 UTC (rev 10911)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-replies.xml	2013-03-13 22:25:06 UTC (rev 10912)
@@ -35,27 +35,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-<!--
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
--->
 	</start>
 	
-	<test-suite name='Send first reply' ignore='yes'>
+	<test-suite name='Send first reply' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/replies/accept/1.xml</filepath>
@@ -122,7 +109,7 @@
 			<description>Check accept status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -193,7 +180,7 @@
 			<description>Check sharer addressbook displyname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -213,7 +200,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Update reply' ignore='yes'>
+	<test-suite name='Update reply' ignore='no'>
 		<test name='1'>
 			<description>Sharee replies DECLINED</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
@@ -232,7 +219,7 @@
 			<description>Check declined status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-unshare.xml	2013-03-13 22:22:15 UTC (rev 10911)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-unshare.xml	2013-03-13 22:25:06 UTC (rev 10912)
@@ -28,6 +28,10 @@
 
 	<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>
@@ -35,27 +39,14 @@
 			<method>DELETEALL</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-<!--
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$addressbookhome1:/shared/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-			</data>
-			<verify>
-				<callback>statusCode</callback>
-			</verify>
-		</request>
--->
 	</start>
 	
-	<test-suite name='Set up share' ignore='yes'>
+	<test-suite name='Set up share' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>POST invitation</description>
 			<request print-response='no'>
 				<method>POST</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/1.xml</filepath>
@@ -122,7 +113,7 @@
 			<description>Check accept status</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -168,12 +159,12 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete' ignore='yes'>
+	<test-suite name='Delete' ignore='no'>
 		<test name='1'>
 			<description>Sharer adds event</description>
 			<request print-response='no'>
 				<method>PUT</method>
-				<ruri>$addressbookhome1:/shared/1.vcf</ruri>
+				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/unshare/shareedelete/1.vcf</filepath>
@@ -223,7 +214,7 @@
 			<description>Sharer still has addressbook data</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130313/8d185fb6/attachment.html>