[CalendarServer-changes] [5634] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 5634
          http://trac.macosforge.org/projects/calendarserver/changeset/5634
Author:   cdaboo at apple.com
Date:     2010-05-20 13:02:36 -0700 (Thu, 20 May 2010)
Log Message:
-----------
Test for CS:shared-url property.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/8.xml
    CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/8.xml

Added: CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/8.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/replies/accept/8.xml	2010-05-20 20:02:36 UTC (rev 5634)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<D:displayname/>
+<CS:shared-url/>
+</D:prop>
+</D:propfind>

Added: CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/8.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/replies/accept/8.xml	2010-05-20 20:02:36 UTC (rev 5634)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<D:displayname/>
+<CS:shared-url/>
+</D:prop>
+</D:propfind>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2010-05-20 19:36:25 UTC (rev 5633)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2010-05-20 20:02:36 UTC (rev 5634)
@@ -165,7 +165,7 @@
 			</request>
 		</test>
 		<test name='6' ignore='no'>
-			<description>Check sharee calendar displyname</description>
+			<description>Check sharee calendar displyname/shared-url</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
@@ -175,19 +175,20 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+					<filepath>Resource/CalDAV/sharing/replies/accept/8.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>propfindValues</callback>
 					<arg>
 						<name>okprops</name>
 						<value>DAV:displayname$The Shared Calendar</value>
+						<value>http://calendarserver.org/ns/sharedurl$$pathprefix1:/shared</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='7' ignore='no'>
-			<description>Check sharee calendar displyname</description>
+			<description>Check sharer calendar displyname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$pathprefix1:/shared/</ruri>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml	2010-05-20 19:36:25 UTC (rev 5633)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml	2010-05-20 20:02:36 UTC (rev 5634)
@@ -165,7 +165,7 @@
 			</request>
 		</test>
 		<test name='6' ignore='no'>
-			<description>Check sharee addressbook displyname</description>
+			<description>Check sharee addressbook displyname/shared-url</description>
 			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
@@ -175,19 +175,20 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+					<filepath>Resource/CardDAV/sharing/replies/accept/8.xml</filepath>
 				</data>
 				<verify>
-					<callback>propfindItems</callback>
+					<callback>propfindValues</callback>
 					<arg>
 						<name>okprops</name>
 						<value>DAV:displayname$The Shared Address Book</value>
+						<value>http://calendarserver.org/ns/sharedurl$$pathprefix1:/shared</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='7' ignore='no'>
-			<description>Check sharee addressbook displyname</description>
+			<description>Check sharer addressbook displyname</description>
 			<request print-response='no'>
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome1:/shared/</ruri>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100520/12dc9435/attachment.html>