[CalendarServer-changes] [7243] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 7243
          http://trac.macosforge.org/projects/calendarserver/changeset/7243
Author:   cdaboo at apple.com
Date:     2011-03-24 07:35:56 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
Make sure PUT with blank lines in iCalendar data is handled and fixed.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics
    CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics

Added: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/20.ics	2011-03-24 14:35:56 UTC (rev 7243)
@@ -0,0 +1,33 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+SUMMARY:event 2
+UID:event2 at example.local
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/recurrenceput/21.ics	2011-03-24 14:35:56 UTC (rev 7243)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+SUMMARY:event 2
+UID:event2 at example.local
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-03-23 20:44:06 UTC (rev 7242)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2011-03-24 14:35:56 UTC (rev 7243)
@@ -88,6 +88,31 @@
 				</verify>
 			</request>
 		</test>
+		<test name='3' ignore='no'>
+			<description>PUT non-recurring timed event</description>
+			<request end-delete='yes'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/recurrenceput/20.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/recurrenceput/21.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='Put VTODO' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110324/14b85cd0/attachment.html>