[CalendarServer-changes] [3742] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 25 08:19:28 PST 2009
Revision: 3742
http://trac.macosforge.org/projects/calendarserver/changeset/3742
Author: cdaboo at apple.com
Date: 2009-02-25 08:19:28 -0800 (Wed, 25 Feb 2009)
Log Message:
-----------
Some things being IGNORED no longer are.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
CalDAVTester/trunk/scripts/tests/availability.xml
CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics
CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics
Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics 2009-02-25 15:08:33 UTC (rev 3741)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/2.ics 2009-02-25 16:19:28 UTC (rev 3742)
@@ -27,10 +27,10 @@
DURATION:PT1H
SUMMARY:event 1
UID:event1 at ninevah.local
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
RRULE:FREQ=DAILY;COUNT=3
END:VEVENT
BEGIN:VEVENT
@@ -41,11 +41,11 @@
SUMMARY:event 1
UID:event1 at ninevah.local
RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="2.0;S
- uccess":$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS="1.2;S
+ cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics 2009-02-25 15:08:33 UTC (rev 3741)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/4.ics 2009-02-25 16:19:28 UTC (rev 3742)
@@ -28,10 +28,11 @@
SUMMARY:event 1
UID:event1 at ninevah.local
RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics 2009-02-25 15:08:33 UTC (rev 3741)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/5.ics 2009-02-25 16:19:28 UTC (rev 3742)
@@ -26,12 +26,13 @@
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
SUMMARY:event 1
-X-APPLE-NEEDS-REPLY:TRUE
UID:event1 at ninevah.local
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
RRULE:FREQ=DAILY;COUNT=3
+X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
@@ -39,12 +40,13 @@
DTSTART;TZID=US/Eastern:20060102T100000
DURATION:PT1H
SUMMARY:event 1
-X-APPLE-NEEDS-REPLY:TRUE
UID:event1 at ninevah.local
RECURRENCE-ID;TZID=US/Eastern:20060102T100000
-ORGANIZER;CN=$username1::$cuaddr1:
-ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
-ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2:
-ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr3:
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/6.ics 2009-02-25 16:19:28 UTC (rev 3742)
@@ -0,0 +1,39 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:20060102T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics
===================================================================
--- CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/recur1/override/7.ics 2009-02-25 16:19:28 UTC (rev 3742)
@@ -0,0 +1,54 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//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:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+RRULE:FREQ=DAILY;COUNT=3
+X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
+STATUS:CANCELLED
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:20060102T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at ninevah.local
+RECURRENCE-ID;TZID=US/Eastern:20060102T100000
+ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;X-CALENDARSERVER-EMAIL=$email3::$cuaddrurn3:
+X-APPLE-NEEDS-REPLY:TRUE
+TRANSP:TRANSPARENT
+STATUS:CANCELLED
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/availability.xml 2009-02-25 15:08:33 UTC (rev 3741)
+++ CalDAVTester/trunk/scripts/tests/availability.xml 2009-02-25 16:19:28 UTC (rev 3742)
@@ -78,8 +78,8 @@
</verify>
</request>
</test>
- <test name='2' ignore='yes'>
- <description>Supported component</description>
+ <test name='2' ignore='no'>
+ <description>VAVAILABILITY not a supported component</description>
<request print-response='no'>
<method>PROPFIND</method>
<ruri>$calendarpath1:/</ruri>
@@ -95,7 +95,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavsupported-calendar-component-set$<comp name="VEVENT"/><comp name="VTODO"/><comp name="VTIMEZONE"/><comp name="VJOURNAL"/><comp name="VFREEBUSY"/><comp name="VAVAILABILITY"/></value>
+ <value>urn:ietf:params:xml:ns:caldavsupported-calendar-component-set$<comp name="VEVENT"/><comp name="VTODO"/><comp name="VTIMEZONE"/><comp name="VJOURNAL"/><comp name="VFREEBUSY"/></value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2009-02-25 15:08:33 UTC (rev 3741)
+++ CalDAVTester/trunk/scripts/tests/implicitrecur1.xml 2009-02-25 16:19:28 UTC (rev 3742)
@@ -439,7 +439,7 @@
</test>
</test-suite>
- <test-suite name='Cancel Override' ignore='yes'>
+ <test-suite name='Cancel Override' ignore='no'>
<test name='1'>
<description>Organizer invites Attendees</description>
<request print-response='no'>
@@ -651,42 +651,26 @@
</request>
</test>
<test name='8'>
- <description>Attendees have no data</description>
+ <description>Attendees have cancelled data</description>
<request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath2:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/recur1/override/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/override/6.ics</value>
</arg>
</verify>
</request>
<request user="$userid3:" pswd="$pswd3:" print-response='no'>
- <method>PROPFIND</method>
+ <method>GETNEW</method>
<ruri>$calendarpath3:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/implicit/recur1/override/3.xml</filepath>
- </data>
<verify>
- <callback>multistatusItems</callback>
+ <callback>calendarDataMatch</callback>
<arg>
- <name>count</name>
- <value>0</value>
+ <name>filepath</name>
+ <value>Resource/implicit/recur1/override/7.ics</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090225/136b788b/attachment-0001.html>
More information about the calendarserver-changes
mailing list