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

[source_changes at macosforge.org]

Revision: 5795
          http://trac.macosforge.org/projects/calendarserver/changeset/5795
Author:   cdaboo at apple.com
Date:     2010-06-22 12:28:26 -0700 (Tue, 22 Jun 2010)
Log Message:
-----------
More regular collection fixes.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml	2010-06-21 21:16:20 UTC (rev 5794)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml	2010-06-22 19:28:26 UTC (rev 5795)
@@ -42,6 +42,10 @@
 	</start>
 	
 	<test-suite name='Empty Collection Delete' ignore='no'>
+		<require-feature>
+			<feature>regular-collection</feature>
+		</require-feature>
+
 		<test name='1'>
 			<description>Organizer creates collection</description>
 			<request print-response='no'>
@@ -83,6 +87,10 @@
 	</test-suite>
 	
 	<test-suite name='Simple Collection Delete' ignore='no'>
+		<require-feature>
+			<feature>regular-collection</feature>
+		</require-feature>
+
 		<test name='1'>
 			<description>Organizer creates collection</description>
 			<request print-response='no'>
@@ -427,6 +435,10 @@
 	</test-suite>
 	
 	<test-suite name='Invite Nested Calendar Delete' ignore='no'>
+		<require-feature>
+			<feature>regular-collection</feature>
+		</require-feature>
+
 		<test name='1'>
 			<description>Organizer creates collection</description>
 			<request print-response='no'>
@@ -630,6 +642,10 @@
 	</test-suite>
 	
 	<test-suite name='Multiple Nested Calendars Delete' ignore='no'>
+		<require-feature>
+			<feature>regular-collection</feature>
+		</require-feature>
+
 		<test name='1'>
 			<description>Organizer creates collections</description>
 			<request print-response='no'>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml	2010-06-21 21:16:20 UTC (rev 5794)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml	2010-06-22 19:28:26 UTC (rev 5795)
@@ -1,4 +1,4 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" standalone="no"?>
 
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
@@ -33,6 +33,10 @@
 			<request print-response="no">
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -43,6 +47,10 @@
 			<request print-response="no">
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
@@ -80,6 +88,10 @@
 			<request end-delete="no">
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/初日/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
@@ -90,6 +102,10 @@
 			<request print-response="no">
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/初日/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100622/abf1d866/attachment.html>