[CalendarServer-changes] [2403] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri May 9 13:27:42 PDT 2008 

Revision: 2403
          http://trac.macosforge.org/projects/calendarserver/changeset/2403
Author:   cdaboo at apple.com
Date:     2008-05-09 13:27:41 -0700 (Fri, 09 May 2008)

Log Message:
-----------
Dropbox notifications feature removed.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/dropbox/1.xml
    CalDAVTester/trunk/scripts/tests/dropbox.xml

Removed Paths:
-------------
    CalDAVTester/trunk/scripts/tests/notifications.xml

Modified: CalDAVTester/trunk/Resource/dropbox/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/dropbox/1.xml	2008-05-09 20:25:19 UTC (rev 2402)
+++ CalDAVTester/trunk/Resource/dropbox/1.xml	2008-05-09 20:27:41 UTC (rev 2403)
@@ -2,6 +2,5 @@
 <D:propfind xmlns:D="DAV:" xmlns:A="http://calendarserver.org/ns/">
 <D:prop>
 <A:dropbox-home-URL/>
-<A:notifications-URL/>
 </D:prop>
 </D:propfind>

Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/dropbox.xml	2008-05-09 20:25:19 UTC (rev 2402)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml	2008-05-09 20:27:41 UTC (rev 2403)
@@ -44,7 +44,6 @@
 					<arg>
 						<name>okprops</name>
 						<value>http://calendarserver.org/ns/dropbox-home-URL$&lt;href xmlns="DAV:">$pathprefix:/dropbox/&lt;/href></value>
-						<value>http://calendarserver.org/ns/notifications-URL$&lt;href xmlns="DAV:">$pathprefix:/notifications/&lt;/href></value>
 					</arg>
 				</verify>
 			</request>
@@ -73,28 +72,6 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2'>
-			<description>Look for properties</description>
-			<request>
-				<method>PROPFIND</method>
-				<header>
-					<name>Depth</name>
-					<value>0</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>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>DAV:resourcetype$&lt;collection/>&lt;notifications xmlns="http://calendarserver.org/ns/"/></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
 	</test-suite>
 	<test-suite name='Drop Box Collection Create'>
 		<test name='1'>

Deleted: CalDAVTester/trunk/scripts/tests/notifications.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/notifications.xml	2008-05-09 20:25:19 UTC (rev 2402)
+++ CalDAVTester/trunk/scripts/tests/notifications.xml	2008-05-09 20:27:41 UTC (rev 2403)
@@ -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$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</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$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</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/20080509/c9b98f10/attachment-0001.html

More information about the calendarserver-changes mailing list