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

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 13 15:22:15 PDT 2013


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

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-feature.xml
    CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-peruser-properties.xml

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-feature.xml	2013-03-13 22:06:01 UTC (rev 10910)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-feature.xml	2013-03-13 22:22:15 UTC (rev 10911)
@@ -84,16 +84,12 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Upgrade addressbook to shared' ignore='yes'>
+	<test-suite name='Upgrade addressbook to shared' ignore='no'>
 		<test name='1'>
-			<description>Create new addressbook</description>
-			<request end-delete="yes">
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
+			<description>clear addressbook</description>
+			<request>
+				<method>DELETE</method>
+				<ruri>$addressbookpath1:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -103,7 +99,7 @@
 			<description>Not shared</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -125,7 +121,7 @@
 			<description>Upgrade via PROPPATCH</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared1/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/feature/upgrade_collection/1.xml</filepath>

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-peruser-properties.xml	2013-03-13 22:06:01 UTC (rev 10910)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/scripts/tests/CardDAV/sharing-peruser-properties.xml	2013-03-13 22:22:15 UTC (rev 10911)
@@ -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='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 +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>
@@ -168,12 +155,12 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='prop patches - non-global' ignore='yes'>
+	<test-suite name='prop patches - non-global' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PROPPATCH of displayname</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/peruser-properties/nonglobal/1.xml</filepath>
@@ -188,7 +175,7 @@
 			</request>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -269,7 +256,7 @@
 			<description>PROPFIND of shared displayname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -289,12 +276,12 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='prop patches - shadowable' ignore='yes'>
+	<test-suite name='prop patches - shadowable' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>PROPPATCH of addressbook-description</description>
 			<request print-response='no'>
 				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/peruser-properties/shadowable/1.xml</filepath>
@@ -309,7 +296,7 @@
 			</request>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
@@ -390,7 +377,7 @@
 			<description>PROPFIND of shared addressbook-description</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/shared/</ruri>
+				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130313/523c9c3f/attachment-0001.html>


More information about the calendarserver-changes mailing list