[CalendarServer-changes] [5761] CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml

source_changes at macosforge.org source_changes at macosforge.org
Wed Jun 16 18:02:09 PDT 2010


Revision: 5761
          http://trac.macosforge.org/projects/calendarserver/changeset/5761
Author:   cdaboo at apple.com
Date:     2010-06-16 18:02:08 -0700 (Wed, 16 Jun 2010)
Log Message:
-----------
Don't use child collection.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2010-06-17 00:20:35 UTC (rev 5760)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2010-06-17 01:02:08 UTC (rev 5761)
@@ -27,16 +27,12 @@
 
 	<start>
 		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$pathprefix1:/floating/</ruri>
-		</request>
-		<request>
 			<method>MKCALENDAR</method>
-			<ruri>$pathprefix1:/floating/calendar-none/</ruri>
+			<ruri>$pathprefix1:/calendar-none/</ruri>
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/1.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/1.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/1.txt</filepath>
@@ -44,7 +40,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/2.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/2.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/2.txt</filepath>
@@ -52,7 +48,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/3.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/3.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/3.txt</filepath>
@@ -60,7 +56,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/4.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/4.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/4.txt</filepath>
@@ -68,7 +64,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/5.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/5.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/5.txt</filepath>
@@ -76,7 +72,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/6.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/6.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/6.txt</filepath>
@@ -84,15 +80,15 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-none/7.ics</ruri>
+			<ruri>$pathprefix1:/calendar-none/7.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/7.txt</filepath>
 			</data>
 		</request>
-		<request>
+		<request end-delete="yes">
 			<method>MKCALENDAR</method>
-			<ruri>$pathprefix1:/floating/calendar-us/</ruri>
+			<ruri>$pathprefix1:/calendar-us/</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/8.txt</filepath>
@@ -100,7 +96,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/1.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/1.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/1.txt</filepath>
@@ -108,7 +104,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/2.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/2.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/2.txt</filepath>
@@ -116,7 +112,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/3.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/3.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/3.txt</filepath>
@@ -124,7 +120,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/4.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/4.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/4.txt</filepath>
@@ -132,7 +128,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/5.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/5.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/5.txt</filepath>
@@ -140,7 +136,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/6.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/6.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/6.txt</filepath>
@@ -148,7 +144,7 @@
 		</request>
 		<request>
 			<method>PUT</method>
-			<ruri>$pathprefix1:/floating/calendar-us/7.ics</ruri>
+			<ruri>$pathprefix1:/calendar-us/7.ics</ruri>
 			<data>
 				<content-type>text/calendar; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/floating/put/7.txt</filepath>
@@ -161,7 +157,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-none/</ruri>
+				<ruri>$pathprefix1:/calendar-none/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/1.txt</filepath>
@@ -170,7 +166,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-none/</value>
+						<value>$pathprefix1:/calendar-none/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -186,7 +182,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-none/</ruri>
+				<ruri>$pathprefix1:/calendar-none/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/2.txt</filepath>
@@ -195,7 +191,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-none/</value>
+						<value>$pathprefix1:/calendar-none/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -210,7 +206,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-none/</ruri>
+				<ruri>$pathprefix1:/calendar-none/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/3.txt</filepath>
@@ -219,7 +215,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-none/</value>
+						<value>$pathprefix1:/calendar-none/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -239,7 +235,7 @@
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-us/</ruri>
+				<ruri>$pathprefix1:/calendar-us/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/1.txt</filepath>
@@ -248,7 +244,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-us/</value>
+						<value>$pathprefix1:/calendar-us/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -264,7 +260,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-us/</ruri>
+				<ruri>$pathprefix1:/calendar-us/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/1.txt</filepath>
@@ -273,7 +269,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-us/</value>
+						<value>$pathprefix1:/calendar-us/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -289,7 +285,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-us/</ruri>
+				<ruri>$pathprefix1:/calendar-us/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/2.txt</filepath>
@@ -298,7 +294,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/calendar-us/</value>
+						<value>$pathprefix1:/calendar-us/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -316,7 +312,7 @@
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/</ruri>
+				<ruri>$pathprefix1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -329,7 +325,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/</value>
+						<value>$pathprefix1:/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -349,7 +345,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/</ruri>
+				<ruri>$pathprefix1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -362,7 +358,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/</value>
+						<value>$pathprefix1:/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -382,7 +378,7 @@
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/</ruri>
+				<ruri>$pathprefix1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -395,7 +391,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/</value>
+						<value>$pathprefix1:/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -416,7 +412,7 @@
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/</ruri>
+				<ruri>$pathprefix1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -429,7 +425,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>prefix</name>
-						<value>$pathprefix1:/floating/</value>
+						<value>$pathprefix1:/</value>
 					</arg>
 					<arg>
 						<name>okhrefs</name>
@@ -450,7 +446,7 @@
 			<description>free-busy on collection without timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-none/</ruri>
+				<ruri>$pathprefix1:/calendar-none/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -478,7 +474,7 @@
 			<description>free-busy on collection with timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/calendar-us/</ruri>
+				<ruri>$pathprefix1:/calendar-us/</ruri>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/floating/5.txt</filepath>
@@ -502,7 +498,7 @@
 			<description>free-busy on multiple collections with/without timezone</description>
 			<request print-response='no'>
 				<method>REPORT</method>
-				<ruri>$pathprefix1:/floating/</ruri>
+				<ruri>$pathprefix1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100616/ec9c31c2/attachment-0001.html>


More information about the calendarserver-changes mailing list