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

source_changes at macosforge.org source_changes at macosforge.org
Sat Nov 15 08:43:04 PST 2014


Revision: 14176
          http://trac.calendarserver.org//changeset/14176
Author:   cdaboo at apple.com
Date:     2014-11-15 08:43:04 -0800 (Sat, 15 Nov 2014)
Log Message:
-----------
Add basic freebusy-URL test.

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

Added Paths:
-----------
    CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-11-15 16:09:33 UTC (rev 14175)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-11-15 16:43:04 UTC (rev 14176)
@@ -85,6 +85,7 @@
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
+		<feature>freebusy-url</feature>	      			<!-- Freebusy URL -->
 		<feature>group-attendee-expansion</feature>	    <!-- Auto-expansion of group attendees -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-11-15 16:09:33 UTC (rev 14175)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-11-15 16:43:04 UTC (rev 14176)
@@ -80,6 +80,7 @@
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
+		<feature>freebusy-url</feature>	      			<!-- Freebusy URL -->
 		<feature>group-attendee-expansion</feature>	    <!-- Auto-expansion of group attendees -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-11-15 16:09:33 UTC (rev 14175)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-11-15 16:43:04 UTC (rev 14176)
@@ -80,6 +80,7 @@
 		<feature>default-alarms</feature>				<!-- default alarms extension -->
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
+		<feature>freebusy-url</feature>	      			<!-- Freebusy URL -->
 		<feature>group-attendee-expansion</feature>	    <!-- Auto-expansion of group attendees -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->

Added: CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml	2014-11-15 16:43:04 UTC (rev 14176)
@@ -0,0 +1,103 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2014 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 freebusy URL in CalDAV</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>freebusy-url</feature>
+	</require-feature>
+
+	<start>
+		<request user="$userid1:" pswd="$pswd1:">
+			<method>DELETEALL</method>
+			<ruri>$calendarpath1:/</ruri>
+			<ruri>$inboxpath1:/</ruri>
+		</request>
+		<request user="$userid2:" pswd="$pswd2:">
+			<method>DELETEALL</method>
+			<ruri>$calendarpath2:/</ruri>
+			<ruri>$inboxpath2:/</ruri>
+		</request>
+	</start>
+	
+	<test-suite name='Freebusy - mixed timed and all-day'>
+		<test name='1'>
+			<description>PUT timed event</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/freebusy/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PUT all-day event</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/freebusy/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>GET free busy</description>
+			<request>
+				<method>GET</method>
+				<ruri>$freebusypath1:/</ruri>
+				<verify>
+					<callback>freeBusy</callback>
+					<arg>
+						<name>busy</name>
+						<value>$now.0:T000000Z/$now.1:T000000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>GET free busy - again from cache</description>
+			<request>
+				<method>GET</method>
+				<ruri>$freebusypath1:/</ruri>
+				<verify>
+					<callback>freeBusy</callback>
+					<arg>
+						<name>busy</name>
+						<value>$now.0:T000000Z/$now.1:T000000Z</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141115/3e5589fa/attachment-0001.html>


More information about the calendarserver-changes mailing list