[CalendarServer-changes] [3547] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 3547
          http://trac.macosforge.org/projects/calendarserver/changeset/3547
Author:   sagen at apple.com
Date:     2008-12-18 17:54:17 -0800 (Thu, 18 Dec 2008)
Log Message:
-----------
Test of principal-property-search report on calendar-user-address-set and exact match-type

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/aclreports/18.xml
    CalDAVTester/trunk/scripts/tests/aclreports.xml

Modified: CalDAVTester/trunk/Resource/aclreports/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/18.xml	2008-12-19 01:53:45 UTC (rev 3546)
+++ CalDAVTester/trunk/Resource/aclreports/18.xml	2008-12-19 01:54:17 UTC (rev 3547)
@@ -2,12 +2,6 @@
 <principal-search-property-set xmlns='DAV:'>
   <principal-search-property>
     <prop>
-      <calendar-user-type xmlns='urn:ietf:params:xml:ns:caldav'/>
-    </prop>
-    <description xml:lang='en'>Calendar User Type</description>
-  </principal-search-property>
-  <principal-search-property>
-    <prop>
       <displayname/>
     </prop>
     <description xml:lang='en'>Display Name</description>
@@ -20,14 +14,26 @@
   </principal-search-property>
   <principal-search-property>
     <prop>
+      <last-name xmlns='http://calendarserver.org/ns/'/>
+    </prop>
+    <description xml:lang='en'>Last Name</description>
+  </principal-search-property>
+  <principal-search-property>
+    <prop>
+      <calendar-user-type xmlns='urn:ietf:params:xml:ns:caldav'/>
+    </prop>
+    <description xml:lang='en'>Calendar User Type</description>
+  </principal-search-property>
+  <principal-search-property>
+    <prop>
       <first-name xmlns='http://calendarserver.org/ns/'/>
     </prop>
     <description xml:lang='en'>First Name</description>
   </principal-search-property>
   <principal-search-property>
     <prop>
-      <last-name xmlns='http://calendarserver.org/ns/'/>
+      <calendar-user-address-set xmlns='urn:ietf:params:xml:ns:caldav'/>
     </prop>
-    <description xml:lang='en'>Last Name</description>
+    <description xml:lang='en'>Calendar User Address Set</description>
   </principal-search-property>
 </principal-search-property-set>

Modified: CalDAVTester/trunk/scripts/tests/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-19 01:53:45 UTC (rev 3546)
+++ CalDAVTester/trunk/scripts/tests/aclreports.xml	2008-12-19 01:54:17 UTC (rev 3547)
@@ -766,6 +766,28 @@
 				</verify>
 			</request>
 		</test>
+		<test name='19' ignore='no'>
+			<description>Exact calendar-user-address-set REPORT</description>
+			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+				<method>REPORT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/aclreports/33.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>prefix</name>
+						<value/>
+					</arg>
+					<arg>
+						<name>okhrefs</name>
+						<value>$principals_uids:user01/</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 	
 	<test-suite name='principal-search-property-set REPORT' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081218/3c15f0aa/attachment.html>