[CalendarServer-changes] [4887] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Dec 22 08:16:06 PST 2009
Revision: 4887
http://trac.macosforge.org/projects/calendarserver/changeset/4887
Author: cdaboo at apple.com
Date: 2009-12-22 08:16:03 -0800 (Tue, 22 Dec 2009)
Log Message:
-----------
More scheduling tests for partitioning.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicitauto.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/1.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/10.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/2.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/4.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/5.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/6.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/7.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/8.ics
CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/9.ics
CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicit.xml
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/1.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$otherusername1:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$othercuaddr1:
+ATTENDEE;CN=$otherusername2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$othercuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/10.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;PARTSTAT=DECLINED;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/2.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/4.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/5.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED:$othercuaddr1:
+ATTENDEE;CN=$otherusername2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$othercuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/6.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/7.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+X-APPLE-NEEDS-REPLY:TRUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/8.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED:$othercuaddr1:
+ATTENDEE;CN=$otherusername2:;PARTSTAT=DECLINED:$othercuaddr2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/partitioning/scheduleimplicit/suite1/9.ics 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$otherusername1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$otheremail1::$othercuaddrurn1:
+ATTENDEE;CN=$otherusername2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$otheremail2::$othercuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicit.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicit.xml 2009-12-22 16:16:03 UTC (rev 4887)
@@ -0,0 +1,426 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2008 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>Partitioning with auto-accept test</description>
+
+ <require-feature>
+ <feature>implicit-scheduling</feature>
+ <feature>partitioning</feature>
+ </require-feature>
+
+ <start>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$inboxpath1:/</ruri>
+ <ruri>$otherinboxpath1:/</ruri>
+ <ruri>$otherinboxpath1:/</ruri>
+ </request>
+ </start>
+
+ <test-suite name='#1 refresh across nodes' ignore='no'>
+ <test name='1'>
+ <description>Organizer invites Attendees</description>
+ <request print-response='no'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/scheduleimplicit/suite1/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Items</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$otherinboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$otherinboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendees have data</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/4.ics</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/4.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendees delete Inbox Items</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$otherinboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$otherinboxpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee 1 -> Accepted</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/scheduleimplicit/suite1/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Organizer deletes Inbox Item</description>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Attendee 2 no Inbox Item</description>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$otherinboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Attendee 2 data changed</description>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/7.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='12'>
+ <description>Attendee 2 -> Decline</description>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath2:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/scheduleimplicit/suite1/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Organizer Inbox Item</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='14'>
+ <description>Organizer data changed</description>
+ <request print-response='no'>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='15'>
+ <description>Organizer deletes Inbox Item</description>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$inboxpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>204</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='16'>
+ <description>Attendee 1 no Inbox Item</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$otherinboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/partitioning/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='17'>
+ <description>Attendee 1 data changed</description>
+ <request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$othercalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/partitioning/scheduleimplicit/suite1/10.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='18'>
+ <description>Clean-up</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ <ruri>$othercalendarpath1:/</ruri>
+ <ruri>$otherinboxpath1:/</ruri>
+ <ruri>$othercalendarpath2:/</ruri>
+ <ruri>$otherinboxpath2:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$otherinboxpath1:/</ruri>
+ <ruri>$othercalendarpath1:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicitauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicitauto.xml 2009-12-21 20:42:42 UTC (rev 4886)
+++ CalDAVTester/trunk/scripts/tests/partitioning-scheduleimplicitauto.xml 2009-12-22 16:16:03 UTC (rev 4887)
@@ -28,42 +28,13 @@
</require-feature>
<start>
- <request>
- <method>DELETEALL</method>
- <ruri>$pathprefix:/$outbox:/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
- <ruri>$pathprefix:/$inbox:/</ruri>
- </request>
- <request user="$otherid1:" pswd="$otherpswd1:">
- <method>DELETEALL</method>
- <ruri>$otherpathprefix:/$outbox:/</ruri>
- </request>
- <request user="$otherid1:" pswd="$otherpswd1:">
- <method>DELETEALL</method>
- <ruri>$otherpathprefix:/$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>$rpathprefix1:/$outbox:/</ruri>
+ <ruri>$otherinboxpath1:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
</request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rpathprefix1:/$inbox:/</ruri>
- </request>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$rpathprefix1:/calendar/</ruri>
- </request>
</start>
<test-suite name='#1 node 2 user auto-schedules with node #1 resource' ignore='no'>
@@ -189,7 +160,7 @@
<description>Clean-up inboxes</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
- <ruri>$inboxpath1:/</ruri>
+ <ruri>$otherinboxpath1:/</ruri>
<ruri>$inboxpath2:/</ruri>
<ruri>$rinboxpath1:/</ruri>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091222/e2d065f5/attachment-0001.html>
More information about the calendarserver-changes
mailing list