[CalendarServer-changes] [4759] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Nov 17 21:05:19 PST 2009


Revision: 4759
          http://trac.macosforge.org/projects/calendarserver/changeset/4759
Author:   cdaboo at apple.com
Date:     2009-11-17 21:05:18 -0800 (Tue, 17 Nov 2009)
Log Message:
-----------
Test for shifted recurrence that causes instance to be in time-range even though original
recurrence is not.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/reports/put/23.ics
    CalDAVTester/trunk/Resource/reports/timerangequery/13.xml

Added: CalDAVTester/trunk/Resource/reports/put/23.ics
===================================================================
--- CalDAVTester/trunk/Resource/reports/put/23.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/reports/put/23.ics	2009-11-18 05:05:18 UTC (rev 4759)
@@ -0,0 +1,50 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//iCal 4.0.1//EN
+BEGIN:VTIMEZONE
+TZID:America/New_York
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:DAFCEADF-A646-4D71-B6A8-E3C090849206
+DTSTART;TZID=America/New_York:20091119T100000
+DTEND;TZID=America/New_York:20091119T110000
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01 at example.com;PARTSTAT=AC
+ CEPTED:urn:uuid:user01
+CREATED:20091118T034738Z
+DTSTAMP:20091118T034759Z
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
+RRULE:FREQ=DAILY;COUNT=400
+SEQUENCE:3
+SUMMARY:New Event
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:DAFCEADF-A646-4D71-B6A8-E3C090849206
+RECURRENCE-ID;TZID=America/New_York:20091120T100000
+DTSTART;TZID=America/New_York:20091119T120000
+DTEND;TZID=America/New_York:20091119T130000
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01 at example.com;PARTSTAT=AC
+ CEPTED:urn:uuid:user01
+CREATED:20091118T034738Z
+DTSTAMP:20091118T034809Z
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
+SEQUENCE:5
+SUMMARY:New Event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/reports/timerangequery/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/timerangequery/13.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/reports/timerangequery/13.xml	2009-11-18 05:05:18 UTC (rev 4759)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:calendar-data>
+<C:expand start="20091119T000000Z" end="20091120T000000Z"/>
+</C:calendar-data>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="20091119T000000Z" end="20091120T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>

Modified: CalDAVTester/trunk/scripts/tests/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/reports.xml	2009-11-18 01:25:11 UTC (rev 4758)
+++ CalDAVTester/trunk/scripts/tests/reports.xml	2009-11-18 05:05:18 UTC (rev 4759)
@@ -3,7 +3,7 @@
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
- Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2009 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -1319,6 +1319,35 @@
 				</verify>
 			</request>
 		</test>
+		<test name='17' ignore='no'>
+			<description>query for free busy with overlapping and consecutive events</description>
+			<request end-delete="yes">
+				<method>PUT</method>
+				<ruri>$calendarpath1:/23.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/reports/put/23.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request print-response='no'>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/reports/timerangequery/13.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>23.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='alarm time-range query reports' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091117/90475534/attachment.html>


More information about the calendarserver-changes mailing list