[CalendarServer-changes] [1375] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 13 21:01:50 PDT 2007
Revision: 1375
http://trac.macosforge.org/projects/calendarserver/changeset/1375
Author: cdaboo at apple.com
Date: 2007-03-13 21:01:49 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
Change to availability to use property on inbox rather than components in calendars.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/availability.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/availability/15.xml
CalDAVTester/trunk/Resource/availability/16.xml
CalDAVTester/trunk/Resource/availability/17.xml
CalDAVTester/trunk/Resource/availability/18.xml
CalDAVTester/trunk/Resource/availability/19.ics
Added: CalDAVTester/trunk/Resource/availability/15.xml
===================================================================
--- CalDAVTester/trunk/Resource/availability/15.xml (rev 0)
+++ CalDAVTester/trunk/Resource/availability/15.xml 2007-03-14 04:01:49 UTC (rev 1375)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:calendar-availability/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/availability/16.xml
===================================================================
--- CalDAVTester/trunk/Resource/availability/16.xml (rev 0)
+++ CalDAVTester/trunk/Resource/availability/16.xml 2007-03-14 04:01:49 UTC (rev 1375)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<CS:calendar-availability>This is not a calendar!</CS:calendar-availability>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/availability/17.xml
===================================================================
--- CalDAVTester/trunk/Resource/availability/17.xml (rev 0)
+++ CalDAVTester/trunk/Resource/availability/17.xml 2007-03-14 04:01:49 UTC (rev 1375)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:set>
+<D:prop>
+<CS:calendar-availability>BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//example.com//iCalendar 2.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:America/Montreal
+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:VAVAILABILITY
+ORGANIZER:mailto:bernard at example.com
+UID:20061005T133225Z-00002-availability at example.com
+DTSTAMP:20061005T133225Z
+DTSTART;TZID=America/Montreal:20050101T000000
+BEGIN:AVAILABLE
+UID:20061005T133225Z-00001-A-availability at example.com
+DTSTAMP:20061005T133225Z
+SUMMARY:Monday to Friday from 9:00 to 17:00
+DTSTART;TZID=America/Montreal:20050103T090000
+DTEND;TZID=America/Montreal:20050103T170000
+RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
+END:AVAILABLE
+END:VAVAILABILITY
+END:VCALENDAR
+</CS:calendar-availability>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/availability/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/availability/18.xml (rev 0)
+++ CalDAVTester/trunk/Resource/availability/18.xml 2007-03-14 04:01:49 UTC (rev 1375)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:remove>
+<D:prop>
+<CS:calendar-availability/>
+</D:prop>
+</D:remove>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/availability/19.ics
===================================================================
--- CalDAVTester/trunk/Resource/availability/19.ics (rev 0)
+++ CalDAVTester/trunk/Resource/availability/19.ics 2007-03-14 04:01:49 UTC (rev 1375)
@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:20060110T231240Z-4011c71-187-6f73-fb
+ORGANIZER;CN=User 01:$cuaddr1:
+ATTENDEE;CN=User 01:$cuaddr1:
+DTSTART:20060102T000000Z
+DTSTAMP:20060309T185105Z
+DTEND:20060103T000000Z
+END:VFREEBUSY
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/availability.xml 2007-03-14 03:59:31 UTC (rev 1374)
+++ CalDAVTester/trunk/scripts/tests/availability.xml 2007-03-14 04:01:49 UTC (rev 1375)
@@ -24,6 +24,8 @@
<description>Test PUT method in CalDAV</description>
<start>
+ <!-- Commented out as we do not support VAVAILABILITY components
+ stored directly in calendars.
<request end-delete="yes">
<method>PUT</method>
<ruri>1.ics</ruri>
@@ -48,6 +50,7 @@
<filepath>Resource/availability/3.ics</filepath>
</data>
</request>
+ -->
<request end-delete="yes">
<method>PUT</method>
<ruri>4.ics</ruri>
@@ -58,7 +61,7 @@
</request>
</start>
- <test-suite name='Capabilities' ignore='no'>
+ <test-suite name='Capabilities' ignore='yes'>
<test name='1' ignore='no'>
<description>Check for proper capability in DAV header</description>
<request>
@@ -98,8 +101,9 @@
</request>
</test>
</test-suite>
-
- <test-suite name='Verify PUT VAVAILABILITY' ignore='no'>
+
+ <!--
+ <test-suite name='Verify PUT VAVAILABILITY' ignore='yes'>
<test name='1' ignore='no'>
<description>PUT availability</description>
<request>
@@ -116,7 +120,7 @@
</test>
</test-suite>
- <test-suite name='basic query reports' ignore='no'>
+ <test-suite name='basic query reports' ignore='yes'>
<test name='1' ignore='no'>
<description>query for resources with VCALENDAR & VAVAILABILITY defined</description>
<request>
@@ -175,7 +179,7 @@
</test>
</test-suite>
- <test-suite name='time-range query reports' ignore='no'>
+ <test-suite name='time-range query reports' ignore='yes'>
<test name='1' ignore='no'>
<description>query for VAVAILABILITYs within time range</description>
<request>
@@ -283,7 +287,7 @@
</test>
</test-suite>
- <test-suite name='free-busy reports' ignore='no'>
+ <test-suite name='free-busy reports' ignore='yes'>
<test name='1' ignore='no'>
<description>query for free busy with time range</description>
<request print-response='no'>
@@ -371,7 +375,132 @@
</request>
</test>
</test-suite>
+ -->
- <end/>
-
+ <test-suite name='Verify cannot PUT VAVAILABILITY'>
+ <test name='1' ignore='no'>
+ <description>PUT availability fails</description>
+ <request>
+ <method>PUT</method>
+ <ruri>1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/availability/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='PROPPATCH VAVAILABILITY' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>PROPFIND no availability</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix:/inbox/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/availability/15.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>http://calendarserver.org/ns/calendar-availability</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>PROPPATCH invalid availability</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/inbox/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/availability/16.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>http://calendarserver.org/ns/calendar-availability</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>PROPPATCH valid availability</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/inbox/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/availability/17.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/calendar-availability</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='free-busy reports' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>query for free busy with time range</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <header>
+ <name>Originator</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <header>
+ <name>Recipient</name>
+ <value>$cuaddr1:</value>
+ </header>
+ <ruri>$pathprefix:/outbox/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/availability/19.ics</filepath>
+ </data>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060102T170000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20060102T000000Z/20060102T140000Z,2006010
+ 2T220000Z/20060103T000000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/inbox/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/availability/18.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/calendar-availability</value>
+ </arg>
+ </verify>
+ </request>
+ </end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070313/64722d78/attachment.html
More information about the calendarserver-changes
mailing list