[CalendarServer-changes] [9168] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 9168
          http://trac.macosforge.org/projects/calendarserver/changeset/9168
Author:   gaya at apple.com
Date:     2012-04-23 09:15:59 -0700 (Mon, 23 Apr 2012)
Log Message:
-----------
add groups tests to directory gateway multiget reports

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/15.xml
    CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml

Added: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/15.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/15.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/15.xml	2012-04-23 16:15:59 UTC (rev 9168)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <C:address-data>
+         <C:prop name="VERSION"/>
+         <C:prop name="UID"/>
+         <C:prop name="NICKNAME"/>
+         <C:prop name="EMAIL"/>
+         <C:prop name="FN"/>
+       </C:address-data>
+     </D:prop>
+     <C:filter test="allof">
+       <C:prop-filter name="KIND">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="equals"
+         >group</C:text-match>
+       </C:prop-filter>
+       <C:prop-filter name="FN">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="contains"
+         >0</C:text-match>
+       </C:prop-filter>
+     </C:filter>
+   </C:addressbook-query>

Added: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/16.xml	2012-04-23 16:15:59 UTC (rev 9168)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+   <C:addressbook-query xmlns:D="DAV:"
+                     xmlns:C="urn:ietf:params:xml:ns:carddav">
+     <D:prop>
+       <C:address-data/>
+     </D:prop>
+     <C:filter test="allof">
+       <C:prop-filter name="KIND">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="equals"
+         >group</C:text-match>
+       </C:prop-filter>
+       <C:prop-filter name="X-ADDRESSBOOKSERVER-MEMBER">
+         <C:text-match collation="i;unicode-casemap"
+                       match-type="contains"
+         >group</C:text-match>
+       </C:prop-filter>
+     </C:filter>
+   </C:addressbook-query>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2012-04-23 14:23:09 UTC (rev 9167)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2012-04-23 16:15:59 UTC (rev 9168)
@@ -1306,6 +1306,57 @@
 				</verify>
 			</request>
 		</test>
+		<test name="15" ignore="no">
+			<description>query for resources with (KIND equal "group") and (FN contains "0"), no eTag " </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$directory:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/searchquery/15.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$groupguid0:.vcf</value>
+						<value>$groupguid1:.vcf</value>
+						<value>$groupguid2:.vcf</value>
+						<value>$groupguid3:.vcf</value>
+						<value>$groupguid4:.vcf</value>
+						<value>$groupguid5:.vcf</value>
+						<value>$groupguid6:.vcf</value>
+					</arg>
+					<arg>
+						<name>totalcount</name>
+						<value>7</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name="16" ignore="no">
+			<description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains "group"), no eTag, no props " </description>
+			<request print-response="no">
+				<method>REPORT</method>
+				<ruri>$directory:</ruri>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CardDAV/vreports/searchquery/16.xml</filepath>
+				</data>
+				<verify>
+					<callback>multistatusItems</callback>
+					<arg>
+						<name>okhrefs</name>
+						<value>$groupguid4:.vcf</value>
+						<value>$groupguid5:.vcf</value>
+					</arg>
+					<arg>
+						<name>totalcount</name>
+						<value>2</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 	</test-suite>
 
 	<test-suite name='directory gateway multiget reports' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120423/91b7b815/attachment-0001.html>