[CalendarServer-changes] [5013] CalDAVTester/trunk/scripts/tests/CalDAV

source_changes at macosforge.org source_changes at macosforge.org
Tue Feb 2 11:49:21 PST 2010


Revision: 5013
          http://trac.macosforge.org/projects/calendarserver/changeset/5013
Author:   cdaboo at apple.com
Date:     2010-02-02 11:49:20 -0800 (Tue, 02 Feb 2010)
Log Message:
-----------
More fine-grained server feature handling.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/get.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -22,6 +22,7 @@
 	<description>Test ACLs on the server</description>
 
 	<require-feature>
+		<feature>ACL Method</feature>
 		<feature>caldav</feature>
 	</require-feature>
 

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -69,6 +69,11 @@
 	</start>
 	
 	<test-suite name='acl-principal-prop-set REPORT' ignore='no'>
+
+		<require-feature>
+			<feature>acl-principal-prop-set REPORT</feature>
+		</require-feature>
+
 		<test name='1' ignore='no'>
 			<description>Wrong Depth</description>
 			<request print-response='no'>
@@ -199,6 +204,11 @@
 	</test-suite>
 	
 	<test-suite name='principal-match REPORT' ignore='no'>
+
+		<require-feature>
+			<feature>principal-match REPORT</feature>
+		</require-feature>
+
 		<test name='1' ignore='no'>
 			<description>Wrong Depth</description>
 			<request print-response='no'>
@@ -256,6 +266,7 @@
 					<callback>statusCode</callback>
 					<arg>
 						<name>status</name>
+						<value>400</value>
 						<value>500</value>
 					</arg>
 				</verify>
@@ -362,6 +373,11 @@
 	</test-suite>
 
 	<test-suite name='principal-property-search REPORT' ignore='no'>
+
+		<require-feature>
+			<feature>principal-property-search REPORT</feature>
+		</require-feature>
+
 		<test name='1' ignore='no'>
 			<description>Wrong Depth</description>
 			<request print-response='no'>
@@ -507,6 +523,7 @@
 	</test-suite>
 
 	<test-suite name='Extended principal-property-search REPORT' ignore='no'>
+
 		<require-feature>
 			<feature>extended-principal-search</feature>
 		</require-feature>
@@ -809,6 +826,11 @@
 	</test-suite>
 	
 	<test-suite name='principal-search-property-set REPORT' ignore='no'>
+
+		<require-feature>
+			<feature>principal-search-property-set REPORT</feature>
+		</require-feature>
+
 		<test name='1' ignore='no'>
 			<description>Wrong Depth</description>
 			<request print-response='no'>
@@ -895,6 +917,7 @@
 	</test-suite>
 	
 	<test-suite name='supported-report-set property' ignore='no'>
+
 		<test name='1' ignore='no'>
 			<description>Regular resource</description>
 			<request print-response='no'>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -106,6 +106,11 @@
 	</start>
 	
 	<test-suite name='COPY'>
+
+		<require-feature>
+			<feature>COPY Method</feature>
+		</require-feature>
+
 		<test name='1' ignore='no'>
 			<description>COPY within same calendar to new resource</description>
 			<request print-response="no">
@@ -300,6 +305,11 @@
 	</test-suite>
 	
 	<test-suite name='MOVE' ignore='no'>
+
+		<require-feature>
+			<feature>MOVE Method</feature>
+		</require-feature>
+
 		<test name='1'>
 			<description>MOVE within same calendar to new resource</description>
 			<request>
@@ -428,6 +438,12 @@
 	</test-suite>
 	
 	<test-suite name='COPY/MOVE and Properties' ignore='no'>
+
+		<require-feature>
+			<feature>COPY Method</feature>
+			<feature>MOVE Method</feature>
+		</require-feature>
+
 		<test name='1' ignore="yes">
 			<description>Verify that COPY'ing a calendar preserves the calendar resource type</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -213,6 +213,9 @@
 			</request>
 		</test>
 		<test name='6'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>Check for CTag change on MOVE of new resource</description>
 			<request>
 				<method>MOVE</method>
