[CalendarServer-changes] [4890] CalDAVTester/trunk/scripts

source_changes at macosforge.org source_changes at macosforge.org
Wed Dec 23 11:08:11 PST 2009


Revision: 4890
          http://trac.macosforge.org/projects/calendarserver/changeset/4890
Author:   cdaboo at apple.com
Date:     2009-12-23 11:08:08 -0800 (Wed, 23 Dec 2009)
Log Message:
-----------
Test /.well-known/caldav feature.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/server/sslserverinfo.xml

Added Paths:
-----------
    CalDAVTester/trunk/scripts/tests/well-known.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2009-12-22 22:03:06 UTC (rev 4889)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2009-12-23 19:08:08 UTC (rev 4890)
@@ -32,6 +32,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
+		<feature>partitioning</feature>					<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
@@ -39,7 +40,7 @@
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
-		<feature>partitioning</feature>					<!-- Partitioned server -->
+		<feature>well-known</feature>					<!-- well-known feature -->
 	</features>
 
 	<substitutions>

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2009-12-22 22:03:06 UTC (rev 4889)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2009-12-23 19:08:08 UTC (rev 4890)
@@ -32,6 +32,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
+		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
@@ -39,7 +40,7 @@
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
-		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
+		<feature>well-known</feature>					<!-- well-known feature -->
 	</features>
 
 	<substitutions>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2009-12-22 22:03:06 UTC (rev 4889)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2009-12-23 19:08:08 UTC (rev 4890)
@@ -32,6 +32,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
+		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
@@ -39,7 +40,7 @@
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
-		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
+		<feature>well-known</feature>					<!-- well-known feature -->
 	</features>
 
 	<substitutions>

Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2009-12-22 22:03:06 UTC (rev 4889)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml	2009-12-23 19:08:08 UTC (rev 4890)
@@ -33,6 +33,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
+		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
@@ -40,7 +41,7 @@
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
 		<feature>timezone-service</feature>				<!-- Timezone service extension -->
 		<feature>vavailability</feature>				<!-- VAVAILABILITY on inbox -->
-		<!-- <feature>partitioning</feature>  -->		<!-- Partitioned server -->
+		<feature>well-known</feature>					<!-- well-known feature -->
 	</features>
 
 	<substitutions>

Added: CalDAVTester/trunk/scripts/tests/well-known.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/well-known.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/well-known.xml	2009-12-23 19:08:08 UTC (rev 4890)
@@ -0,0 +1,178 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+	<description>Test the well-known collection</description>
+
+	<require-feature>
+		<feature>well-known</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='Simple GET tests'>
+		<test name='1'>
+			<description>Simple GET on top-level authenticated</description>
+			<request>
+				<method>GET</method>
+				<ruri>/.well-known/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Simple GET on top-level unauthenticated</description>
+			<request auth='no'>
+				<method>GET</method>
+				<ruri>/.well-known/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Simple GET on caldav authenticated</description>
+			<request>
+				<method>GET</method>
+				<ruri>/.well-known/caldav/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$host:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Simple GET on caldav unauthenticated</description>
+			<request auth='no'>
+				<method>GET</method>
+				<ruri>/.well-known/caldav/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$host:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Simple PROPFIND tests'>
+		<test name='1'>
+			<description>Simple PROPFIND on top-level authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Simple PROPFIND on top-level unauthenticated</description>
+			<request auth='no'>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>Simple PROPFIND on caldav authenticated</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/caldav/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$host:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Simple PROPFIND on caldav unauthenticated</description>
+			<request auth='no'>
+				<method>PROPFIND</method>
+				<ruri>/.well-known/caldav/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>301</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Location$$host:/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091223/dd7d1195/attachment-0001.html>


More information about the calendarserver-changes mailing list