[CalendarServer-changes] [3758] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 26 19:03:08 PST 2009
Revision: 3758
http://trac.macosforge.org/projects/calendarserver/changeset/3758
Author: cdaboo at apple.com
Date: 2009-02-26 19:03:07 -0800 (Thu, 26 Feb 2009)
Log Message:
-----------
Default calendar is now required.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/implicit/defaultcalendar/2.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/implicit/defaultcalendar/5.xml
Modified: CalDAVTester/trunk/Resource/implicit/defaultcalendar/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/defaultcalendar/2.xml 2009-02-27 01:09:07 UTC (rev 3757)
+++ CalDAVTester/trunk/Resource/implicit/defaultcalendar/2.xml 2009-02-27 03:03:07 UTC (rev 3758)
@@ -2,7 +2,7 @@
<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:set>
<D:prop>
-<C:schedule-default-calendar-URL><D:href>$calendarpath1:</D:href></C:schedule-default-calendar-URL>
+<C:schedule-default-calendar-URL><D:href>$pathprefix1:/calendar-test</D:href></C:schedule-default-calendar-URL>
</D:prop>
</D:set>
</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/implicit/defaultcalendar/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/implicit/defaultcalendar/5.xml (rev 0)
+++ CalDAVTester/trunk/Resource/implicit/defaultcalendar/5.xml 2009-02-27 03:03:07 UTC (rev 3758)
@@ -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:set>
+<D:prop>
+<C:schedule-default-calendar-URL><D:href>$calendarpath1:</D:href></C:schedule-default-calendar-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2009-02-27 01:09:07 UTC (rev 3757)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2009-02-27 03:03:07 UTC (rev 3758)
@@ -284,6 +284,11 @@
</substitution>
<!-- relative path to user alternate calendar home-->
<substitution>
+ <key>$pathprefixalt%d:</key>
+ <value>$calendars_users:$userid%d:</value>
+ </substitution>
+ <!-- relative path to user alternate calendar-->
+ <substitution>
<key>$calendarpathalt%d:</key>
<value>$calendars_users:$userid%d:/$calendar:</value>
</substitution>
Modified: CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2009-02-27 01:09:07 UTC (rev 3757)
+++ CalDAVTester/trunk/scripts/tests/implicitdefaultcalendar.xml 2009-02-27 03:03:07 UTC (rev 3758)
@@ -21,11 +21,16 @@
<caldavtest>
<description>Test default calendar behavior in CalDAV</description>
- <start/>
+ <start>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefix1:/calendar-test/</ruri>
+ </request>
+ </start>
<test-suite name='Default Property' ignore='no'>
<test name='1'>
- <description>Look for empty property on inbox</description>
+ <description>Look for property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
@@ -61,7 +66,7 @@
<verify>
<callback>propfindItems</callback>
<arg>
- <name>okprops</name>
+ <name>badprops</name>
<value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL</value>
</arg>
</verify>
@@ -84,7 +89,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$</value>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath1:</href></value>
</arg>
</verify>
</request>
@@ -93,7 +98,7 @@
<test-suite name='Set valid Property' ignore='no'>
<test name='1'>
- <description>Look for empty property on inbox</description>
+ <description>Look for existing property on inbox</description>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
@@ -109,7 +114,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$</value>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath1:</href></value>
</arg>
</verify>
</request>
@@ -149,7 +154,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath1:</href></value>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$pathprefix1:/calendar-test</href></value>
</arg>
</verify>
</request>
@@ -192,6 +197,137 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$pathprefix1:/calendar-test</href></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Move default calendar' ignore='no'>
+ <test name='1'>
+ <description>Move calendar</description>
+ <request print-response='no'>
+ <method>MOVE</method>
+ <ruri>$pathprefix1:/calendar-test/</ruri>
+ <header>
+ <name>Destination</name>
+ <value>$host:$pathprefix1:/calendar-moved/</value>
+ </header>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify property on inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$pathprefix1:/calendar-moved</href></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Delete default calendar' ignore='no'>
+ <test name='1'>
+ <description>Delete calendar</description>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/calendar-moved/</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>urn:ietf:params:xml:ns:caldavdefault-calendar-delete-allowed</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Verify property on inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$pathprefix1:/calendar-moved</href></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Delete previously default calendar' ignore='no'>
+ <test name='1'>
+ <description>Set property on Inbox</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Delete calendar</description>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/calendar-moved/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Verify property on inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
<value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath1:</href></value>
</arg>
</verify>
@@ -199,6 +335,106 @@
</test>
</test-suite>
+ <test-suite name='Set valid Property' ignore='no'>
+ <test name='1'>
+ <description>Look for existing property on inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$calendarpath1:</href></value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefixalt1:/calendar-test/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Set property on Inbox</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Verify property on inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL$<href xmlns="DAV:">$pathprefix1:/calendar-test</href></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Set property on Inbox</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/implicit/defaultcalendar/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>urn:ietf:params:xml:ns:caldavschedule-default-calendar-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Delete calendar</description>
+ <request print-response='no'>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/calendar-test/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090226/78e19ea7/attachment-0001.html>
More information about the calendarserver-changes
mailing list