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

source_changes at macosforge.org source_changes at macosforge.org
Fri Oct 27 17:08:59 PDT 2006 

Revision: 333
          http://trac.macosforge.org/projects/calendarserver/changeset/333
Author:   cdaboo at apple.com
Date:     2006-10-27 17:08:59 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
Get rid of SCHEDULE method tests, and add a test to verify that SCHEDULE is no longer supported.

Added Paths:
-----------
    CalDAVTester/trunk/scripts/tests/schedulenomore.xml

Removed Paths:
-------------
    CalDAVTester/trunk/scripts/tests/schedule.xml
    CalDAVTester/trunk/scripts/tests/scheduleacl.xml
    CalDAVTester/trunk/scripts/tests/scheduleauto.xml
    CalDAVTester/trunk/scripts/tests/schedulenormal.xml

Deleted: CalDAVTester/trunk/scripts/tests/schedule.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedule.xml	2006-10-28 00:00:51 UTC (rev 332)
+++ CalDAVTester/trunk/scripts/tests/schedule.xml	2006-10-28 00:08:59 UTC (rev 333)
@@ -1,727 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006 Apple Computer, 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.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
-	<description>Test SCHEDULE method in CalDAV</description>
-
-	<start>
-		<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
-			<method>PUT</method>
-			<ruri>$pathprefix2:/calendar/1.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/schedule/7.ics</filepath>
-			</data>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
-			<method>PUT</method>
-			<ruri>$pathprefix2:/calendar/2.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/schedule/8.ics</filepath>
-			</data>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
-			<method>PUT</method>
-			<ruri>$pathprefix2:/calendar/3.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/schedule/10.ics</filepath>
-			</data>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
-			<method>PUT</method>
-			<ruri>$pathprefix3:/calendar/1.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/schedule/9.ics</filepath>
-			</data>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:" end-delete="yes">
-			<method>PUT</method>
-			<ruri>$pathprefix3:/calendar/2.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/schedule/10.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/outbox/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/outbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/inbox/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix3:/outbox/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix3:/inbox/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='SCHEDULE Errors' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>SCHEDULE on invalid outbox</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Organizer</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavsupported-collection</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>SCHEDULE with invalid content</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Organizer</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavsupported-calendar-data</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>SCHEDULE with invalid calendar data</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/1.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>SCHEDULE without METHOD property</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/2.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5'>
-			<description>SCHEDULE with invalid iTIP object</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/5.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavvalid-calendar-data</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>SCHEDULE without Originator:</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator-specified</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>SCHEDULE with non-authorized Originator:</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01-bogus at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>SCHEDULE without Recipient:</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavrecipient-specified</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='9' ignore='no'>
-			<description>SCHEDULE with non-authorized Organizer:</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/4.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavorganizer-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='10' ignore='no'>
-			<description>SCHEDULE reply with too many Attendees:</description>
-			<request user="$userid2:" pswd="$pswd2:">
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user02 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<ruri>$pathprefix2:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/17.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavattendee-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='11' ignore='no'>
-			<description>SCHEDULE reply with non-authorized Attendee:</description>
-			<request user="$userid2:" pswd="$pswd2:">
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user02 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<ruri>$pathprefix2:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/18.txt</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>urn:ietf:params:xml:ns:caldavattendee-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name="SCHEDULEs" ignore='no'>
-		<test name='1'>
-			<description>SCHEDULE which should work</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
-					</arg>
-				</verify>
-				<grablocation/>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Make sure resource exists and properties are set</description>
-			<request print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<ruri>$</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/11.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;mailto:user01 at example.com&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;mailto:user02 at example.com&lt;/href&gt;&lt;href xmlns="DAV:"&gt;mailto:user03 at example.com&lt;/href&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/12.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>ignore</name>
-						<value>$pathprefix2:/inbox/</value>
-					</arg>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;mailto:user01 at example.com&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;mailto:user02 at example.com&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavschedule-state$&lt;not-processed/&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>Make sure resource exists and properties are set</description>
-			<request  user="$userid3:" pswd="$pswd3:" print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<ruri>$pathprefix3:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/12.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>ignore</name>
-						<value>$pathprefix3:/inbox/</value>
-					</arg>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;mailto:user01 at example.com&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;mailto:user03 at example.com&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavschedule-state$&lt;not-processed/&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5'>
-			<description>SCHEDULE which should work (using relative principal addressing)</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, $principal3:</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
-					</arg>
-				</verify>
-				<grablocation/>
-			</request>
-		</test>
-		<test name='6'>
-			<description>SCHEDULE which should work (using absolute principal addressing)</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>$host:/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>$host:/principals/users/user02, $host:$principal3:</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/3.txt</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
-					</arg>
-				</verify>
-				<grablocation/>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name="Reports on Inbox/Outbox" ignore='no'>
-		<test name='1'>
-			<description>Simple calendar-query for VEVENTs</description>
-			<request print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/13.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>207</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Simple calendar-query for VEVENTs</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/13.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>207</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>Simple calendar-multiget for VEVENTs</description>
-			<request print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data substitutions='yes'>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/14.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>badhrefs</name>
-						<value>1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>Simple calendar-multiget for VEVENTs</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/15.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>prefix</name>
-						<value/>
-					</arg>
-					<arg>
-						<name>badhrefs</name>
-						<value>$pathprefix:/inbox/1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5'>
-			<description>free-busy-query failure</description>
-			<request print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/16.xml</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>DAV:supported-report</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6'>
-			<description>free-busy-query failure</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>REPORT</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedule/16.xml</filepath>
-				</data>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>DAV:supported-report</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name="SCHEDULEs free busy" ignore='no'>
-		<test name='1'>
-			<description>SCHEDULE free busy</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/6.txt</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>dataString</callback>
-					<arg>
-						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T2
- 20000Z/PT1H</value>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>SCHEDULE free busy - recipients with failure</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:broken at example.com, mailto:user03 at example.com</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedule/6.txt</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>dataString</callback>
-					<arg>
-						<name>contains</name>
-						<value><![CDATA[<recipient-exists xmlns='urn:ietf:params:xml:ns:caldav'/>]]></value>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<end/>
-	
-</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/scheduleacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleacl.xml	2006-10-28 00:00:51 UTC (rev 332)
+++ CalDAVTester/trunk/scripts/tests/scheduleacl.xml	2006-10-28 00:08:59 UTC (rev 333)
@@ -1,285 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006 Apple Computer, 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.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
-	<start>
-		<request end-delete="yes">
-			<method>MKCOL</method>
-			<ruri>$pathprefix:/top-collection/</ruri>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/1.xml</filepath>
-			</data>
-		</request>
-		<!--  Calendar with DAV:read only -->
-		<request>
-			<method>MKCALENDAR</method>
-			<ruri>$pathprefix:/top-collection/calendar1/</ruri>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar1/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/1.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar1/1.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal1.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar1/1.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/1.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with no privileges -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar1/2.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal2.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar1/2.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/2.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read-free-busy only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar1/3.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal3.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar1/3.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/3.xml</filepath>
-			</data>
-		</request>
-		<!--  Calendar with no privileges -->
-		<request>
-			<method>MKCALENDAR</method>
-			<ruri>$pathprefix:/top-collection/calendar2/</ruri>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar2/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/2.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar2/1.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal4.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar2/1.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/1.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with no privileges -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar2/2.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal5.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar2/2.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/2.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read-free-busy only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar2/3.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal6.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar2/3.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/3.xml</filepath>
-			</data>
-		</request>
-		<!--  Calendar with CALDAV:read-free-busy only -->
-		<request>
-			<method>MKCALENDAR</method>
-			<ruri>$pathprefix:/top-collection/calendar3/</ruri>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar3/</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/3.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar3/1.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal7.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar3/1.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/1.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with no privileges -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar3/2.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal8.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar3/2.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/2.xml</filepath>
-			</data>
-		</request>
-		<!--  Event with DAV:read-free-busy only -->
-		<request>
-			<method>PUT</method>
-			<ruri>$pathprefix:/top-collection/calendar3/3.ics</ruri>
-			<data>
-				<content-type>text/calendar; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/cal9.ics</filepath>
-			</data>
-		</request>
-		<request>
-			<method>ACL</method>
-			<ruri>$pathprefix:/top-collection/calendar3/3.ics</ruri>
-			<data>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/depthreportsacl/3.xml</filepath>
-			</data>
-		</request>
-		<!--  Set calendar-free-busy-set to the calendars only -->
-		<request>
-			<method>PROPPATCH</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-			<data substitutions='yes'>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/scheduleacl/1.xml</filepath>
-			</data>
-		</request>
-	</start>
-	
-	<test-suite name='Schedule free-busy' ignore='no'>
-		<test name='1'>
-			<description>SCHEDULE free busy</description>
-			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>mailto:user02 at example.com</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>mailto:user01 at example.com</value>
-				</header>
-				<ruri>$pathprefix2:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleacl/3.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>dataString</callback>
-					<arg>
-						<name>contains</name>
-						<value>FREEBUSY;FBTYPE=BUSY:20060101T060000Z/PT1H,20060101T100000Z/PT1H,20060101T1
- 80000Z/PT1H,20060101T220000Z/PT1H</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<!--  Set calendar-free-busy-set back to default -->
-		<request>
-			<method>PROPPATCH</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-			<data substitutions='yes'>
-				<content-type>text/xml; charset=utf-8</content-type>
-				<filepath>Resource/scheduleacl/2.xml</filepath>
-			</data>
-		</request>
-	</end>
-	
-</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/scheduleauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/scheduleauto.xml	2006-10-28 00:00:51 UTC (rev 332)
+++ CalDAVTester/trunk/scripts/tests/scheduleauto.xml	2006-10-28 00:08:59 UTC (rev 333)
@@ -1,1177 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006 Apple Computer, 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.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
-	<description>Test SCHEDULE method in CalDAV</description>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/outbox/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/outbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/inbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/outbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/inbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/calendar/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name='SCHEDULE non-recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/1.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/2.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/3.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/3.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name='Update to previous request - no auto-reply' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/5.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>One item in resource01 Inbox (old one deleted)</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='Repeat request - no auto-reply' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/4.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/5.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='8' ignore='no'>
-			<description>One item in resource01 Inbox (old one deleted)</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='SCHEDULE non-recurring with conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/7.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/7.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/7.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/7.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/8.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/8.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='SCHEDULE recurring with conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/9.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/9.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/9.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/9.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/10.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/10.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='SCHEDULE recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/11.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/11.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/11.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/11.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/12.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/13.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/13.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-	
-	<test-suite name='SCHEDULE non-recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/14.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/14.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/15.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/15.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='SCHEDULE recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/16.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/16.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/16.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/16.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>2</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/17.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/17.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='SCHEDULE cancel non-recurring' ignore='no'>
-		<test name='1' ignore='no'>
-			<description>Do SCHEDULE</description>
-			<request>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, /principals/users/resource01</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/18.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>6</ruri>
-			</request>
-		</test>
-		<test name='2' ignore='no'>
-			<description>One item in user01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3' ignore='no'>
-			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4' ignore='no'>
-			<description>One item in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>GETNEW</method>
-				<ruri>/calendars/users/resource01/inbox/</ruri>
-				<verify>
-					<callback>dataMatch</callback>
-					<arg>
-						<name>filepath</name>
-						<value>Resource/scheduleauto/18.ics</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5' ignore='no'>
-			<description>Two items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/calendar/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/scheduleauto/6.xml</filepath>
-				</data>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>1</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='6' ignore='no'>
-			<description>One item in resource01 Outbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>/calendars/users/resource01/outbox/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>6</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='7' ignore='no'>
-			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
-				<method>PROPFIND</method>
-				<ruri>$pathprefix:/inbox/</ruri>
-				<verify>
-					<callback>multistatusItems</callback>
-					<arg>
-						<name>count</name>
-						<value>6</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/outbox/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/outbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/inbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/outbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/inbox/</ruri>
-		</request>
-		<request user="$useradmin:" pswd="$pswdadmin:">
-			<method>DELETEALL</method>
-			<ruri>/calendars/users/resource01/calendar/</ruri>
-		</request>
-	</end>
-	
-</caldavtest>

