[CalendarServer-changes] [1308] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 5 11:03:19 PST 2007
Revision: 1308
http://trac.macosforge.org/projects/calendarserver/changeset/1308
Author: cdaboo at apple.com
Date: 2007-03-05 11:03:19 -0800 (Mon, 05 Mar 2007)
Log Message:
-----------
Mask out UIDs when doing iTIP free-busy. Fix some auto-respond tests for no save to Outbox.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/schedulemaskuid/
CalDAVTester/trunk/Resource/schedulemaskuid/1.ics
CalDAVTester/trunk/Resource/schedulemaskuid/2.ics
CalDAVTester/trunk/Resource/schedulemaskuid/3.ics
CalDAVTester/trunk/Resource/schedulemaskuid/4.ics
CalDAVTester/trunk/Resource/schedulemaskuid/5.ics
CalDAVTester/trunk/Resource/schedulemaskuid/6.ics
CalDAVTester/trunk/Resource/schedulemaskuid/7.ics
CalDAVTester/trunk/Resource/schedulemaskuid/8.ics
CalDAVTester/trunk/Resource/schedulemaskuid/9.ics
CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
Added: CalDAVTester/trunk/Resource/schedulemaskuid/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/1.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//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:1234 at example.com-1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/2.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//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:20060101T120000
+DURATION:PT1H
+SUMMARY:event 2
+UID:1234 at example.com-2
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/3.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//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:20060101T140000
+DURATION:PT1H
+SUMMARY:event 3
+UID:1234 at example.com-3
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/4.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//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:20060101T160000
+DURATION:PT1H
+SUMMARY:event 4
+UID:1234 at example.com-4
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/5.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//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:20060101T180000
+DURATION:PT1H
+SUMMARY:event 5
+UID:1234 at example.com-5
+ORGANIZER;CN=User 03:$cuaddr3:
+ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddr2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/6.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+END:VFREEBUSY
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/7.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+X-CALENDARSERVER-MASK-UID:1234 at example.com-3
+END:VFREEBUSY
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/8.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+X-CALENDARSERVER-MASK-UID:1234 at example.com-1
+END:VFREEBUSY
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/schedulemaskuid/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/schedulemaskuid/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/schedulemaskuid/9.ics 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 02:$cuaddr2:
+DTSTART:20060101T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+X-CALENDARSERVER-MASK-UID:1234 at example.com-5
+END:VFREEBUSY
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-03-05 19:02:27 UTC (rev 1307)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-03-05 19:03:19 UTC (rev 1308)
@@ -85,10 +85,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -97,13 +93,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -150,15 +142,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/3.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -210,10 +206,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -222,13 +214,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -275,7 +263,7 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
@@ -287,7 +275,7 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>1</value>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -426,7 +414,7 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
@@ -438,7 +426,7 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>1</value>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -512,10 +500,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -524,13 +508,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -581,15 +561,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/8.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -641,10 +625,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -653,13 +633,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -710,15 +686,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/10.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -770,10 +750,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -782,13 +758,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -835,15 +807,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/13.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -895,10 +871,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -907,13 +879,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -964,15 +932,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/15.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -1024,10 +996,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -1036,13 +1004,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -1093,15 +1057,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
<ruri>$rpathprefix1:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/17.ics</value>
+ <name>count</name>
+ <value>0</value>
</arg>
</verify>
</request>
@@ -1153,10 +1121,6 @@
<description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
<ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
@@ -1165,13 +1129,9 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>prefix</name>
- <value/>
+ <name>count</name>
+ <value>0</value>
</arg>
- <arg>
- <name>okhrefs</name>
- <value>$pathprefix:/$outbox:/</value>
- </arg>
</verify>
</request>
</test>
@@ -1222,15 +1182,19 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>One item in resource01 Outbox</description>
+ <description>No item in resource01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
<ruri>$rpathprefix1:/$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>6</value>
+ <value>0</value>
</arg>
</verify>
</request>
Added: CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/schedulepostmaskuid.xml 2007-03-05 19:03:19 UTC (rev 1308)
@@ -0,0 +1,194 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2007 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.
+
+ DRI: Cyrus Daboo, cdaboo at apple.com
+ -->
+
+<caldavtest>
+ <description>Test normal POST operations 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/schedulemaskuid/1.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/schedulemaskuid/2.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/schedulemaskuid/3.ics</filepath>
+ </data>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" end-delete="yes">
+ <method>PUT</method>
+ <ruri>$pathprefix2:/calendar/4.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/4.ics</filepath>
+ </data>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:" end-delete="yes">
+ <method>PUT</method>
+ <ruri>$pathprefix2:/calendar/5.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/5.ics</filepath>
+ </data>
+ </request>
+ </start>
+
+ <test-suite name="POSTs free busy" ignore='no'>
+ <test name='1'>
+ <description>POST free busy - no mask</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/6.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
+ 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>POST free busy - ok mask</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/7.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
+ 210000Z/PT1H,20060101T230000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>POST free busy - bad mask - no organizer</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
+ 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>POST free busy - bad mask - wrong organizer</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr2:</value>
+ </header>
+ <ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/schedulemaskuid/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T150000Z/PT1H,20060101T170000Z/PT1H,20060101T
+ 190000Z/PT1H,20060101T210000Z/PT1H,20060101T230000Z/PT1H</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070305/1a834c52/attachment.html
More information about the calendarserver-changes
mailing list