[CalendarServer-changes] [2879] CalDAVTester/tags/release/CalDAVTester-1.2
source_changes at macosforge.org
source_changes at macosforge.org
Tue Aug 26 12:20:27 PDT 2008
Revision: 2879
http://trac.macosforge.org/projects/calendarserver/changeset/2879
Author: cdaboo at apple.com
Date: 2008-08-26 12:20:26 -0700 (Tue, 26 Aug 2008)
Log Message:
-----------
Sync up with changes done in CalendarServer-1.2.
Modified Paths:
--------------
CalDAVTester/tags/release/CalDAVTester-1.2/Resource/problemics/1.ics
CalDAVTester/tags/release/CalDAVTester-1.2/scripts/server/serverinfo.xml
Removed Paths:
-------------
CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/acldisabled.xml
CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/notifications.xml
Modified: CalDAVTester/tags/release/CalDAVTester-1.2/Resource/problemics/1.ics
===================================================================
--- CalDAVTester/tags/release/CalDAVTester-1.2/Resource/problemics/1.ics 2008-08-26 18:05:56 UTC (rev 2878)
+++ CalDAVTester/tags/release/CalDAVTester-1.2/Resource/problemics/1.ics 2008-08-26 19:20:26 UTC (rev 2879)
@@ -26,7 +26,7 @@
SEQUENCE:5
DTEND;TZID=America/Vancouver:20060709T143000
DTSTART;TZID=America/Vancouver:20060709T133000
-RRULE:FREQ=DAILY;INTERVAL=1
+RRULE:FREQ=DAILY;INTERVAL=1;COUNT=500
DTSTAMP:20060710T225223Z
UID:95C0F1E7-F691-42DD-8889-4E0B700B9778
END:VEVENT
Modified: CalDAVTester/tags/release/CalDAVTester-1.2/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/tags/release/CalDAVTester-1.2/scripts/server/serverinfo.xml 2008-08-26 18:05:56 UTC (rev 2878)
+++ CalDAVTester/tags/release/CalDAVTester-1.2/scripts/server/serverinfo.xml 2008-08-26 19:20:26 UTC (rev 2879)
@@ -69,7 +69,7 @@
<!-- relative path to user calendars collection-->
<substitution>
<key>$usercalendars:</key>
- <value>/calendars/users/</value>
+ <value>/calendars/__uids__/</value>
</substitution>
<!-- inbox name-->
@@ -142,12 +142,12 @@
<!-- relative path to first user calendar home-->
<substitution>
<key>$pathprefix:</key>
- <value>/calendars/users/user01</value>
+ <value>/calendars/__uids__/user01</value>
</substitution>
<!-- relative path to first user calendar home-->
<substitution>
<key>$calendarpath1:</key>
- <value>/calendars/users/user01/calendar</value>
+ <value>/calendars/__uids__/user01/calendar</value>
</substitution>
<!-- calendar user address of first user-->
<substitution>
@@ -189,7 +189,7 @@
<!-- relative path to second user calendar home-->
<substitution>
<key>$pathprefix2:</key>
- <value>/calendars/users/user02</value>
+ <value>/calendars/__uids__/user02</value>
</substitution>
<!-- calendar user address of second user-->
<substitution>
@@ -227,7 +227,7 @@
<!-- relative path to third user calendar home-->
<substitution>
<key>$pathprefix3:</key>
- <value>/calendars/users/user03</value>
+ <value>/calendars/__uids__/user03</value>
</substitution>
<!-- calendar user address of third user-->
<substitution>
@@ -242,7 +242,7 @@
<!-- relative path to first resource calendar home-->
<substitution>
<key>$rpathprefix1:</key>
- <value>/calendars/resources/resource01</value>
+ <value>/calendars/__uids__/resource01</value>
</substitution>
<!-- relative path to first resource principal resource-->
<substitution>
Deleted: CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/acldisabled.xml
===================================================================
--- CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/acldisabled.xml 2008-08-26 18:05:56 UTC (rev 2878)
+++ CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/acldisabled.xml 2008-08-26 19:20:26 UTC (rev 2879)
@@ -1,335 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2007 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
- <description>Test ACLs on the server</description>
-
- <start>
- <request>
- <method>MKCOL</method>
- <ruri>$pathprefix:/collection/</ruri>
- </request>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$pathprefix:/collection/disabled/</ruri>
- </request>
- <request>
- <method>PUT</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/delete/1.txt</filepath>
- </data>
- </request>
- <request>
- <method>ACL</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/1.xml</filepath>
- </data>
- </request>
- <request>
- <method>MKCALENDAR</method>
- <ruri>$pathprefix:/collection/enabled/</ruri>
- </request>
- <request>
- <method>PUT</method>
- <ruri>$pathprefix:/collection/enabled/1.ics</ruri>
- <data>
- <content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/delete/1.txt</filepath>
- </data>
- </request>
- <request>
- <method>ACL</method>
- <ruri>$pathprefix:/collection/enabled/1.ics</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/1.xml</filepath>
- </data>
- </request>
- </start>
-
- <test-suite name='Read Resource OK' ignore='no'>
- <test name='1' ignore='no'>
- <description>GET on disabled ics, user01</description>
- <request print-response='no'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>GET on disabled ics, user02</description>
- <request print-response='no' user='$userid2:' pswd="$pswd2:">
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='3' ignore='no'>
- <description>GET on disabled ics, admin</description>
- <request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>GET on enabled ics, user01</description>
- <request print-response='no'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/enabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='PROPFIND OK' ignore='no'>
- <test name='1' ignore='no'>
- <description>PROPFIND on collection, depth infinity</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>infinity</value>
- </header>
- <ruri>$pathprefix:/collection/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>prefix</name>
- <value>$pathprefix:/collection/</value>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value/>
- <value>enabled/</value>
- <value>enabled/1.ics</value>
- <value>disabled/</value>
- <value>disabled/1.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>PROPFIND on disabled, depth infinity</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>infinity</value>
- </header>
- <ruri>$pathprefix:/collection/disabled/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>prefix</name>
- <value>$pathprefix:/collection/disabled/</value>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value/>
- <value>1.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Disable Access' ignore='no'>
- <test name='1' ignore='no'>
- <description>Disable access</description>
- <request>
- <method>ACCESS-DISABLE</method>
- <ruri>$pathprefix:/collection/disabled</ruri>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Read Resource Forbidden' ignore='no'>
- <test name='1' ignore='no'>
- <description>GET on ics, user01</description>
- <request print-response='no'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>GET on ics, user02</description>
- <request print-response='no' user='$userid2:' pswd="$pswd2:">
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3' ignore='no'>
- <description>GET on ics, admin</description>
- <request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='4' ignore='no'>
- <description>GET on enabled ics, user01</description>
- <request print-response='no'>
- <method>GET</method>
- <ruri>$pathprefix:/collection/enabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='PROPFIND FORBIDDEN' ignore='no'>
- <test name='1' ignore='no'>
- <description>PROPFIND on collection, depth infinity</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>infinity</value>
- </header>
- <ruri>$pathprefix:/collection/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>prefix</name>
- <value>$pathprefix:/collection/</value>
- </arg>
- <arg>
- <name>okhrefs</name>
- <value/>
- <value>enabled/</value>
- <value>enabled/1.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>PROPFIND on disabled, depth infinity</description>
- <request print-response='no'>
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>infinity</value>
- </header>
- <ruri>$pathprefix:/collection/disabled/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/acldisabled/2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Delete Resource Forbidden, then allowed' ignore='no'>
- <test name='1' ignore='no'>
- <description>DELETE on ics, user01</description>
- <request print-response='no'>
- <method>DELETE</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2' ignore='no'>
- <description>Enable access</description>
- <request>
- <method>ACCESS-ENABLE</method>
- <ruri>$pathprefix:/collection/disabled</ruri>
- </request>
- </test>
- <test name='3' ignore='no'>
- <description>DELETE on ics, user01</description>
- <request print-response='no'>
- <method>DELETE</method>
- <ruri>$pathprefix:/collection/disabled/1.ics</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <end>
- <request>
- <method>DELETE</method>
- <ruri>$pathprefix:/collection/</ruri>
- </request>
- </end>
-
-</caldavtest>
Deleted: CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/notifications.xml
===================================================================
--- CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/notifications.xml 2008-08-26 18:05:56 UTC (rev 2878)
+++ CalDAVTester/tags/release/CalDAVTester-1.2/scripts/tests/notifications.xml 2008-08-26 19:20:26 UTC (rev 2879)
@@ -1,512 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- Copyright (c) 2006-2007 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.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<caldavtest>
- <description>Test drop box notification features</description>
-
- <start>
- <request end-delete='yes'>
- <method>MKCOL</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- </request>
- <request end-delete='yes'>
- <method>MKCOL</method>
- <ruri>$pathprefix:/dropbox/ABC2/</ruri>
- </request>
- <request>
- <method>DELETEALL</method>
- <ruri>$pathprefix:/notifications/</ruri>
- </request>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/5.xml</filepath>
- </data>
- </request>
- <request>
- <method>ACL</method>
- <ruri>$pathprefix:/dropbox/ABC2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/7.xml</filepath>
- </data>
- </request>
- <request user='$userid2:' pswd='$pswd2:'>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC2/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/5.xml</filepath>
- </data>
- </request>
- <request user='$userid2:' pswd='$pswd2:'>
- <method>DELETEALL</method>
- <ruri>$pathprefix2:/notifications/</ruri>
- </request>
- </start>
-
- <test-suite name='No notifications'>
- <test name='1'>
- <description>Create drop box resource</description>
- <request>
- <method>PUT</method>
- <ruri>$pathprefix:/dropbox/ABC1/test.xml</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>No notifications</description>
- <request print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>No notifications</description>
- <request user='$userid2:' pswd='$pswd2:' print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix2:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='PUT Notification'>
- <test name='1'>
- <description>Create drop box resource</description>
- <request>
- <method>PUT</method>
- <ruri>$pathprefix:/dropbox/ABC2/test.xml</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>No notifications</description>
- <request print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Notifications</description>
- <request user='$userid2:' pswd='$pswd2:' print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix2:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/4.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>1</value>
- </arg>
- </verify>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$pathprefix2:/notifications/</value>
- </arg>
- <arg>
- <name>okprops</name>
- <value>http://calendarserver.org/ns/time-stamp</value>
- <value>http://calendarserver.org/ns/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='DELETE Notification'>
- <test name='1'>
- <description>Remove existing notifications</description>
- <request>
- <method>DELETEALL</method>
- <ruri>$pathprefix:/notifications/</ruri>
- </request>
- <request print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Remove existing notifications</description>
- <request user='$userid2:' pswd='$pswd2:'>
- <method>DELETEALL</method>
- <ruri>$pathprefix2:/notifications/</ruri>
- </request>
- <request user='$userid2:' pswd='$pswd2:' print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix2:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Delete drop box resource</description>
- <request>
- <method>DELETE</method>
- <ruri>$pathprefix:/dropbox/ABC2/test.xml</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='4'>
- <description>No notifications</description>
- <request print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>0</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='5'>
- <description>Notifications</description>
- <request user='$userid2:' pswd='$pswd2:' print-response="no">
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <ruri>$pathprefix2:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/4.xml</filepath>
- </data>
- <verify>
- <callback>multistatusItems</callback>
- <arg>
- <name>count</name>
- <value>1</value>
- </arg>
- </verify>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>ignore</name>
- <value>$pathprefix2:/notifications/</value>
- </arg>
- <arg>
- <name>okprops</name>
- <value>http://calendarserver.org/ns/time-stamp</value>
- <value>http://calendarserver.org/ns/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
-
- <test-suite name='Subscribe/unsubscribe'>
- <test name='1'>
- <description>Invalid subscribe (no XML)</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Invalid subscribe (incorrect XML)</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
- <description>Invalid subscribe (no privilege)</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/5.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>403</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='4'>
- <description>Invalid unsubscribe (not subscribed)</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/6.xml</filepath>
- </data>
- <verify>
- <callback>prepostcondition</callback>
- <arg>
- <name>error</name>
- <value>http://calendarserver.org/ns/principal-must-be-subscribed</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='5'>
- <description>Invalid subscribe - non-existent resource</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1-bogus/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/5.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='6'>
- <description>Valid subscribe</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/5.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- </request>
- </test>
- <test name='7'>
- <description>Invalid unsubscribe (no XML)</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='8'>
- <description>Invalid unsubscribe (incorrect XML)</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/1.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='9'>
- <description>Invalid unsubscribe (not subscribed)</description>
- <request user="$userid2:" pswd="$pswd2:">
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/6.xml</filepath>
- </data>
- <verify>
- <callback>prepostcondition</callback>
- <arg>
- <name>error</name>
- <value>http://calendarserver.org/ns/principal-must-be-subscribed</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='10'>
- <description>Invalid unsubscribe - non-existent resource</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1-bogus/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/6.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='11'>
- <description>Valid unsubscribe</description>
- <request>
- <method>POST</method>
- <ruri>$pathprefix:/dropbox/ABC1/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/6.xml</filepath>
- </data>
- <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/20080826/375baae7/attachment-0001.html
More information about the calendarserver-changes
mailing list