[CalendarServer-changes] [13887] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 18 16:47:44 PDT 2014
Revision: 13887
http://trac.calendarserver.org//changeset/13887
Author: sagen at apple.com
Date: 2014-08-18 16:47:44 -0700 (Mon, 18 Aug 2014)
Log Message:
-----------
Adds calendarserver-principal-search report
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml
CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml
Added: CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/aclreports/35.xml 2014-08-18 23:47:44 UTC (rev 13887)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<C:calendarserver-principal-search xmlns:C="http://calendarserver.org/ns/" context="location">
+ <C:search-token>loc</C:search-token>
+ <C:search-token>03</C:search-token>
+ <C:limit>
+ <C:nresults>50</C:nresults>
+ </C:limit>
+ <A:prop xmlns:A="DAV:">
+ <C:email-address-set/>
+ <C:last-name/>
+ <A:principal-URL/>
+ <A:displayname/>
+ <C:record-type/>
+ <C:first-name/>
+ <B:calendar-user-type xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-user-address-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ </A:prop>
+</C:calendarserver-principal-search>
\ No newline at end of file
Added: CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/aclreports/36.xml 2014-08-18 23:47:44 UTC (rev 13887)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<C:calendarserver-principal-search xmlns:C="http://calendarserver.org/ns/" context="attendee">
+ <C:search-token>res</C:search-token>
+ <C:search-token>03</C:search-token>
+ <C:limit>
+ <C:nresults>50</C:nresults>
+ </C:limit>
+ <A:prop xmlns:A="DAV:">
+ <C:email-address-set/>
+ <C:last-name/>
+ <A:principal-URL/>
+ <A:displayname/>
+ <C:record-type/>
+ <C:first-name/>
+ <B:calendar-user-type xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ <B:calendar-user-address-set xmlns:B="urn:ietf:params:xml:ns:caldav"/>
+ </A:prop>
+</C:calendarserver-principal-search>
\ No newline at end of file
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-18 20:59:28 UTC (rev 13886)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-18 23:47:44 UTC (rev 13887)
@@ -40,6 +40,7 @@
<feature>principal-match REPORT</feature> <!-- ACL principal-match REPORT -->
<feature>principal-property-search REPORT</feature> <!-- ACL principal-property-search REPORT -->
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
+ <feature>calendarserver-principal-search REPORT</feature> <!-- ACL calendarserver-principal-search REPORT -->
<feature>add-member</feature> <!-- Add-member used to create resources -->
<!-- <feature>auth-on-root</feature> --> <!-- Whether the server requires authentication on the root URI -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml 2014-08-18 20:59:28 UTC (rev 13886)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml 2014-08-18 23:47:44 UTC (rev 13887)
@@ -51,7 +51,7 @@
<ruri>$calendarhome1:/calendar3/</ruri>
</request>
</start>
-
+
<test-suite name='acl-principal-prop-set REPORT'>
<require-feature>
@@ -186,7 +186,7 @@
</request>
</test>
</test-suite>
-
+
<test-suite name='principal-match REPORT'>
<require-feature>
@@ -808,7 +808,7 @@
</request>
</test>
</test-suite>
-
+
<test-suite name='principal-search-property-set REPORT'>
<require-feature>
@@ -899,7 +899,7 @@
</request>
</test>
</test-suite>
-
+
<test-suite name='supported-report-set property'>
<test name='1'>
@@ -1045,7 +1045,59 @@
</request>
</test>
</test-suite>
-
+
+ <test-suite name='calendarserver-principal-search REPORT'>
+
+ <require-feature>
+ <feature>calendarserver-principal-search REPORT</feature>
+ </require-feature>
+
+ <test name='1'>
+ <description>Valid ROOM displayname search report</description>
+ <request user='$useradmin:' pswd='$pswdadmin:'>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/aclreports/35.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$lprincipaluri3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Valid RESOURCE displayname search report</description>
+ <request user='$useradmin:' pswd='$pswdadmin:'>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/aclreports/36.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value/>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$rprincipaluri3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
-
+
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140818/5d3f7d20/attachment-0001.html>
More information about the calendarserver-changes
mailing list