@@ -270,6 +273,9 @@
 			</request>
 		</test>
 		<test name='7'>
+			<require-feature>
+				<feature>COPY Method</feature>
+			</require-feature>
 			<description>Check for CTag change on COPY of new resource</description>
 			<request>
 				<method>COPY</method>
@@ -323,6 +329,9 @@
 			</request>
 		</test>
 		<test name='8'>
+			<require-feature>
+				<feature>COPY Method</feature>
+			</require-feature>
 			<description>Check for CTag change on COPY of existing resource</description>
 			<request>
 				<method>COPY</method>
@@ -376,6 +385,9 @@
 			</request>
 		</test>
 		<test name='9'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>Check for CTag change on MOVE of existing resource</description>
 			<request>
 				<method>MOVE</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -20,6 +20,7 @@
 
 <caldavtest>
 	<require-feature>
+		<feature>ACL Method</feature>
 		<feature>caldav</feature>
 	</require-feature>
 

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -23,6 +23,7 @@
 
 	<require-feature>
 		<feature>caldav</feature>
+		<feature>directory listing</feature>
 	</require-feature>
 
 	<start/>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -62,6 +62,9 @@
 		</test>
 
 		<test name='2'>
+			<require-feature>
+				<feature>COPY Method</feature>
+			</require-feature>
 			<description>COPY</description>
 			<request print-response='no' end-delete='yes'>
 				<method>COPY</method>
@@ -109,6 +112,9 @@
 			</request>
 		</test>
 		<test name='3'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>MOVE</description>
 			<request print-response='no' end-delete='yes'>
 				<method>MOVE</method>
@@ -227,6 +233,9 @@
 			</request>
 		</test>
 		<test name='4'>
+			<require-feature>
+				<feature>COPY Method</feature>
+			</require-feature>
 			<description>COPY</description>
 			<request print-response='no' end-delete='yes'>
 				<method>COPY</method>
@@ -274,6 +283,9 @@
 			</request>
 		</test>
 		<test name='5'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>MOVE</description>
 			<request print-response='no' end-delete='yes'>
 				<method>MOVE</method>
@@ -321,6 +333,9 @@
 			</request>
 		</test>
 		<test name='6'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>multiget REPORT on encoded calendar collection path</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -342,6 +357,9 @@
 			</request>
 		</test>
 		<test name='7'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>multiget REPORT on encoded calendar resource path</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -363,6 +381,9 @@
 			</request>
 		</test>
 		<test name='8'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>multiget REPORT on encoded collection path</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -384,6 +405,9 @@
 			</request>
 		</test>
 		<test name='9'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>query REPORT on encoded calendar path</description>
 			<request print-response='no'>
 				<method>REPORT</method>
@@ -405,6 +429,9 @@
 			</request>
 		</test>
 		<test name='10'>
+			<require-feature>
+				<feature>MOVE Method</feature>
+			</require-feature>
 			<description>free-busy REPORT on encoded calendar path</description>
 			<request print-response='no'>
 				<method>REPORT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -469,6 +469,9 @@
 	</test-suite>
 	
 	<test-suite name='COPY' ignore='no'>
+		<require-feature>
+			<feature>COPY Method</feature>
+		</require-feature>
 		<test name='1'>
 			<description>COPY non-calendar data</description>
 			<request>
@@ -707,6 +710,9 @@
 	</test-suite>
 	
 	<test-suite name='MOVE' ignore='no'>
+		<require-feature>
+			<feature>MOVE Method</feature>
+		</require-feature>
 		<test name='1'>
 			<description>MOVE non-calendar data</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-02-02 19:20:10 UTC (rev 5012)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2010-02-02 19:49:20 UTC (rev 5013)
@@ -82,6 +82,9 @@
 	</test-suite>
 	
 	<test-suite name='GET on collections'>
+		<require-feature>
+			<feature>directory listing</feature>
+		</require-feature>
 		<test name='1'>
 			<description>GET on calendar collection</description>
 			<request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100202/4fa02104/attachment-0001.html>


More information about the calendarserver-changes mailing list