[CalendarServer-changes] [2709] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 2709
          http://trac.macosforge.org/projects/calendarserver/changeset/2709
Author:   cdaboo at apple.com
Date:     2008-07-17 10:08:44 -0700 (Thu, 17 Jul 2008)
Log Message:
-----------
Test to make sure we do not duplicate VTIMEZONEs in rolled up .ics.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/get.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/get/
    CalDAVTester/trunk/Resource/get/1.ics

Added: CalDAVTester/trunk/Resource/get/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/get/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/get/1.ics	2008-07-17 17:08:44 UTC (rev 2709)
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//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:54E181BC7CCC373042B28842 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 4
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+X-MULBERRY-ALARM-STATUS:PENDING
+X-MULBERRY-SPEAK-TEXT:
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/get.xml	2008-07-17 17:07:14 UTC (rev 2708)
+++ CalDAVTester/trunk/scripts/tests/get.xml	2008-07-17 17:08:44 UTC (rev 2709)
@@ -24,7 +24,7 @@
 	<description>Test GET on collections to ensure proper directory listing, calendar aggregation behavior</description>
 
 	<start>
-		<request end-delete="yes" print-response="yes">
+		<request end-delete="yes">
 			<method>PUT</method>
 			<ruri>1.ics</ruri>
 			<data>
@@ -117,6 +117,34 @@
 				</verify>
 			</request>
 		</test>
+		<test name='3'>
+			<description>GET on calendar collection without multiple VTIMEZONEs</description>
+			<request end-delete="yes">
+				<method>PUT</method>
+				<ruri>2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/delete/4.txt</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/get/1.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/20080717/53fd7ebe/attachment.html