Revision: 3653 http://trac.macosforge.org/projects/calendarserver/changeset/3653 Author: cdaboo@apple.com Date: 2009-02-10 08:55:15 -0800 (Tue, 10 Feb 2009) Log Message: ----------- Tests for situations where an attendee client forces a change of TZID. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml Added Paths: ----------- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/1.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/3.xml CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/1.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/1.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/1.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,34 @@ +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@ninevah.local +ORGANIZER;CN=$username1::$cuaddr1: +ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1: +ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$cuaddr2: +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/2.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -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@ninevah.local +DTSTART;TZID=US/Eastern:20060101T100000 +DURATION:PT1H +ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS="1.2;S + cheduling message has been delivered";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2: +CREATED:20060101T150000Z +DTSTAMP:20051222T205953Z +ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +SUMMARY:event 1 +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/3.xml =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/3.xml (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/3.xml 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" ?> +<D:propfind xmlns:D="DAV:"> +<D:prop> +<D:resourcetype/> +<D:getetag/> +</D:prop> +</D:propfind> Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/4.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,35 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN +METHOD:REQUEST +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@ninevah.local +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: +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/5.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,36 @@ +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@ninevah.local +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: +TRANSP:TRANSPARENT +X-APPLE-NEEDS-REPLY:TRUE +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/6.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,34 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:America/New_York +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=America/New_York:20060101T100000 +DURATION:PT1H +SUMMARY:event 1 +UID:event1@ninevah.local +ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2: +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/7.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -0,0 +1,48 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Example Inc.//Example Calendar//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000402T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=20060402T070000Z +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:DAYLIGHT +DTSTART:20070311T020000 +RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001029T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=20061029T060000Z +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +BEGIN:STANDARD +DTSTART:20071104T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11 +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@ninevah.local +ORGANIZER;CN=$username1:;SCHEDULE-STATUS="1.2;Scheduling message has been deli + vered";X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2: +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics =================================================================== --- CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics (rev 0) +++ CalDAVTester/trunk/Resource/implicit/scenario1/tzid-reset/8.ics 2009-02-10 16:55:15 UTC (rev 3653) @@ -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@ninevah.local +DTSTART;TZID=US/Eastern:20060101T100000 +DURATION:PT1H +ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;RSVP=TRUE;SCHEDULE-STATUS="2.0;Succe + ss";X-CALENDARSERVER-EMAIL=$email2::$cuaddrurn2: +CREATED:20060101T150000Z +DTSTAMP:20051222T205953Z +ORGANIZER;CN=$username1:;X-CALENDARSERVER-EMAIL=$email1::$cuaddrurn1: +SUMMARY:event 1 +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/tests/implicitscenario1.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2009-02-09 22:31:27 UTC (rev 3652) +++ CalDAVTester/trunk/scripts/tests/implicitscenario1.xml 2009-02-10 16:55:15 UTC (rev 3653) @@ -32,7 +32,7 @@ </request> </start> - <test-suite name='Simple Changes' ignore='no'> + <test-suite name='Simple Changes' ignore='yes'> <test name='1'> <description>Organizer invites Attendee</description> <request print-response='no'> @@ -489,7 +489,7 @@ </test> </test-suite> - <test-suite name='Organizer Delete' ignore='no'> + <test-suite name='Organizer Delete' ignore='yes'> <test name='1'> <description>Organizer invites Attendee</description> <request print-response='no'> @@ -801,7 +801,7 @@ </test> </test-suite> - <test-suite name='Attendee Delete' ignore='no'> + <test-suite name='Attendee Delete' ignore='yes'> <test name='1'> <description>Organizer invites Attendee</description> <request print-response='no'> @@ -1064,7 +1064,7 @@ </test> </test-suite> - <test-suite name='Alarms' ignore='no'> + <test-suite name='Alarms' ignore='yes'> <test name='1'> <description>Organizer invites Attendee</description> <request print-response='no'> @@ -1552,7 +1552,7 @@ </test> </test-suite> - <test-suite name='No X- properties' ignore='no'> + <test-suite name='No X- properties' ignore='yes'> <test name='1'> <description>Organizer invites Attendee</description> <request print-response='no'> @@ -1791,6 +1791,195 @@ </test> </test-suite> + <test-suite name='TZID reset' ignore='no'> + <test name='1'> + <description>Organizer invites Attendee</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/implicit/scenario1/tzid-reset/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/implicit/scenario1/tzid-reset/2.ics</value> + </arg> + </verify> + </request> + </test> + <test name='3'> + <description>Attendee Inbox Item</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PROPFIND</method> + <ruri>$inboxpath2:/</ruri> + <header> + <name>Depth</name> + <value>1</value> + </header> + <data> + <content-type>application/xml; charset=utf-8</content-type> + <filepath>Resource/implicit/scenario1/tzid-reset/3.xml</filepath> + </data> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>count</name> + <value>1</value> + </arg> + </verify> + </request> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GETNEW</method> + <ruri>$inboxpath2:/</ruri> + <verify> + <callback>calendarDataMatch</callback> + <arg> + <name>filepath</name> + <value>Resource/implicit/scenario1/tzid-reset/4.ics</value> + </arg> + </verify> + </request> + </test> + <test name='4'> + <description>Attendee has data</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GETNEW</method> + <ruri>$calendarpath2:/</ruri> + <verify> + <callback>calendarDataMatch</callback> + <arg> + <name>filepath</name> + <value>Resource/implicit/scenario1/tzid-reset/5.ics</value> + </arg> + </verify> + </request> + </test> + <test name='5'> + <description>Attendee deletes Inbox Item</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GETNEW</method> + <ruri>$inboxpath2:/</ruri> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request user="$userid2:" pswd="$pswd2:" 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 tries to change TZID with ACCEPT</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GETNEW</method> + <ruri>$calendarpath2:/</ruri> + <verify> + <callback>statusCode</callback> + </verify> + </request> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>PUT</method> + <ruri>$</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/implicit/scenario1/tzid-reset/6.ics</filepath> + </data> + <verify> + <callback>statusCode</callback> + </verify> + </request> + </test> + <test name='7'> + <description>Attendee has data with original TZID</description> + <request user="$userid2:" pswd="$pswd2:" print-response='no'> + <method>GET</method> + <ruri>$</ruri> + <verify> + <callback>calendarDataMatch</callback> + <arg> + <name>filepath</name> + <value>Resource/implicit/scenario1/tzid-reset/7.ics</value> + </arg> + </verify> + </request> + </test> + <test name='8'> + <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>application/xml; charset=utf-8</content-type> + <filepath>Resource/implicit/scenario1/tzid-reset/3.xml</filepath> + </data> + <verify> + <callback>multistatusItems</callback> + <arg> + <name>count</name> + <value>1</value> + </arg> + </verify> + </request> + </test> + <test name='9'> + <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/implicit/scenario1/tzid-reset/8.ics</value> + </arg> + </verify> + </request> + </test> + <test name='10'> + <description>Clean-up</description> + <request user="$userid1:" pswd="$pswd1:"> + <method>DELETEALL</method> + <ruri>$calendarpath1:/</ruri> + </request> + <request user="$userid1:" pswd="$pswd1:"> + <method>DELETEALL</method> + <ruri>$inboxpath1:/</ruri> + </request> + <request user="$userid2:" pswd="$pswd2:"> + <method>DELETEALL</method> + <ruri>$calendarpath2:/</ruri> + </request> + <request user="$userid2:" pswd="$pswd2:"> + <method>DELETEALL</method> + <ruri>$inboxpath2:/</ruri> + </request> + </test> + </test-suite> + <end/> </caldavtest>
participants (1)
-
source_changes＠macosforge.org