Revision

837

Author

cdaboo@apple.com

Date

2006-12-15 10:52:06 -0800 (Fri, 15 Dec 2006)

Log Message

Fixes for latest dropbox/notification support. Also turn on notification test for --all.

Modified Paths

• CalDAVTester/trunk/scripts/tests/dropbox.xml
• CalDAVTester/trunk/scripts/tests/notifications.xml

Diff

--- CalDAVTester/trunk/scripts/tests/dropbox.xml	2006-12-15 16:30:34 UTC (rev 836)
+++ CalDAVTester/trunk/scripts/tests/dropbox.xml	2006-12-15 18:52:06 UTC (rev 837)
@@ -39,8 +39,8 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value>http://apple.com/ns/calendarserver/dropbox-home-URL$&lt;href xmlns="DAV:">$pathprefix:/dropbox/&lt;/href></value>
-						<value>http://apple.com/ns/calendarserver/notifications-URL$&lt;href xmlns="DAV:">$pathprefix:/notifications/&lt;/href></value>
+						<value>http://org.calendarserver/ns/dropbox-home-URL$&lt;href xmlns="DAV:">$pathprefix:/dropbox/&lt;/href></value>
+						<value>http://org.calendarserver/ns/notifications-URL$&lt;href xmlns="DAV:">$pathprefix:/notifications/&lt;/href></value>
 					</arg>
 				</verify>
 			</request>
@@ -64,7 +64,7 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value>DAV:resourcetype$&lt;collection/>&lt;dropbox-home xmlns="http://apple.com/ns/calendarserver/"/></value>
+						<value>DAV:resourcetype$&lt;collection/>&lt;dropbox-home xmlns="http://org.calendarserver/ns/"/></value>
 					</arg>
 				</verify>
 			</request>
@@ -86,7 +86,7 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value>DAV:resourcetype$&lt;collection/>&lt;notifications xmlns="http://apple.com/ns/calendarserver/"/></value>
+						<value>DAV:resourcetype$&lt;collection/>&lt;notifications xmlns="http://org.calendarserver/ns/"/></value>
 					</arg>
 				</verify>
 			</request>
@@ -124,7 +124,7 @@
 					<callback>propfindItems</callback>
 					<arg>
 						<name>okprops</name>
-						<value>DAV:resourcetype$&lt;collection/>&lt;dropbox xmlns="http://apple.com/ns/calendarserver/"/></value>
+						<value>DAV:resourcetype$&lt;collection/>&lt;dropbox xmlns="http://org.calendarserver/ns/"/></value>
 					</arg>
 				</verify>
 			</request>
@@ -223,7 +223,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2'>
+		<test name='2' ignore="yes">
 			<description>Try to create a resource</description>
 			<request end-delete="yes">
 				<method>PUT</method>

--- CalDAVTester/trunk/scripts/tests/notifications.xml	2006-12-15 16:30:34 UTC (rev 836)
+++ CalDAVTester/trunk/scripts/tests/notifications.xml	2006-12-15 18:52:06 UTC (rev 837)
@@ -20,7 +20,7 @@
  DRI: Cyrus Daboo, cdaboo@apple.com
  -->
 
-<caldavtest ignore-all="yes">
+<caldavtest>
 	<description>Test drop box notification features</description>
 
 	<start>
@@ -124,8 +124,8 @@
 					</arg>
 					<arg>
 						<name>okprops</name>
-						<value>http://apple.com/ns/calendarserver/time-stamp</value>
-						<value>http://apple.com/ns/calendarserver/changed$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</value>
+						<value>http://org.calendarserver/ns/time-stamp</value>
+						<value>http://org.calendarserver/ns/changed$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</value>
 					</arg>
 				</verify>
 			</request>
@@ -197,8 +197,8 @@
 					</arg>
 					<arg>
 						<name>okprops</name>
-						<value>http://apple.com/ns/calendarserver/time-stamp</value>
-						<value>http://apple.com/ns/calendarserver/changed$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</value>
+						<value>http://org.calendarserver/ns/time-stamp</value>
+						<value>http://org.calendarserver/ns/changed$&lt;href xmlns="DAV:"&gt;$pathprefix:/dropbox/ABC2/&lt;/href&gt;</value>
 					</arg>
 				</verify>
 			</request>