[CalendarServer-changes] [4346] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 16 07:40:25 PDT 2009


Revision: 4346
          http://trac.macosforge.org/projects/calendarserver/changeset/4346
Author:   cdaboo at apple.com
Date:     2009-06-16 07:40:24 -0700 (Tue, 16 Jun 2009)
Log Message:
-----------
Do a test where there is a timezone on an auto-accept room calendar.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/implicit/auto1/2.xml
    CalDAVTester/trunk/Resource/implicit/auto1/3.xml

Added: CalDAVTester/trunk/Resource/implicit/auto1/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/auto1/2.xml	2009-06-16 14:40:24 UTC (rev 4346)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+    <C:calendar-timezone><![CDATA[BEGIN:VCALENDAR
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/New_York
+X-LIC-LOCATION:America/New_York
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19200328T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=19201031T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19210424T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19410427T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19210925T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19410928T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19460428T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19730429T070000Z
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19460929T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19540926T060000Z
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19551030T020000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU;UNTIL=20061029T060000Z
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=-1SU;UNTIL=19860427T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=20060402T070000Z
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-045602
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:18831118T120358
+RDATE:18831118T120358
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19200101T000000
+RDATE:19200101T000000
+RDATE:19420101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EWT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0400
+TZNAME:EPT
+DTSTART:19450814T190000
+RDATE:19450814T190000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19450930T020000
+RDATE:19450930T020000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19740106T020000
+RDATE:19740106T020000
+RDATE:19750223T020000
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
+]]></C:calendar-timezone>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Added: CalDAVTester/trunk/Resource/implicit/auto1/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/auto1/3.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/auto1/3.xml	2009-06-16 14:40:24 UTC (rev 4346)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:remove>
+<D:prop>
+    <C:calendar-timezone/>
+</D:prop>
+</D:remove>
+</D:propertyupdate>

Modified: CalDAVTester/trunk/scripts/tests/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitauto1.xml	2009-06-16 14:05:14 UTC (rev 4345)
+++ CalDAVTester/trunk/scripts/tests/implicitauto1.xml	2009-06-16 14:40:24 UTC (rev 4346)
@@ -46,6 +46,14 @@
 			<method>DELETEALL</method>
 			<ruri>$rcalendarpath1:/</ruri>
 		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>PROPPATCH</method>
+			<ruri>$rcalendarpath1:/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/implicit/auto1/2.xml</filepath>
+			</data>
+		</request>
 	</start>
 	
 	<test-suite name='#1 Non-recurring without conflict' ignore='no'>
@@ -1320,6 +1328,14 @@
 			<method>DELETEALL</method>
 			<ruri>$rcalendarpath1:/</ruri>
 		</request>
+		<request user="$useradmin:" pswd="$pswdadmin:">
+			<method>PROPPATCH</method>
+			<ruri>$rcalendarpath1:/</ruri>
+			<data>
+				<content-type>text/xml; charset=utf-8</content-type>
+				<filepath>Resource/implicit/auto1/3.xml</filepath>
+			</data>
+		</request>
 	</end>
 	
 </caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090616/83532e65/attachment.html>


More information about the calendarserver-changes mailing list