[CalendarServer-changes] [5490] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 5490
          http://trac.macosforge.org/projects/calendarserver/changeset/5490
Author:   cdaboo at apple.com
Date:     2010-04-19 16:13:50 -0700 (Mon, 19 Apr 2010)
Log Message:
-----------
Test that displayname is set on invite accept.

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

Added Paths:
-----------
    CalDAVTester/trunk/Resource/Common/PROPFIND/displayname.xml

Added: CalDAVTester/trunk/Resource/Common/PROPFIND/displayname.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPFIND/displayname.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/displayname.xml	2010-04-19 23:13:50 UTC (rev 5490)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:displayname/>
+</D:prop>
+</D:propfind>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	2010-04-19 23:12:22 UTC (rev 5489)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	2010-04-19 23:13:50 UTC (rev 5490)
@@ -193,8 +193,8 @@
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
-						<name>badprops</name>
-						<value>DAV:displayname</value>
+						<name>okprops</name>
+						<value>DAV:displayname$The Shared Calendar</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2010-04-19 23:12:22 UTC (rev 5489)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2010-04-19 23:13:50 UTC (rev 5490)
@@ -92,7 +92,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='yes'>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
 				<method>POST</method>
 				<ruri>$pathprefix2:/</ruri>
 				<data substitutions='yes'>
@@ -110,6 +110,10 @@
 						<value>{DAV:}href</value>
 					</arg>
 				</verify>
+				<grabelement>
+					<name>{DAV:}href</name>
+					<variable>$shareecalendar:</variable>
+				</grabelement>
 			</request>
 		</test>
 		<test name='4' ignore='no'>
@@ -160,6 +164,50 @@
 				</verify>
 			</request>
 		</test>
+		<test name='6' ignore='no'>
+			<description>Check sharee calendar displyname</description>
+			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$shareecalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname$The Shared Calendar</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='7' ignore='no'>
+			<description>Check sharee calendar displyname</description>
+			<request print-response='no'>
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/shared/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/Common/PROPFIND/displayname.xml</filepath>
+				</data>
+				<verify>
+					<callback>propfindItems</callback>
+					<arg>
+						<name>okprops</name>
+						<value>DAV:displayname$shared</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='Update reply'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100419/c13a9876/attachment.html>