Revision: 3619 http://trac.macosforge.org/projects/calendarserver/changeset/3619 Author: cdaboo@apple.com Date: 2009-01-28 15:16:21 -0800 (Wed, 28 Jan 2009) Log Message: ----------- Test for invalid recurrence components. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/errors.xml Added Paths: ----------- CalDAVTester/trunk/Resource/errors/37.ics CalDAVTester/trunk/Resource/errors/38.ics Added: CalDAVTester/trunk/Resource/errors/37.ics =================================================================== --- CalDAVTester/trunk/Resource/errors/37.ics (rev 0) +++ CalDAVTester/trunk/Resource/errors/37.ics 2009-01-28 23:16:21 UTC (rev 3619) @@ -0,0 +1,42 @@ +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:20060102T100000 +DURATION:PT1H +SUMMARY:event 37 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-37@ninevah.local +END:VEVENT +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060103T110000 +DURATION:PT1H +SUMMARY:event 37 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-37@ninevah.local +RECURRENCE-ID;TZID=US/Eastern:20060103T100000 +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/errors/38.ics =================================================================== --- CalDAVTester/trunk/Resource/errors/38.ics (rev 0) +++ CalDAVTester/trunk/Resource/errors/38.ics 2009-01-28 23:16:21 UTC (rev 3619) @@ -0,0 +1,42 @@ +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:20060103T110000 +DURATION:PT1H +SUMMARY:event 38 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-38@ninevah.local +RECURRENCE-ID;TZID=US/Eastern:20060103T100000 +END:VEVENT +BEGIN:VEVENT +DTSTAMP:20051222T205953Z +CREATED:20060101T150000Z +DTSTART;TZID=US/Eastern:20060102T100000 +DURATION:PT1H +SUMMARY:event 38 +DESCRIPTION:Bad recurrence components +UID:54E181BC7CCC373042B28842-38@ninevah.local +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/tests/errors.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/errors.xml 2009-01-28 19:18:26 UTC (rev 3618) +++ CalDAVTester/trunk/scripts/tests/errors.xml 2009-01-28 23:16:21 UTC (rev 3619) @@ -363,6 +363,42 @@ </verify> </request> </test> + <test name='14'> + <description>PUT invalid master/Recurrence-ID</description> + <request end-delete="yes" print-response='no'> + <method>PUT</method> + <ruri>$calendarpath1:/37.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/errors/37.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-object-resource</value> + </arg> + </verify> + </request> + </test> + <test name='15'> + <description>PUT invalid master/Recurrence-ID</description> + <request end-delete="yes" print-response='no'> + <method>PUT</method> + <ruri>$calendarpath1:/38.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/errors/38.ics</filepath> + </data> + <verify> + <callback>prepostcondition</callback> + <arg> + <name>error</name> + <value>urn:ietf:params:xml:ns:caldavvalid-calendar-object-resource</value> + </arg> + </verify> + </request> + </test> </test-suite> <test-suite name='COPY' ignore='no'>