Added: CalDAVTester/trunk/scripts/tests/schedulenomore.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulenomore.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/schedulenomore.xml	2006-10-28 00:08:59 UTC (rev 333)
@@ -0,0 +1,59 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006 Apple Computer, 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.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest>
+	<description>Test SCHEDULE method no longer in CalDAV</description>
+
+	<start/>
+	
+	<test-suite name='SCHEDULE Fails' ignore='no'>
+		<test name='1' ignore='no'>
+			<description>SCHEDULE on valid outbox</description>
+			<request>
+				<method>SCHEDULE</method>
+				<header>
+					<name>Organizer</name>
+					<value>mailto:user01 at example.com</value>
+				</header>
+				<header>
+					<name>Recipient</name>
+					<value>mailto:user02 at example.com, mailto:user03 at example.com</value>
+				</header>
+				<ruri>$pathprefix:/outbox/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/schedule/3.txt</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>405</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<end/>
+	
+</caldavtest>

Deleted: CalDAVTester/trunk/scripts/tests/schedulenormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulenormal.xml	2006-10-28 00:00:51 UTC (rev 332)
+++ CalDAVTester/trunk/scripts/tests/schedulenormal.xml	2006-10-28 00:08:59 UTC (rev 333)
@@ -1,197 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006 Apple Computer, 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.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
-	<description>Test normal SCHEDULE operations in CalDAV</description>
-
-	<start>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/outbox/</ruri>
-		</request>
-		<request>
-			<method>DELETEALL</method>
-			<ruri>$pathprefix:/inbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/outbox/</ruri>
-		</request>
-		<request user="$userid2:" pswd="$pswd2:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix2:/inbox/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix3:/outbox/</ruri>
-		</request>
-		<request user="$userid3:" pswd="$pswd3:">
-			<method>DELETEALL</method>
-			<ruri>$pathprefix3:/inbox/</ruri>
-		</request>
-	</start>
-	
-	<test-suite name="SCHEDULEs" ignore='no'>
-		<test name='1'>
-			<description>Initial REQUEST</description>
-			<request print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user02, $principal3:</value>
-				</header>
-				<ruri>$pathprefix:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedulenormal/1.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
-					</arg>
-				</verify>
-				<grablocation/>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Make sure resource exists and properties are set</description>
-			<request print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<ruri>$</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedulenormal/2.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;$principal:&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;$principal2:&lt;/href&gt;&lt;href xmlns="DAV:"&gt;$principal3:&lt;/href&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<ruri>$pathprefix2:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedulenormal/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>ignore</name>
-						<value>$pathprefix2:/inbox/</value>
-					</arg>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;$principal:&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;$principal2:&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavschedule-state$&lt;not-processed/&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>1</value>
-				</header>
-				<ruri>$pathprefix3:/inbox/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/schedulenormal/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>ignore</name>
-						<value>$pathprefix3:/inbox/</value>
-					</arg>
-					<arg>
-						<name>okprops</name>
-						<value>urn:ietf:params:xml:ns:caldavoriginator$&lt;href xmlns="DAV:"&gt;$principal:&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavrecipient$&lt;href xmlns="DAV:"&gt;$principal3:&lt;/href&gt;</value>
-						<value>urn:ietf:params:xml:ns:caldavschedule-state$&lt;not-processed/&gt;</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='5'>
-			<description>REPLY from one</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
-				<method>SCHEDULE</method>
-				<header>
-					<name>Originator</name>
-					<value>/principals/users/user02</value>
-				</header>
-				<header>
-					<name>Recipient</name>
-					<value>/principals/users/user01</value>
-				</header>
-				<ruri>$pathprefix2:/outbox/</ruri>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/schedulenormal/4.ics</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>header</callback>
-					<arg>
-						<name>header</name>
-						<value>Location$^$pathprefix2:/outbox/[^/]+\.ics$</value>
-					</arg>
-				</verify>
-				<grablocation/>
-			</request>
-		</test>
-	</test-suite>
-	
-	<end/>
-	
-</caldavtest>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061027/a124891e/attachment.html

More information about the calendarserver-changes mailing list