[CalendarServer-changes] [8411] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 8411
          http://trac.macosforge.org/projects/calendarserver/changeset/8411
Author:   sagen at apple.com
Date:     2011-12-07 11:13:58 -0800 (Wed, 07 Dec 2011)
Log Message:
-----------
Test for new invalid recurrence-id processing logic

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/put.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/put/3.ics
    CalDAVTester/trunk/Resource/CalDAV/put/4.ics

Added: CalDAVTester/trunk/Resource/CalDAV/put/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/3.ics	2011-12-07 19:13:58 UTC (rev 8411)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 5.0.1//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+DTSTART:20070311T020000
+TZNAME:PDT
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+DTSTART:20071104T020000
+TZNAME:PST
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111207T153000
+RRULE:FREQ=WEEKLY;COUNT=400
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111207T143000
+DTSTAMP:20111206T203553Z
+SEQUENCE:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111221T124500
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111221T114500
+DTSTAMP:20111206T203632Z
+SEQUENCE:5
+RECURRENCE-ID;TZID=America/Los_Angeles:20111221T143000
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111214T163000
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111214T153000
+DTSTAMP:20111206T203606Z
+SEQUENCE:4
+RECURRENCE-ID;TZID=America/Los_Angeles:20111215T143000
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/put/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/4.ics	2011-12-07 19:13:58 UTC (rev 8411)
@@ -0,0 +1,56 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 5.0.1//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+DTSTART:20070311T020000
+TZNAME:PDT
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+DTSTART:20071104T020000
+TZNAME:PST
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111207T153000
+RRULE:FREQ=WEEKLY;COUNT=400
+RDATE:20111215T223000Z
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111207T143000
+DTSTAMP:20111206T203553Z
+SEQUENCE:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111221T124500
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111221T114500
+DTSTAMP:20111206T203632Z
+SEQUENCE:5
+RECURRENCE-ID;TZID=America/Los_Angeles:20111221T143000
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111206T203543Z
+UID:5F7FF5FB-2253-4895-8BF1-76E8ED868B4C
+DTEND;TZID=America/Los_Angeles:20111214T163000
+TRANSP:OPAQUE
+SUMMARY:bogus instance
+DTSTART;TZID=America/Los_Angeles:20111214T153000
+DTSTAMP:20111206T203606Z
+SEQUENCE:4
+RECURRENCE-ID;TZID=America/Los_Angeles:20111215T143000
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2011-12-07 19:07:27 UTC (rev 8410)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2011-12-07 19:13:58 UTC (rev 8411)
@@ -451,7 +451,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17'>
+		<test name='17' ignore="yes"> <!-- Disabled because we now accept invalid recurrence ids and add RDATEs for them -->
 			<description>PUT with invalid recurrence id</description>
 			<request print-response='no'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-12-07 19:07:27 UTC (rev 8410)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-12-07 19:13:58 UTC (rev 8411)
@@ -917,6 +917,31 @@
 				</verify>
 			</request>
 		</test>
+		<test name='2'>
+			<description>PUT with invalid recurrence id</description>
+			<request print-response='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/i2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/put/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/i2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/put/4.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 
 	<end/>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111207/80d76c12/attachment.html>